From 43ad9aa2b1e71004c768cf234e2fb78af0cc7f21 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 6 May 2020 15:20:28 -0400
Subject: [PATCH 001/505] Fix version

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index ce352ebda..bf660696b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.8.3-dev'
+VERSION = '2.9.0-dev'
 
 # Hostname
 HOSTNAME = platform.node()

From 6624fc607602502bd40f7124cc98bb050d96c01c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 8 May 2020 17:30:25 -0400
Subject: [PATCH 002/505] Initial work on #554 (WIP)

---
 netbox/netbox/settings.py                     |  1 +
 netbox/users/admin.py                         |  9 ++-
 .../users/migrations/0007_objectpermission.py | 36 +++++++++++
 netbox/users/models.py                        | 55 +++++++++++++++-
 netbox/users/tests/test_permissions.py        | 62 +++++++++++++++++++
 netbox/utilities/auth_backends.py             | 42 +++++++++++++
 6 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 netbox/users/migrations/0007_objectpermission.py
 create mode 100644 netbox/users/tests/test_permissions.py

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index bf660696b..5c48ee620 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -335,6 +335,7 @@ TEMPLATES = [
 AUTHENTICATION_BACKENDS = [
     REMOTE_AUTH_BACKEND,
     'utilities.auth_backends.ViewExemptModelBackend',
+    'utilities.auth_backends.ObjectPermissionBackend',
 ]
 
 # Internationalization
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 42e651712..fcaeb4ef0 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -3,7 +3,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import User
 
-from .models import Token, UserConfig
+from .models import ObjectPermission, Token, UserConfig
 
 # Unregister the built-in UserAdmin so that we can use our custom admin view below
 admin.site.unregister(User)
@@ -43,3 +43,10 @@ class TokenAdmin(admin.ModelAdmin):
     list_display = [
         'key', 'user', 'created', 'expires', 'write_enabled', 'description'
     ]
+
+
+@admin.register(ObjectPermission)
+class ObjectPermissionAdmin(admin.ModelAdmin):
+    list_display = [
+        'model', 'can_view', 'can_add', 'can_change', 'can_delete'
+    ]
diff --git a/netbox/users/migrations/0007_objectpermission.py b/netbox/users/migrations/0007_objectpermission.py
new file mode 100644
index 000000000..d805c3379
--- /dev/null
+++ b/netbox/users/migrations/0007_objectpermission.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.0.6 on 2020-05-08 20:18
+
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('auth', '0011_update_proxy_permissions'),
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('users', '0006_create_userconfigs'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ObjectPermission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('attrs', django.contrib.postgres.fields.jsonb.JSONField()),
+                ('can_view', models.BooleanField(default=False)),
+                ('can_add', models.BooleanField(default=False)),
+                ('can_change', models.BooleanField(default=False)),
+                ('can_delete', models.BooleanField(default=False)),
+                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
+                ('model', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'unique_together': {('model', 'attrs')},
+            },
+        ),
+    ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index ea5762232..f2002ae95 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -1,8 +1,10 @@
 import binascii
 import os
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import JSONField
+from django.core.exceptions import FieldError, ValidationError
 from django.core.validators import MinLengthValidator
 from django.db import models
 from django.db.models.signals import post_save
@@ -190,3 +192,54 @@ class Token(models.Model):
         if self.expires is None or timezone.now() < self.expires:
             return False
         return True
+
+
+class ObjectPermission(models.Model):
+    """
+    A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
+    identified by ORM query parameters.
+    """
+    users = models.ManyToManyField(
+        to=User,
+        blank=True,
+        related_name='object_permissions'
+    )
+    groups = models.ManyToManyField(
+        to=Group,
+        blank=True,
+        related_name='object_permissions'
+    )
+    model = models.ForeignKey(
+        to=ContentType,
+        on_delete=models.CASCADE
+    )
+    attrs = JSONField(
+        verbose_name='Attributes'
+    )
+    can_view = models.BooleanField(
+        default=False
+    )
+    can_add = models.BooleanField(
+        default=False
+    )
+    can_change = models.BooleanField(
+        default=False
+    )
+    can_delete = models.BooleanField(
+        default=False
+    )
+
+    class Meta:
+        unique_together = ('model', 'attrs')
+
+    def clean(self):
+
+        # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
+        # returns anything; we just want to make sure the specified attributes are valid.
+        model = self.model.model_class()
+        try:
+            model.objects.filter(**self.attrs).exists()
+        except FieldError as e:
+            raise ValidationError({
+                'attrs': f'Invalid attributes for {model}: {e}'
+            })
diff --git a/netbox/users/tests/test_permissions.py b/netbox/users/tests/test_permissions.py
new file mode 100644
index 000000000..f73fd8f43
--- /dev/null
+++ b/netbox/users/tests/test_permissions.py
@@ -0,0 +1,62 @@
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.auth.models import Permission, User
+from django.test import TestCase, override_settings
+
+from dcim.models import Site
+from tenancy.models import Tenant
+from users.models import ObjectPermission
+
+
+class UserConfigTest(TestCase):
+
+    def setUp(self):
+
+        self.user = User.objects.create_user(username='testuser')
+
+    @classmethod
+    def setUpTestData(cls):
+
+        tenant = Tenant.objects.create(name='Tenant 1', slug='tenant-1')
+        Site.objects.bulk_create((
+            Site(name='Site 1', slug='site-1'),
+            Site(name='Site 2', slug='site-2', tenant=tenant),
+            Site(name='Site 3', slug='site-3'),
+        ))
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_permission_view_object(self):
+
+        # Sanity check to ensure the user has no model-level permission
+        self.assertFalse(self.user.has_perm('dcim.view_site'))
+
+        # The permission check for a specific object should fail.
+        sites = Site.objects.all()
+        self.assertFalse(self.user.has_perm('dcim.view_site', sites[0]))
+
+        # Create and assign a new ObjectPermission specifying the first site by name.
+        ct = ContentType.objects.get_for_model(sites[0])
+        object_perm = ObjectPermission(
+            model=ct,
+            attrs={'name': 'Site 1'},
+            can_view=True
+        )
+        object_perm.save()
+        self.user.object_permissions.add(object_perm)
+
+        # The test user should have permission to view only the first site.
+        self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
+        self.assertFalse(self.user.has_perm('dcim.view_site', sites[1]))
+
+        # Create a second ObjectPermission matching sites by assigned tenant.
+        object_perm = ObjectPermission(
+            model=ct,
+            attrs={'tenant__name': 'Tenant 1'},
+            can_view=True
+        )
+        object_perm.save()
+        self.user.object_permissions.add(object_perm)
+
+        # The user should now able to view the first two sites, but not the third.
+        self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
+        self.assertTrue(self.user.has_perm('dcim.view_site', sites[1]))
+        self.assertFalse(self.user.has_perm('dcim.view_site', sites[2]))
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 6342bad2b..0d20fe02f 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -3,6 +3,10 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as RemoteUserBackend_
 from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
+
+from users.models import ObjectPermission
 
 
 class ViewExemptModelBackend(ModelBackend):
@@ -31,6 +35,44 @@ class ViewExemptModelBackend(ModelBackend):
         return super().has_perm(user_obj, perm, obj)
 
 
+class ObjectPermissionBackend(ModelBackend):
+    """
+    Evaluates permission of a user to access or modify a specific object based on the assignment of ObjectPermissions
+    either to the user directly or to a group of which the user is a member. Model-level permissions supersede this
+    check: For example, if a user has the dcim.view_site model-level permission assigned, the ViewExemptModelBackend
+    will grant permission before this backend is evaluated for permission to view a specific site.
+    """
+    def has_perm(self, user_obj, perm, obj=None):
+
+        # This backend only checks for permissions on specific objects
+        if obj is None:
+            return
+
+        app, codename = perm.split('.')
+        action, model_name = codename.split('_')
+        model = obj._meta.model
+
+        # Check that the requested permission applies to the specified object
+        if model._meta.model_name != model_name:
+            raise ValueError(f"Invalid permission {perm} for model {model}")
+
+        # Retrieve user's permissions for this model
+        # This can probably be cached
+        obj_permissions = ObjectPermission.objects.filter(
+            Q(users=user_obj) | Q(groups__user=user_obj),
+            model=ContentType.objects.get_for_model(obj),
+            **{f'can_{action}': True}
+        )
+
+        for perm in obj_permissions:
+
+            # Attempt to retrieve the model from the database using the
+            # attributes defined in the ObjectPermission. If we have a
+            # match, assert that the user has permission.
+            if model.objects.filter(pk=obj.pk, **perm.attrs).exists():
+                return True
+
+
 class RemoteUserBackend(ViewExemptModelBackend, RemoteUserBackend_):
     """
     Custom implementation of Django's RemoteUserBackend which provides configuration hooks for basic customization.

From 4b5d64939df2b187306e58dcf313915968dbb3b8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 11 May 2020 11:51:11 -0400
Subject: [PATCH 003/505] Introduced ObjectPermissionRequiredMixin

---
 netbox/dcim/views.py            |  3 ++-
 netbox/netbox/authentication.py | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 netbox/netbox/authentication.py

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index cd1b4edf4..5afa46295 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -21,6 +21,7 @@ from extras.models import Graph
 from extras.views import ObjectConfigContextView
 from ipam.models import Prefix, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
+from netbox.authentication import ObjectPermissionRequiredMixin
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import csv_format
@@ -185,7 +186,7 @@ class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Sites
 #
 
-class SiteListView(PermissionRequiredMixin, ObjectListView):
+class SiteListView(ObjectPermissionRequiredMixin, ObjectListView):
     permission_required = 'dcim.view_site'
     queryset = Site.objects.prefetch_related('region', 'tenant')
     filterset = filters.SiteFilterSet
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
new file mode 100644
index 000000000..58fd4380a
--- /dev/null
+++ b/netbox/netbox/authentication.py
@@ -0,0 +1,40 @@
+from django.contrib.auth.mixins import AccessMixin
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
+
+from users.models import ObjectPermission
+
+
+class ObjectPermissionRequiredMixin(AccessMixin):
+    permission_required = None
+
+    def has_permission(self):
+
+        # First, check whether the user has a model-level permission assigned
+        if self.request.user.has_perm(self.permission_required):
+            return True
+
+        # If not, check for an object-level permission
+        app, codename = self.permission_required.split('.')
+        action, model_name = codename.split('_')
+        model = self.queryset.model
+        obj_permissions = ObjectPermission.objects.filter(
+            Q(users=self.request.user) | Q(groups__user=self.request.user),
+            model=ContentType.objects.get_for_model(model),
+            **{f'can_{action}': True}
+        )
+        if obj_permissions:
+
+            # Update the view's QuerySet to filter only the permitted objects
+            # TODO: Do this more efficiently
+            for perm in obj_permissions:
+                self.queryset = self.queryset.filter(**perm.attrs)
+
+            return True
+
+        return False
+
+    def dispatch(self, request, *args, **kwargs):
+        if not self.has_permission():
+            return self.handle_no_permission()
+        return super().dispatch(request, *args, **kwargs)

From 87fa6bc25202e1e47d4c02f66c785aad89d0fffe Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 11 May 2020 12:37:22 -0400
Subject: [PATCH 004/505] #4624: Refactor ObjectEditView to use a queryset

---
 netbox/circuits/views.py       |  8 ++---
 netbox/dcim/views.py           | 62 +++++++++++++++++-----------------
 netbox/extras/views.py         |  6 ++--
 netbox/ipam/views.py           | 18 +++++-----
 netbox/secrets/views.py        |  2 +-
 netbox/tenancy/views.py        |  4 +--
 netbox/utilities/views.py      | 19 ++++++-----
 netbox/virtualization/views.py | 10 +++---
 8 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 709d2a726..7fe2501fb 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -62,7 +62,7 @@ class ProviderView(PermissionRequiredMixin, View):
 
 class ProviderCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'circuits.add_provider'
-    model = Provider
+    queryset = Provider.objects.all()
     model_form = forms.ProviderForm
     template_name = 'circuits/provider_edit.html'
     default_return_url = 'circuits:provider_list'
@@ -114,7 +114,7 @@ class CircuitTypeListView(PermissionRequiredMixin, ObjectListView):
 
 class CircuitTypeCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'circuits.add_circuittype'
-    model = CircuitType
+    queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeForm
     default_return_url = 'circuits:circuittype_list'
 
@@ -178,7 +178,7 @@ class CircuitView(PermissionRequiredMixin, View):
 
 class CircuitCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'circuits.add_circuit'
-    model = Circuit
+    queryset = Circuit.objects.all()
     model_form = forms.CircuitForm
     template_name = 'circuits/circuit_edit.html'
     default_return_url = 'circuits:circuit_list'
@@ -273,7 +273,7 @@ def circuit_terminations_swap(request, pk):
 
 class CircuitTerminationCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'circuits.add_circuittermination'
-    model = CircuitTermination
+    queryset = CircuitTermination.objects.all()
     model_form = forms.CircuitTerminationForm
     template_name = 'circuits/circuittermination_edit.html'
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index cd1b4edf4..c9cc6ac13 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -157,7 +157,7 @@ class RegionListView(PermissionRequiredMixin, ObjectListView):
 
 class RegionCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_region'
-    model = Region
+    queryset = Region.objects.all()
     model_form = forms.RegionForm
     default_return_url = 'dcim:region_list'
 
@@ -220,7 +220,7 @@ class SiteView(PermissionRequiredMixin, View):
 
 class SiteCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_site'
-    model = Site
+    queryset = Site.objects.all()
     model_form = forms.SiteForm
     template_name = 'dcim/site_edit.html'
     default_return_url = 'dcim:site_list'
@@ -280,7 +280,7 @@ class RackGroupListView(PermissionRequiredMixin, ObjectListView):
 
 class RackGroupCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_rackgroup'
-    model = RackGroup
+    queryset = RackGroup.objects.all()
     model_form = forms.RackGroupForm
     default_return_url = 'dcim:rackgroup_list'
 
@@ -316,7 +316,7 @@ class RackRoleListView(PermissionRequiredMixin, ObjectListView):
 
 class RackRoleCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_rackrole'
-    model = RackRole
+    queryset = RackRole.objects.all()
     model_form = forms.RackRoleForm
     default_return_url = 'dcim:rackrole_list'
 
@@ -426,7 +426,7 @@ class RackView(PermissionRequiredMixin, View):
 
 class RackCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_rack'
-    model = Rack
+    queryset = Rack.objects.all()
     model_form = forms.RackForm
     template_name = 'dcim/rack_edit.html'
     default_return_url = 'dcim:rack_list'
@@ -493,7 +493,7 @@ class RackReservationView(PermissionRequiredMixin, View):
 
 class RackReservationCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_rackreservation'
-    model = RackReservation
+    queryset = RackReservation.objects.all()
     model_form = forms.RackReservationForm
     template_name = 'dcim/rackreservation_edit.html'
     default_return_url = 'dcim:rackreservation_list'
@@ -566,7 +566,7 @@ class ManufacturerListView(PermissionRequiredMixin, ObjectListView):
 
 class ManufacturerCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_manufacturer'
-    model = Manufacturer
+    queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerForm
     default_return_url = 'dcim:manufacturer_list'
 
@@ -666,7 +666,7 @@ class DeviceTypeView(PermissionRequiredMixin, View):
 
 class DeviceTypeCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_devicetype'
-    model = DeviceType
+    queryset = DeviceType.objects.all()
     model_form = forms.DeviceTypeForm
     template_name = 'dcim/devicetype_edit.html'
     default_return_url = 'dcim:devicetype_list'
@@ -740,7 +740,7 @@ class ConsolePortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
 
 class ConsolePortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleporttemplate'
-    model = ConsolePortTemplate
+    queryset = ConsolePortTemplate.objects.all()
     model_form = forms.ConsolePortTemplateForm
 
 
@@ -776,7 +776,7 @@ class ConsoleServerPortTemplateCreateView(PermissionRequiredMixin, ComponentCrea
 
 class ConsoleServerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleserverporttemplate'
-    model = ConsoleServerPortTemplate
+    queryset = ConsoleServerPortTemplate.objects.all()
     model_form = forms.ConsoleServerPortTemplateForm
 
 
@@ -812,7 +812,7 @@ class PowerPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class PowerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_powerporttemplate'
-    model = PowerPortTemplate
+    queryset = PowerPortTemplate.objects.all()
     model_form = forms.PowerPortTemplateForm
 
 
@@ -848,7 +848,7 @@ class PowerOutletTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
 
 class PowerOutletTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_poweroutlettemplate'
-    model = PowerOutletTemplate
+    queryset = PowerOutletTemplate.objects.all()
     model_form = forms.PowerOutletTemplateForm
 
 
@@ -884,7 +884,7 @@ class InterfaceTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class InterfaceTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_interfacetemplate'
-    model = InterfaceTemplate
+    queryset = InterfaceTemplate.objects.all()
     model_form = forms.InterfaceTemplateForm
 
 
@@ -920,7 +920,7 @@ class FrontPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class FrontPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_frontporttemplate'
-    model = FrontPortTemplate
+    queryset = FrontPortTemplate.objects.all()
     model_form = forms.FrontPortTemplateForm
 
 
@@ -956,7 +956,7 @@ class RearPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class RearPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rearporttemplate'
-    model = RearPortTemplate
+    queryset = RearPortTemplate.objects.all()
     model_form = forms.RearPortTemplateForm
 
 
@@ -992,7 +992,7 @@ class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class DeviceBayTemplateEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_devicebaytemplate'
-    model = DeviceBayTemplate
+    queryset = DeviceBayTemplate.objects.all()
     model_form = forms.DeviceBayTemplateForm
 
 
@@ -1026,7 +1026,7 @@ class DeviceRoleListView(PermissionRequiredMixin, ObjectListView):
 
 class DeviceRoleCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_devicerole'
-    model = DeviceRole
+    queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleForm
     default_return_url = 'dcim:devicerole_list'
 
@@ -1061,7 +1061,7 @@ class PlatformListView(PermissionRequiredMixin, ObjectListView):
 
 class PlatformCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_platform'
-    model = Platform
+    queryset = Platform.objects.all()
     model_form = forms.PlatformForm
     default_return_url = 'dcim:platform_list'
 
@@ -1247,7 +1247,7 @@ class DeviceConfigContextView(PermissionRequiredMixin, ObjectConfigContextView):
 
 class DeviceCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_device'
-    model = Device
+    queryset = Device.objects.all()
     model_form = forms.DeviceForm
     template_name = 'dcim/device_edit.html'
     default_return_url = 'dcim:device_list'
@@ -1330,7 +1330,7 @@ class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleport'
-    model = ConsolePort
+    queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortForm
 
 
@@ -1385,7 +1385,7 @@ class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_consoleserverport'
-    model = ConsoleServerPort
+    queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortForm
 
 
@@ -1452,7 +1452,7 @@ class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class PowerPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_powerport'
-    model = PowerPort
+    queryset = PowerPort.objects.all()
     model_form = forms.PowerPortForm
 
 
@@ -1507,7 +1507,7 @@ class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_poweroutlet'
-    model = PowerOutlet
+    queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletForm
 
 
@@ -1610,7 +1610,7 @@ class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_interface'
-    model = Interface
+    queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     template_name = 'dcim/interface_edit.html'
 
@@ -1678,7 +1678,7 @@ class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class FrontPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_frontport'
-    model = FrontPort
+    queryset = FrontPort.objects.all()
     model_form = forms.FrontPortForm
 
 
@@ -1745,7 +1745,7 @@ class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class RearPortEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rearport'
-    model = RearPort
+    queryset = RearPort.objects.all()
     model_form = forms.RearPortForm
 
 
@@ -1814,7 +1814,7 @@ class DeviceBayCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class DeviceBayEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_devicebay'
-    model = DeviceBay
+    queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayForm
 
 
@@ -2154,7 +2154,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View):
 
 class CableEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_cable'
-    model = Cable
+    queryset = Cable.objects.all()
     model_form = forms.CableForm
     template_name = 'dcim/cable_edit.html'
     default_return_url = 'dcim:cable_list'
@@ -2309,7 +2309,7 @@ class InventoryItemListView(PermissionRequiredMixin, ObjectListView):
 
 class InventoryItemEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_inventoryitem'
-    model = InventoryItem
+    queryset = InventoryItem.objects.all()
     model_form = forms.InventoryItemForm
 
 
@@ -2654,7 +2654,7 @@ class PowerPanelView(PermissionRequiredMixin, View):
 
 class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_powerpanel'
-    model = PowerPanel
+    queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelForm
     default_return_url = 'dcim:powerpanel_list'
 
@@ -2725,7 +2725,7 @@ class PowerFeedView(PermissionRequiredMixin, View):
 
 class PowerFeedCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_powerfeed'
-    model = PowerFeed
+    queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedForm
     template_name = 'dcim/powerfeed_edit.html'
     default_return_url = 'dcim:powerfeed_list'
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 613e45132..687ff69b0 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -67,7 +67,7 @@ class TagView(PermissionRequiredMixin, View):
 
 class TagEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'extras.change_tag'
-    model = Tag
+    queryset = Tag.objects.all()
     model_form = forms.TagForm
     default_return_url = 'extras:tag_list'
     template_name = 'extras/tag_edit.html'
@@ -136,7 +136,7 @@ class ConfigContextView(PermissionRequiredMixin, View):
 
 class ConfigContextCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'extras.add_configcontext'
-    model = ConfigContext
+    queryset = ConfigContext.objects.all()
     model_form = forms.ConfigContextForm
     default_return_url = 'extras:configcontext_list'
     template_name = 'extras/configcontext_edit.html'
@@ -306,7 +306,7 @@ class ObjectChangeLogView(View):
 
 class ImageAttachmentEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'extras.change_imageattachment'
-    model = ImageAttachment
+    queryset = ImageAttachment.objects.all()
     model_form = forms.ImageAttachmentForm
 
     def alter_obj(self, imageattachment, request, args, kwargs):
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index e8041e8dd..bf94a4f74 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -136,7 +136,7 @@ class VRFView(PermissionRequiredMixin, View):
 
 class VRFCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_vrf'
-    model = VRF
+    queryset = VRF.objects.all()
     model_form = forms.VRFForm
     template_name = 'ipam/vrf_edit.html'
     default_return_url = 'ipam:vrf_list'
@@ -259,7 +259,7 @@ class RIRListView(PermissionRequiredMixin, ObjectListView):
 
 class RIRCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_rir'
-    model = RIR
+    queryset = RIR.objects.all()
     model_form = forms.RIRForm
     default_return_url = 'ipam:rir_list'
 
@@ -361,7 +361,7 @@ class AggregateView(PermissionRequiredMixin, View):
 
 class AggregateCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_aggregate'
-    model = Aggregate
+    queryset = Aggregate.objects.all()
     model_form = forms.AggregateForm
     template_name = 'ipam/aggregate_edit.html'
     default_return_url = 'ipam:aggregate_list'
@@ -413,7 +413,7 @@ class RoleListView(PermissionRequiredMixin, ObjectListView):
 
 class RoleCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_role'
-    model = Role
+    queryset = Role.objects.all()
     model_form = forms.RoleForm
     default_return_url = 'ipam:role_list'
 
@@ -588,7 +588,7 @@ class PrefixIPAddressesView(PermissionRequiredMixin, View):
 
 class PrefixCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_prefix'
-    model = Prefix
+    queryset = Prefix.objects.all()
     model_form = forms.PrefixForm
     template_name = 'ipam/prefix_edit.html'
     default_return_url = 'ipam:prefix_list'
@@ -699,7 +699,7 @@ class IPAddressView(PermissionRequiredMixin, View):
 
 class IPAddressCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_ipaddress'
-    model = IPAddress
+    queryset = IPAddress.objects.all()
     model_form = forms.IPAddressForm
     template_name = 'ipam/ipaddress_edit.html'
     default_return_url = 'ipam:ipaddress_list'
@@ -817,7 +817,7 @@ class VLANGroupListView(PermissionRequiredMixin, ObjectListView):
 
 class VLANGroupCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_vlangroup'
-    model = VLANGroup
+    queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupForm
     default_return_url = 'ipam:vlangroup_list'
 
@@ -933,7 +933,7 @@ class VLANMembersView(PermissionRequiredMixin, View):
 
 class VLANCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_vlan'
-    model = VLAN
+    queryset = VLAN.objects.all()
     model_form = forms.VLANForm
     template_name = 'ipam/vlan_edit.html'
     default_return_url = 'ipam:vlan_list'
@@ -1000,7 +1000,7 @@ class ServiceView(PermissionRequiredMixin, View):
 
 class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_service'
-    model = Service
+    queryset = Service.objects.all()
     model_form = forms.ServiceForm
     template_name = 'ipam/service_edit.html'
 
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index ed59f4392..937b06edf 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -38,7 +38,7 @@ class SecretRoleListView(PermissionRequiredMixin, ObjectListView):
 
 class SecretRoleCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'secrets.add_secretrole'
-    model = SecretRole
+    queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleForm
     default_return_url = 'secrets:secretrole_list'
 
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index afc363cd6..148ac6c17 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -32,7 +32,7 @@ class TenantGroupListView(PermissionRequiredMixin, ObjectListView):
 
 class TenantGroupCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'tenancy.add_tenantgroup'
-    model = TenantGroup
+    queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupForm
     default_return_url = 'tenancy:tenantgroup_list'
 
@@ -95,7 +95,7 @@ class TenantView(PermissionRequiredMixin, View):
 
 class TenantCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'tenancy.add_tenant'
-    model = Tenant
+    queryset = Tenant.objects.all()
     model_form = forms.TenantForm
     template_name = 'tenancy/tenant_edit.html'
     default_return_url = 'tenancy:tenant_list'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 3064abe4e..cde38846e 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -216,21 +216,22 @@ class ObjectEditView(GetReturnURLMixin, View):
     """
     Create or edit a single object.
 
-    model: The model of the object being edited
+    queryset: The base queryset for the model being modified
     model_form: The form used to create or edit the object
     template_name: The name of the template
     """
-    model = None
+    queryset = None
     model_form = None
     template_name = 'utilities/obj_edit.html'
 
     def get_object(self, kwargs):
-        # Look up object by slug or PK. Return None if neither was provided.
+        # Look up an existing object by slug or PK, if provided.
         if 'slug' in kwargs:
-            return get_object_or_404(self.model, slug=kwargs['slug'])
+            return get_object_or_404(self.queryset, slug=kwargs['slug'])
         elif 'pk' in kwargs:
-            return get_object_or_404(self.model, pk=kwargs['pk'])
-        return self.model()
+            return get_object_or_404(self.queryset, pk=kwargs['pk'])
+        # Otherwise, return a new instance.
+        return self.queryset.model()
 
     def alter_obj(self, obj, request, url_args, url_kwargs):
         # Allow views to add extra info to an object before it is processed. For example, a parent object can be defined
@@ -249,7 +250,7 @@ class ObjectEditView(GetReturnURLMixin, View):
 
         return render(request, self.template_name, {
             'obj': self.obj,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'form': form,
             'return_url': self.get_return_url(request, self.obj),
         })
@@ -264,7 +265,7 @@ class ObjectEditView(GetReturnURLMixin, View):
             obj = form.save()
             msg = '{} {}'.format(
                 'Created' if not form.instance.pk else 'Modified',
-                self.model._meta.verbose_name
+                self.queryset.model._meta.verbose_name
             )
             logger.info(f"{msg} {obj} (PK: {obj.pk})")
             if hasattr(obj, 'get_absolute_url'):
@@ -293,7 +294,7 @@ class ObjectEditView(GetReturnURLMixin, View):
 
         return render(request, self.template_name, {
             'obj': self.obj,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'form': form,
             'return_url': self.get_return_url(request, self.obj),
         })
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 0a05833f4..0a6c418fe 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -30,7 +30,7 @@ class ClusterTypeListView(PermissionRequiredMixin, ObjectListView):
 
 class ClusterTypeCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'virtualization.add_clustertype'
-    model = ClusterType
+    queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeForm
     default_return_url = 'virtualization:clustertype_list'
 
@@ -65,7 +65,7 @@ class ClusterGroupListView(PermissionRequiredMixin, ObjectListView):
 
 class ClusterGroupCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'virtualization.add_clustergroup'
-    model = ClusterGroup
+    queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupForm
     default_return_url = 'virtualization:clustergroup_list'
 
@@ -122,7 +122,7 @@ class ClusterView(PermissionRequiredMixin, View):
 class ClusterCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'virtualization.add_cluster'
     template_name = 'virtualization/cluster_edit.html'
-    model = Cluster
+    queryset = Cluster.objects.all()
     model_form = forms.ClusterForm
 
 
@@ -281,7 +281,7 @@ class VirtualMachineConfigContextView(PermissionRequiredMixin, ObjectConfigConte
 
 class VirtualMachineCreateView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'virtualization.add_virtualmachine'
-    model = VirtualMachine
+    queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineForm
     template_name = 'virtualization/virtualmachine_edit.html'
     default_return_url = 'virtualization:virtualmachine_list'
@@ -335,7 +335,7 @@ class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_interface'
-    model = Interface
+    queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     template_name = 'virtualization/interface_edit.html'
 

From 3abb52a0851adfc49341e655d7fb8a1d994f14fc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 11 May 2020 12:47:01 -0400
Subject: [PATCH 005/505] #4624: Refactor ObjectDeleteView to use a queryset

---
 netbox/circuits/views.py       |  6 ++--
 netbox/dcim/views.py           | 52 +++++++++++++++++-----------------
 netbox/extras/views.py         |  6 ++--
 netbox/ipam/views.py           | 12 ++++----
 netbox/secrets/views.py        |  2 +-
 netbox/tenancy/views.py        |  2 +-
 netbox/utilities/views.py      | 16 +++++------
 netbox/virtualization/views.py |  6 ++--
 8 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 7fe2501fb..0546b3832 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -74,7 +74,7 @@ class ProviderEditView(ProviderCreateView):
 
 class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_provider'
-    model = Provider
+    queryset = Provider.objects.all()
     default_return_url = 'circuits:provider_list'
 
 
@@ -190,7 +190,7 @@ class CircuitEditView(CircuitCreateView):
 
 class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_circuit'
-    model = Circuit
+    queryset = Circuit.objects.all()
     default_return_url = 'circuits:circuit_list'
 
 
@@ -292,4 +292,4 @@ class CircuitTerminationEditView(CircuitTerminationCreateView):
 
 class CircuitTerminationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_circuittermination'
-    model = CircuitTermination
+    queryset = CircuitTermination.objects.all()
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index c9cc6ac13..1f20d79f2 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -232,7 +232,7 @@ class SiteEditView(SiteCreateView):
 
 class SiteDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_site'
-    model = Site
+    queryset = Site.objects.all()
     default_return_url = 'dcim:site_list'
 
 
@@ -438,7 +438,7 @@ class RackEditView(RackCreateView):
 
 class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rack'
-    model = Rack
+    queryset = Rack.objects.all()
     default_return_url = 'dcim:rack_list'
 
 
@@ -512,7 +512,7 @@ class RackReservationEditView(RackReservationCreateView):
 
 class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rackreservation'
-    model = RackReservation
+    queryset = RackReservation.objects.all()
     default_return_url = 'dcim:rackreservation_list'
 
 
@@ -678,7 +678,7 @@ class DeviceTypeEditView(DeviceTypeCreateView):
 
 class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_devicetype'
-    model = DeviceType
+    queryset = DeviceType.objects.all()
     default_return_url = 'dcim:devicetype_list'
 
 
@@ -746,7 +746,7 @@ class ConsolePortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class ConsolePortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_consoleporttemplate'
-    model = ConsolePortTemplate
+    queryset = ConsolePortTemplate.objects.all()
 
 
 class ConsolePortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -782,7 +782,7 @@ class ConsoleServerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView)
 
 class ConsoleServerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_consoleserverporttemplate'
-    model = ConsoleServerPortTemplate
+    queryset = ConsoleServerPortTemplate.objects.all()
 
 
 class ConsoleServerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -818,7 +818,7 @@ class PowerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class PowerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerporttemplate'
-    model = PowerPortTemplate
+    queryset = PowerPortTemplate.objects.all()
 
 
 class PowerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -854,7 +854,7 @@ class PowerOutletTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class PowerOutletTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_poweroutlettemplate'
-    model = PowerOutletTemplate
+    queryset = PowerOutletTemplate.objects.all()
 
 
 class PowerOutletTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -890,7 +890,7 @@ class InterfaceTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class InterfaceTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_interfacetemplate'
-    model = InterfaceTemplate
+    queryset = InterfaceTemplate.objects.all()
 
 
 class InterfaceTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -926,7 +926,7 @@ class FrontPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class FrontPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_frontporttemplate'
-    model = FrontPortTemplate
+    queryset = FrontPortTemplate.objects.all()
 
 
 class FrontPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -962,7 +962,7 @@ class RearPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class RearPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rearporttemplate'
-    model = RearPortTemplate
+    queryset = RearPortTemplate.objects.all()
 
 
 class RearPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -998,7 +998,7 @@ class DeviceBayTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 
 class DeviceBayTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_devicebaytemplate'
-    model = DeviceBayTemplate
+    queryset = DeviceBayTemplate.objects.all()
 
 
 # class DeviceBayTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -1259,7 +1259,7 @@ class DeviceEditView(DeviceCreateView):
 
 class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_device'
-    model = Device
+    queryset = Device.objects.all()
     default_return_url = 'dcim:device_list'
 
 
@@ -1336,7 +1336,7 @@ class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView):
 
 class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_consoleport'
-    model = ConsolePort
+    queryset = ConsolePort.objects.all()
 
 
 class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1391,7 +1391,7 @@ class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView):
 
 class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_consoleserverport'
-    model = ConsoleServerPort
+    queryset = ConsoleServerPort.objects.all()
 
 
 class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1458,7 +1458,7 @@ class PowerPortEditView(PermissionRequiredMixin, ObjectEditView):
 
 class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerport'
-    model = PowerPort
+    queryset = PowerPort.objects.all()
 
 
 class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1513,7 +1513,7 @@ class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView):
 
 class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_poweroutlet'
-    model = PowerOutlet
+    queryset = PowerOutlet.objects.all()
 
 
 class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1617,7 +1617,7 @@ class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
 
 class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_interface'
-    model = Interface
+    queryset = Interface.objects.all()
 
 
 class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1684,7 +1684,7 @@ class FrontPortEditView(PermissionRequiredMixin, ObjectEditView):
 
 class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_frontport'
-    model = FrontPort
+    queryset = FrontPort.objects.all()
 
 
 class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1751,7 +1751,7 @@ class RearPortEditView(PermissionRequiredMixin, ObjectEditView):
 
 class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rearport'
-    model = RearPort
+    queryset = RearPort.objects.all()
 
 
 class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1820,7 +1820,7 @@ class DeviceBayEditView(PermissionRequiredMixin, ObjectEditView):
 
 class DeviceBayDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_devicebay'
-    model = DeviceBay
+    queryset = DeviceBay.objects.all()
 
 
 class DeviceBayPopulateView(PermissionRequiredMixin, View):
@@ -2162,7 +2162,7 @@ class CableEditView(PermissionRequiredMixin, ObjectEditView):
 
 class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_cable'
-    model = Cable
+    queryset = Cable.objects.all()
     default_return_url = 'dcim:cable_list'
 
 
@@ -2323,7 +2323,7 @@ class InventoryItemCreateView(PermissionRequiredMixin, ComponentCreateView):
 
 class InventoryItemDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_inventoryitem'
-    model = InventoryItem
+    queryset = InventoryItem.objects.all()
 
 
 class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -2496,7 +2496,7 @@ class VirtualChassisEditView(PermissionRequiredMixin, GetReturnURLMixin, View):
 
 class VirtualChassisDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_virtualchassis'
-    model = VirtualChassis
+    queryset = VirtualChassis.objects.all()
     default_return_url = 'dcim:device_list'
 
 
@@ -2665,7 +2665,7 @@ class PowerPanelEditView(PowerPanelCreateView):
 
 class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerpanel'
-    model = PowerPanel
+    queryset = PowerPanel.objects.all()
     default_return_url = 'dcim:powerpanel_list'
 
 
@@ -2737,7 +2737,7 @@ class PowerFeedEditView(PowerFeedCreateView):
 
 class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerfeed'
-    model = PowerFeed
+    queryset = PowerFeed.objects.all()
     default_return_url = 'dcim:powerfeed_list'
 
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 687ff69b0..e466414b6 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -75,7 +75,7 @@ class TagEditView(PermissionRequiredMixin, ObjectEditView):
 
 class TagDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'extras.delete_tag'
-    model = Tag
+    queryset = Tag.objects.all()
     default_return_url = 'extras:tag_list'
 
 
@@ -157,7 +157,7 @@ class ConfigContextBulkEditView(PermissionRequiredMixin, BulkEditView):
 
 class ConfigContextDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'extras.delete_configcontext'
-    model = ConfigContext
+    queryset = ConfigContext.objects.all()
     default_return_url = 'extras:configcontext_list'
 
 
@@ -322,7 +322,7 @@ class ImageAttachmentEditView(PermissionRequiredMixin, ObjectEditView):
 
 class ImageAttachmentDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'extras.delete_imageattachment'
-    model = ImageAttachment
+    queryset = ImageAttachment.objects.all()
 
     def get_return_url(self, request, imageattachment):
         return imageattachment.parent.get_absolute_url()
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index bf94a4f74..92eb5b823 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -148,7 +148,7 @@ class VRFEditView(VRFCreateView):
 
 class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_vrf'
-    model = VRF
+    queryset = VRF.objects.all()
     default_return_url = 'ipam:vrf_list'
 
 
@@ -373,7 +373,7 @@ class AggregateEditView(AggregateCreateView):
 
 class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_aggregate'
-    model = Aggregate
+    queryset = Aggregate.objects.all()
     default_return_url = 'ipam:aggregate_list'
 
 
@@ -600,7 +600,7 @@ class PrefixEditView(PrefixCreateView):
 
 class PrefixDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_prefix'
-    model = Prefix
+    queryset = Prefix.objects.all()
     template_name = 'ipam/prefix_delete.html'
     default_return_url = 'ipam:prefix_list'
 
@@ -766,7 +766,7 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
 
 class IPAddressDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_ipaddress'
-    model = IPAddress
+    queryset = IPAddress.objects.all()
     default_return_url = 'ipam:ipaddress_list'
 
 
@@ -945,7 +945,7 @@ class VLANEditView(VLANCreateView):
 
 class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_vlan'
-    model = VLAN
+    queryset = VLAN.objects.all()
     default_return_url = 'ipam:vlan_list'
 
 
@@ -1028,7 +1028,7 @@ class ServiceEditView(ServiceCreateView):
 
 class ServiceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_service'
-    model = Service
+    queryset = Service.objects.all()
 
 
 class ServiceBulkEditView(PermissionRequiredMixin, BulkEditView):
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 937b06edf..b40e41cb3 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -191,7 +191,7 @@ def secret_edit(request, pk):
 
 class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'secrets.delete_secret'
-    model = Secret
+    queryset = Secret.objects.all()
     default_return_url = 'secrets:secret_list'
 
 
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 148ac6c17..2af44094f 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -107,7 +107,7 @@ class TenantEditView(TenantCreateView):
 
 class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'tenancy.delete_tenant'
-    model = Tenant
+    queryset = Tenant.objects.all()
     default_return_url = 'tenancy:tenant_list'
 
 
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index cde38846e..076f2ad14 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -216,7 +216,7 @@ class ObjectEditView(GetReturnURLMixin, View):
     """
     Create or edit a single object.
 
-    queryset: The base queryset for the model being modified
+    queryset: The base queryset for the object being modified
     model_form: The form used to create or edit the object
     template_name: The name of the template
     """
@@ -304,18 +304,18 @@ class ObjectDeleteView(GetReturnURLMixin, View):
     """
     Delete a single object.
 
-    model: The model of the object being deleted
+    queryset: The base queryset for the object being deleted
     template_name: The name of the template
     """
-    model = None
+    queryset = None
     template_name = 'utilities/obj_delete.html'
 
     def get_object(self, kwargs):
         # Look up object by slug if one has been provided. Otherwise, use PK.
         if 'slug' in kwargs:
-            return get_object_or_404(self.model, slug=kwargs['slug'])
+            return get_object_or_404(self.queryset, slug=kwargs['slug'])
         else:
-            return get_object_or_404(self.model, pk=kwargs['pk'])
+            return get_object_or_404(self.queryset, pk=kwargs['pk'])
 
     def get(self, request, **kwargs):
         obj = self.get_object(kwargs)
@@ -324,7 +324,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
         return render(request, self.template_name, {
             'obj': obj,
             'form': form,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'return_url': self.get_return_url(request, obj),
         })
 
@@ -343,7 +343,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
                 handle_protectederror(obj, request, e)
                 return redirect(obj.get_absolute_url())
 
-            msg = 'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
+            msg = 'Deleted {} {}'.format(self.queryset.model._meta.verbose_name, obj)
             logger.info(msg)
             messages.success(request, msg)
 
@@ -359,7 +359,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
         return render(request, self.template_name, {
             'obj': obj,
             'form': form,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'return_url': self.get_return_url(request, obj),
         })
 
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 0a6c418fe..68a2443ae 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -132,7 +132,7 @@ class ClusterEditView(ClusterCreateView):
 
 class ClusterDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'virtualization.delete_cluster'
-    model = Cluster
+    queryset = Cluster.objects.all()
     default_return_url = 'virtualization:cluster_list'
 
 
@@ -293,7 +293,7 @@ class VirtualMachineEditView(VirtualMachineCreateView):
 
 class VirtualMachineDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'virtualization.delete_virtualmachine'
-    model = VirtualMachine
+    queryset = VirtualMachine.objects.all()
     default_return_url = 'virtualization:virtualmachine_list'
 
 
@@ -342,7 +342,7 @@ class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
 
 class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_interface'
-    model = Interface
+    queryset = Interface.objects.all()
 
 
 class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView):

From 63f842c7db791e68221e888e0c16403a0281ff93 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 11 May 2020 14:32:10 -0400
Subject: [PATCH 006/505] Implement ObjectPermissionManager

---
 netbox/dcim/views.py              |  9 ++---
 netbox/netbox/authentication.py   | 16 +++------
 netbox/users/models.py            | 35 +++++++++++++++++++
 netbox/utilities/auth_backends.py | 21 ++++-------
 netbox/utilities/views.py         | 58 +++++++++++++++++++------------
 5 files changed, 85 insertions(+), 54 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index b3f97995c..03e375d35 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -194,12 +194,13 @@ class SiteListView(ObjectPermissionRequiredMixin, ObjectListView):
     table = tables.SiteTable
 
 
-class SiteView(PermissionRequiredMixin, View):
+class SiteView(ObjectPermissionRequiredMixin, View):
     permission_required = 'dcim.view_site'
+    queryset = Site.objects.prefetch_related('region', 'tenant__group')
 
     def get(self, request, slug):
 
-        site = get_object_or_404(Site.objects.prefetch_related('region', 'tenant__group'), slug=slug)
+        site = get_object_or_404(self.queryset, slug=slug)
         stats = {
             'rack_count': Rack.objects.filter(site=site).count(),
             'device_count': Device.objects.filter(site=site).count(),
@@ -219,7 +220,7 @@ class SiteView(PermissionRequiredMixin, View):
         })
 
 
-class SiteCreateView(PermissionRequiredMixin, ObjectEditView):
+class SiteCreateView(ObjectPermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.add_site'
     queryset = Site.objects.all()
     model_form = forms.SiteForm
@@ -231,7 +232,7 @@ class SiteEditView(SiteCreateView):
     permission_required = 'dcim.change_site'
 
 
-class SiteDeleteView(PermissionRequiredMixin, ObjectDeleteView):
+class SiteDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_site'
     queryset = Site.objects.all()
     default_return_url = 'dcim:site_list'
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 58fd4380a..850189a83 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -14,22 +14,14 @@ class ObjectPermissionRequiredMixin(AccessMixin):
         if self.request.user.has_perm(self.permission_required):
             return True
 
-        # If not, check for an object-level permission
+        # If not, check for object-level permissions
         app, codename = self.permission_required.split('.')
         action, model_name = codename.split('_')
         model = self.queryset.model
-        obj_permissions = ObjectPermission.objects.filter(
-            Q(users=self.request.user) | Q(groups__user=self.request.user),
-            model=ContentType.objects.get_for_model(model),
-            **{f'can_{action}': True}
-        )
-        if obj_permissions:
-
+        attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, model, action)
+        if attrs:
             # Update the view's QuerySet to filter only the permitted objects
-            # TODO: Do this more efficiently
-            for perm in obj_permissions:
-                self.queryset = self.queryset.filter(**perm.attrs)
-
+            self.queryset = self.queryset.filter(**attrs)
             return True
 
         return False
diff --git a/netbox/users/models.py b/netbox/users/models.py
index f2002ae95..bb2093f05 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -7,6 +7,7 @@ from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import FieldError, ValidationError
 from django.core.validators import MinLengthValidator
 from django.db import models
+from django.db.models import Q
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
@@ -194,6 +195,38 @@ class Token(models.Model):
         return True
 
 
+class ObjectPermissionManager(models.Manager):
+
+    def get_attr_constraints(self, user, model, action):
+        """
+        Compile all ObjectPermission attributes applicable to a specific combination of user, model, and action. Returns
+        a dictionary that can be passed directly to .filter() on a QuerySet.
+        """
+        assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
+
+        qs = self.get_queryset().filter(
+            Q(users=user) | Q(groups__user=user),
+            model=ContentType.objects.get_for_model(model),
+            **{f'can_{action}': True}
+        )
+
+        attrs = {}
+        for perm in qs:
+            attrs.update(perm.attrs)
+
+        return attrs
+
+    def validate_queryset(self, queryset, user, action):
+        """
+        Check that the specified user has permission to perform the specified action on all objects in the QuerySet.
+        """
+        assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
+
+        model = queryset.model
+        attrs = self.get_attr_constraints(user, model, action)
+        return queryset.count() == model.objects.filter(**attrs).count()
+
+
 class ObjectPermission(models.Model):
     """
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
@@ -229,6 +262,8 @@ class ObjectPermission(models.Model):
         default=False
     )
 
+    objects = ObjectPermissionManager()
+
     class Meta:
         unique_together = ('model', 'attrs')
 
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 0d20fe02f..7deb9b0de 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -56,21 +56,12 @@ class ObjectPermissionBackend(ModelBackend):
         if model._meta.model_name != model_name:
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
-        # Retrieve user's permissions for this model
-        # This can probably be cached
-        obj_permissions = ObjectPermission.objects.filter(
-            Q(users=user_obj) | Q(groups__user=user_obj),
-            model=ContentType.objects.get_for_model(obj),
-            **{f'can_{action}': True}
-        )
-
-        for perm in obj_permissions:
-
-            # Attempt to retrieve the model from the database using the
-            # attributes defined in the ObjectPermission. If we have a
-            # match, assert that the user has permission.
-            if model.objects.filter(pk=obj.pk, **perm.attrs).exists():
-                return True
+        # Attempt to retrieve the model from the database using the
+        # attributes defined in the ObjectPermission. If we have a
+        # match, assert that the user has permission.
+        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, obj, action)
+        if model.objects.filter(pk=obj.pk, **attrs).exists():
+            return True
 
 
 class RemoteUserBackend(ViewExemptModelBackend, RemoteUserBackend_):
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 076f2ad14..d9eace90b 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -4,7 +4,7 @@ from copy import deepcopy
 
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import FieldDoesNotExist, ValidationError
+from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist, ValidationError
 from django.db import transaction, IntegrityError
 from django.db.models import ManyToManyField, ProtectedError
 from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
@@ -23,6 +23,7 @@ from django_tables2 import RequestConfig
 
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
+from users.models import ObjectPermission
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
 from utilities.utils import csv_format, prepare_cloned_fields
@@ -262,32 +263,43 @@ class ObjectEditView(GetReturnURLMixin, View):
         if form.is_valid():
             logger.debug("Form validation was successful")
 
-            obj = form.save()
-            msg = '{} {}'.format(
-                'Created' if not form.instance.pk else 'Modified',
-                self.queryset.model._meta.verbose_name
-            )
-            logger.info(f"{msg} {obj} (PK: {obj.pk})")
-            if hasattr(obj, 'get_absolute_url'):
-                msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), escape(obj))
-            else:
-                msg = '{} {}'.format(msg, escape(obj))
-            messages.success(request, mark_safe(msg))
+            try:
+                with transaction.atomic():
+                    obj = form.save()
 
-            if '_addanother' in request.POST:
+                    # Check that the new object conforms with any assigned object-level permissions
+                    self.queryset.get(pk=obj.pk)
 
-                # If the object has clone_fields, pre-populate a new instance of the form
-                if hasattr(obj, 'clone_fields'):
-                    url = '{}?{}'.format(request.path, prepare_cloned_fields(obj))
-                    return redirect(url)
+                msg = '{} {}'.format(
+                    'Created' if not form.instance.pk else 'Modified',
+                    self.queryset.model._meta.verbose_name
+                )
+                logger.info(f"{msg} {obj} (PK: {obj.pk})")
+                if hasattr(obj, 'get_absolute_url'):
+                    msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), escape(obj))
+                else:
+                    msg = '{} {}'.format(msg, escape(obj))
+                messages.success(request, mark_safe(msg))
 
-                return redirect(request.get_full_path())
+                if '_addanother' in request.POST:
 
-            return_url = form.cleaned_data.get('return_url')
-            if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                return redirect(return_url)
-            else:
-                return redirect(self.get_return_url(request, obj))
+                    # If the object has clone_fields, pre-populate a new instance of the form
+                    if hasattr(obj, 'clone_fields'):
+                        url = '{}?{}'.format(request.path, prepare_cloned_fields(obj))
+                        return redirect(url)
+
+                    return redirect(request.get_full_path())
+
+                return_url = form.cleaned_data.get('return_url')
+                if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
+                    return redirect(return_url)
+                else:
+                    return redirect(self.get_return_url(request, obj))
+
+            except ObjectDoesNotExist:
+                logger.debug("Object save failed due to object-level permissions violation")
+                # TODO: Link user to personal permissions view
+                form.add_error(None, "Object save failed due to object-level permissions violation")
 
         else:
             logger.debug("Form validation failed")

From daa2c6ff215cdef5f9f99b74cd12838a1a8a5a9b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 11 May 2020 17:19:11 -0400
Subject: [PATCH 007/505] Always pass obj=None to ModelBackend

---
 netbox/utilities/auth_backends.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 7deb9b0de..65154a6f8 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -3,8 +3,6 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as RemoteUserBackend_
 from django.contrib.auth.models import Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q
 
 from users.models import ObjectPermission
 
@@ -26,13 +24,16 @@ class ViewExemptModelBackend(ModelBackend):
                     '*' in settings.EXEMPT_VIEW_PERMISSIONS
                 ) or (
                     # This specific model is exempt from view permission enforcement
-                    '{}.{}'.format(app, model) in settings.EXEMPT_VIEW_PERMISSIONS
+                    '.'.join((app, model)) in settings.EXEMPT_VIEW_PERMISSIONS
                 ):
                     return True
         except ValueError:
             pass
 
-        return super().has_perm(user_obj, perm, obj)
+        # Fall back to ModelBackend's default behavior, with one exception: Set obj to None. Model-level permissions
+        # override object-level permissions, so if a user has the model-level permission we can ignore any specified
+        # object. (By default, ModelBackend will return False if an object is specified.)
+        return super().has_perm(user_obj, perm, None)
 
 
 class ObjectPermissionBackend(ModelBackend):
@@ -56,9 +57,8 @@ class ObjectPermissionBackend(ModelBackend):
         if model._meta.model_name != model_name:
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
-        # Attempt to retrieve the model from the database using the
-        # attributes defined in the ObjectPermission. If we have a
-        # match, assert that the user has permission.
+        # Attempt to retrieve the model from the database using the attributes defined in the
+        # ObjectPermission. If we have a match, assert that the user has permission.
         attrs = ObjectPermission.objects.get_attr_constraints(user_obj, obj, action)
         if model.objects.filter(pk=obj.pk, **attrs).exists():
             return True

From c90f680284838475b1ed8dec45d33a4c10f47c22 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 12 May 2020 15:42:44 -0400
Subject: [PATCH 008/505] Cache object-level permissions on the User instance
 for evaluation

---
 netbox/netbox/authentication.py   | 48 +++++++++++++++++++++----------
 netbox/users/models.py            | 17 ++++-------
 netbox/utilities/auth_backends.py | 43 +++++++++++++++++++++++----
 3 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 850189a83..0b896969b 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -1,32 +1,50 @@
 from django.contrib.auth.mixins import AccessMixin
-from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q
+from django.core.exceptions import ImproperlyConfigured
 
 from users.models import ObjectPermission
 
 
 class ObjectPermissionRequiredMixin(AccessMixin):
+    """
+    Similar to Django's built-in PermissionRequiredMixin, but extended to check for both model-level and object-level
+    permission assignments. If the user has only object-level permissions assigned, the view's queryset is filtered
+    to return only those objects on which the user is permitted to perform the specified action.
+    """
     permission_required = None
 
     def has_permission(self):
+        # First, check whether the user is granted the requested permissions from any backend.
+        if not self.request.user.has_perm(self.permission_required):
+            return False
 
-        # First, check whether the user has a model-level permission assigned
-        if self.request.user.has_perm(self.permission_required):
+        # Next, determine whether the permission is model-level or object-level. Model-level permissions grant the
+        # specified action to *all* objects, so no further action is needed.
+        if self.permission_required in self.request.user._perm_cache:
             return True
 
-        # If not, check for object-level permissions
-        app, codename = self.permission_required.split('.')
-        action, model_name = codename.split('_')
-        model = self.queryset.model
-        attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, model, action)
-        if attrs:
-            # Update the view's QuerySet to filter only the permitted objects
-            self.queryset = self.queryset.filter(**attrs)
-            return True
-
-        return False
+        # If the permission is granted only at the object level, filter the view's queryset to return only objects
+        # on which the user is permitted to perform the specified action.
+        if self.permission_required in self.request.user._obj_perm_cache:
+            attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, self.permission_required)
+            if attrs:
+                # Update the view's QuerySet to filter only the permitted objects
+                self.queryset = self.queryset.filter(**attrs)
+                return True
 
     def dispatch(self, request, *args, **kwargs):
+        if self.permission_required is None:
+            raise ImproperlyConfigured(
+                '{0} is missing the permission_required attribute. Define {0}.permission_required, or override '
+                '{0}.get_permission_required().'.format(self.__class__.__name__)
+            )
+
+        if not hasattr(self, 'queryset'):
+            raise ImproperlyConfigured(
+                '{} has no queryset defined. ObjectPermissionRequiredMixin may only be used on views which define '
+                'a base queryset'.format(self.__class__.__name__)
+            )
+
         if not self.has_permission():
             return self.handle_no_permission()
+
         return super().dispatch(request, *args, **kwargs)
diff --git a/netbox/users/models.py b/netbox/users/models.py
index bb2093f05..452e91c21 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -197,16 +197,19 @@ class Token(models.Model):
 
 class ObjectPermissionManager(models.Manager):
 
-    def get_attr_constraints(self, user, model, action):
+    def get_attr_constraints(self, user, perm):
         """
         Compile all ObjectPermission attributes applicable to a specific combination of user, model, and action. Returns
         a dictionary that can be passed directly to .filter() on a QuerySet.
         """
+        app_label, codename = perm.split('.')
+        action, model_name = codename.split('_')
         assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
 
+        content_type = ContentType.objects.get(app_label=app_label, model=model_name)
         qs = self.get_queryset().filter(
             Q(users=user) | Q(groups__user=user),
-            model=ContentType.objects.get_for_model(model),
+            model=content_type,
             **{f'can_{action}': True}
         )
 
@@ -216,16 +219,6 @@ class ObjectPermissionManager(models.Manager):
 
         return attrs
 
-    def validate_queryset(self, queryset, user, action):
-        """
-        Check that the specified user has permission to perform the specified action on all objects in the QuerySet.
-        """
-        assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
-
-        model = queryset.model
-        attrs = self.get_attr_constraints(user, model, action)
-        return queryset.count() == model.objects.filter(**attrs).count()
-
 
 class ObjectPermission(models.Model):
     """
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 65154a6f8..f4290e917 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -3,6 +3,8 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as RemoteUserBackend_
 from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 
 from users.models import ObjectPermission
 
@@ -43,23 +45,54 @@ class ObjectPermissionBackend(ModelBackend):
     check: For example, if a user has the dcim.view_site model-level permission assigned, the ViewExemptModelBackend
     will grant permission before this backend is evaluated for permission to view a specific site.
     """
+    def _get_all_permissions(self, user_obj):
+        """
+        Retrieve all ObjectPermissions assigned to this User (either directly or through a Group) and return the model-
+        level equivalent codenames.
+        """
+        perm_names = set()
+        for obj_perm in ObjectPermission.objects.filter(
+            Q(users=user_obj) | Q(groups__user=user_obj)
+        ).prefetch_related('model'):
+            for action in ['view', 'add', 'change', 'delete']:
+                if getattr(obj_perm, f"can_{action}"):
+                    perm_names.add(f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}")
+        return perm_names
+
+    def get_all_permissions(self, user_obj, obj=None):
+        """
+        Get all model-level permissions assigned by this backend. Permissions are cached on the User instance.
+        """
+        if not user_obj.is_active or user_obj.is_anonymous:
+            return set()
+        if not hasattr(user_obj, '_obj_perm_cache'):
+            user_obj._obj_perm_cache = self._get_all_permissions(user_obj)
+        return user_obj._obj_perm_cache
+
     def has_perm(self, user_obj, perm, obj=None):
 
-        # This backend only checks for permissions on specific objects
+        # If no object is specified, look for any matching ObjectPermissions. If one or more are found, this indicates
+        # that the user has permission to perform the requested action on at least *some* objects, but not necessarily
+        # on all of them.
         if obj is None:
+            return perm in self.get_all_permissions(user_obj)
+
+        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, perm)
+
+        # No ObjectPermissions found for this combination of user, model, and action
+        if not attrs:
             return
 
-        app, codename = perm.split('.')
-        action, model_name = codename.split('_')
         model = obj._meta.model
 
         # Check that the requested permission applies to the specified object
-        if model._meta.model_name != model_name:
+        app_label, codename = perm.split('.')
+        action, model_name = codename.split('_')
+        if model._meta.label_lower != '.'.join((app_label, model_name)):
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
         # Attempt to retrieve the model from the database using the attributes defined in the
         # ObjectPermission. If we have a match, assert that the user has permission.
-        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, obj, action)
         if model.objects.filter(pk=obj.pk, **attrs).exists():
             return True
 

From a275a30dcae507d42a1da0c319c44d73691e1de3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 12 May 2020 16:07:07 -0400
Subject: [PATCH 009/505] Reimplement the ViewExemptModelBackend to explicitly
 cache all exempted view permissions on the User instance

---
 netbox/utilities/auth_backends.py | 39 ++++++++++++++-----------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index f4290e917..49dd8d0aa 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -3,7 +3,6 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as RemoteUserBackend_
 from django.contrib.auth.models import Group, Permission
-from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 
 from users.models import ObjectPermission
@@ -14,28 +13,26 @@ class ViewExemptModelBackend(ModelBackend):
     Custom implementation of Django's stock ModelBackend which allows for the exemption of arbitrary models from view
     permission enforcement.
     """
-    def has_perm(self, user_obj, perm, obj=None):
+    def _get_user_permissions(self, user_obj):
 
-        # If this is a view permission, check whether the model has been exempted from enforcement
-        try:
-            app, codename = perm.split('.')
-            action, model = codename.split('_')
-            if action == 'view':
-                if (
-                    # All models are exempt from view permission enforcement
-                    '*' in settings.EXEMPT_VIEW_PERMISSIONS
-                ) or (
-                    # This specific model is exempt from view permission enforcement
-                    '.'.join((app, model)) in settings.EXEMPT_VIEW_PERMISSIONS
-                ):
-                    return True
-        except ValueError:
-            pass
+        if not settings.EXEMPT_VIEW_PERMISSIONS:
+            # No view permissions have been exempted from enforcement, so fall back to the built-in logic.
+            return super()._get_user_permissions(user_obj)
 
-        # Fall back to ModelBackend's default behavior, with one exception: Set obj to None. Model-level permissions
-        # override object-level permissions, so if a user has the model-level permission we can ignore any specified
-        # object. (By default, ModelBackend will return False if an object is specified.)
-        return super().has_perm(user_obj, perm, None)
+        if '*' in settings.EXEMPT_VIEW_PERMISSIONS:
+            # All view permissions have been exempted from enforcement, so include all view permissions when fetching
+            # User permissions.
+            return Permission.objects.filter(
+                Q(user=user_obj) | Q(codename__startswith='view_')
+            )
+
+        # Return all Permissions that are either assigned to the user or that are view permissions listed in
+        # EXEMPT_VIEW_PERMISSIONS.
+        qs_filter = Q(user=user_obj)
+        for model in settings.EXEMPT_VIEW_PERMISSIONS:
+            app, name = model.split('.')
+            qs_filter |= Q(content_type__app_label=app, codename=f'view_{name}')
+        return Permission.objects.filter(qs_filter)
 
 
 class ObjectPermissionBackend(ModelBackend):

From 94d0ebbd7df8f45c7206edadeac02fa9fcfb9266 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 12 May 2020 16:40:04 -0400
Subject: [PATCH 010/505] Fix ObjectPermission attribute consolidation

---
 netbox/netbox/authentication.py        | 2 +-
 netbox/users/models.py                 | 4 ++--
 netbox/users/tests/test_permissions.py | 8 ++++----
 netbox/utilities/auth_backends.py      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 0b896969b..2854d4cb9 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -28,7 +28,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
             attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, self.permission_required)
             if attrs:
                 # Update the view's QuerySet to filter only the permitted objects
-                self.queryset = self.queryset.filter(**attrs)
+                self.queryset = self.queryset.filter(attrs)
                 return True
 
     def dispatch(self, request, *args, **kwargs):
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 452e91c21..70e7254e6 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -213,9 +213,9 @@ class ObjectPermissionManager(models.Manager):
             **{f'can_{action}': True}
         )
 
-        attrs = {}
+        attrs = Q()
         for perm in qs:
-            attrs.update(perm.attrs)
+            attrs |= Q(**perm.attrs)
 
         return attrs
 
diff --git a/netbox/users/tests/test_permissions.py b/netbox/users/tests/test_permissions.py
index f73fd8f43..487543bd3 100644
--- a/netbox/users/tests/test_permissions.py
+++ b/netbox/users/tests/test_permissions.py
@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User
 from django.test import TestCase, override_settings
 
 from dcim.models import Site
@@ -7,7 +7,7 @@ from tenancy.models import Tenant
 from users.models import ObjectPermission
 
 
-class UserConfigTest(TestCase):
+class ObjectPermissionTest(TestCase):
 
     def setUp(self):
 
@@ -41,7 +41,7 @@ class UserConfigTest(TestCase):
             can_view=True
         )
         object_perm.save()
-        self.user.object_permissions.add(object_perm)
+        object_perm.users.add(self.user)
 
         # The test user should have permission to view only the first site.
         self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
@@ -54,7 +54,7 @@ class UserConfigTest(TestCase):
             can_view=True
         )
         object_perm.save()
-        self.user.object_permissions.add(object_perm)
+        object_perm.users.add(self.user)
 
         # The user should now able to view the first two sites, but not the third.
         self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 49dd8d0aa..9e56fd16c 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -90,7 +90,7 @@ class ObjectPermissionBackend(ModelBackend):
 
         # Attempt to retrieve the model from the database using the attributes defined in the
         # ObjectPermission. If we have a match, assert that the user has permission.
-        if model.objects.filter(pk=obj.pk, **attrs).exists():
+        if model.objects.filter(attrs, pk=obj.pk).exists():
             return True
 
 

From be5962fb3a409b12fcc768fdff7c0aec17739e27 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 12 May 2020 17:00:03 -0400
Subject: [PATCH 011/505] ObjectPermissionRequiredMixin should exempt
 superusers

---
 netbox/netbox/authentication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 2854d4cb9..d85b2f124 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -19,7 +19,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
 
         # Next, determine whether the permission is model-level or object-level. Model-level permissions grant the
         # specified action to *all* objects, so no further action is needed.
-        if self.permission_required in self.request.user._perm_cache:
+        if self.request.user.is_superuser or self.permission_required in self.request.user._perm_cache:
             return True
 
         # If the permission is granted only at the object level, filter the view's queryset to return only objects

From f54fb67efc621a5f0198dc7ac525e44476a5381a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 14 May 2020 13:49:13 -0400
Subject: [PATCH 012/505] Add object-level support to TokenPermissions

---
 netbox/netbox/api.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py
index 0e04719f9..a67a5d60a 100644
--- a/netbox/netbox/api.py
+++ b/netbox/netbox/api.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.db.models import QuerySet
 from rest_framework import authentication, exceptions
 from rest_framework.pagination import LimitOffsetPagination
-from rest_framework.permissions import DjangoModelPermissions, SAFE_METHODS
+from rest_framework.permissions import DjangoObjectPermissions, SAFE_METHODS
 from rest_framework.renderers import BrowsableAPIRenderer
 from rest_framework.utils import formatting
 
@@ -51,7 +51,7 @@ class TokenAuthentication(authentication.TokenAuthentication):
         return token.user, token
 
 
-class TokenPermissions(DjangoModelPermissions):
+class TokenPermissions(DjangoObjectPermissions):
     """
     Custom permissions handler which extends the built-in DjangoModelPermissions to validate a Token's write ability
     for unsafe requests (POST/PUT/PATCH/DELETE).
@@ -74,15 +74,29 @@ class TokenPermissions(DjangoModelPermissions):
 
         super().__init__()
 
+    def _verify_write_permission(self, request):
+        # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
+        if request.method in SAFE_METHODS:
+            return True
+        if isinstance(request.auth, Token) and request.auth.write_enabled:
+            return True
+
     def has_permission(self, request, view):
 
-        # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
-        if request.method not in SAFE_METHODS and isinstance(request.auth, Token):
-            if not request.auth.write_enabled:
-                return False
+        # Enforce Token write ability
+        if not self._verify_write_permission(request):
+            return False
 
         return super().has_permission(request, view)
 
+    def has_object_permission(self, request, view, obj):
+
+        # Enforce Token write ability
+        if not self._verify_write_permission(request):
+            return False
+
+        return super().has_object_permission(request, view, obj)
+
 
 #
 # Pagination

From 73895b1c88fdfe4f15de9045884ceee05cae6b52 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 14 May 2020 17:44:15 -0400
Subject: [PATCH 013/505] Bypass permission caching for anonymous users

---
 netbox/utilities/auth_backends.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 9e56fd16c..46ec69458 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -34,6 +34,28 @@ class ViewExemptModelBackend(ModelBackend):
             qs_filter |= Q(content_type__app_label=app, codename=f'view_{name}')
         return Permission.objects.filter(qs_filter)
 
+    def has_perm(self, user_obj, perm, obj=None):
+
+        # Authenticated users need to have the view permissions cached for assessment
+        if user_obj.is_authenticated:
+            return super().has_perm(user_obj, perm, obj)
+
+        # If this is a view permission, check whether the model has been exempted from enforcement
+        try:
+            app, codename = perm.split('.')
+            action, model = codename.split('_')
+            if action == 'view':
+                if (
+                    # All models are exempt from view permission enforcement
+                    '*' in settings.EXEMPT_VIEW_PERMISSIONS
+                ) or (
+                    # This specific model is exempt from view permission enforcement
+                    '{}.{}'.format(app, model) in settings.EXEMPT_VIEW_PERMISSIONS
+                ):
+                    return True
+        except ValueError:
+            pass
+
 
 class ObjectPermissionBackend(ModelBackend):
     """

From aeb32104a46c32797380c80e2549e4583377d58d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 14 May 2020 17:44:46 -0400
Subject: [PATCH 014/505] Enforce object-level permissions for API views

---
 netbox/utilities/api.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 205055669..405c26878 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -6,15 +6,15 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist
 from django.db.models import ManyToManyField, ProtectedError
-from django.http import Http404
 from django.urls import reverse
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import BasePermission
 from rest_framework.relations import PrimaryKeyRelatedField, RelatedField
 from rest_framework.response import Response
 from rest_framework.serializers import Field, ModelSerializer, ValidationError
-from rest_framework.viewsets import ModelViewSet as _ModelViewSet, ViewSet
+from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
+from users.models import ObjectPermission
 from .utils import dict_to_filter_params, dynamic_import
 
 
@@ -323,6 +323,22 @@ class ModelViewSet(_ModelViewSet):
         logger.debug(f"Using serializer {self.serializer_class}")
         return self.serializer_class
 
+    def initial(self, request, *args, **kwargs):
+        super().initial(request, *args, **kwargs)
+
+        if not request.user.is_authenticated or request.user.is_superuser:
+            return
+
+        permission_required = 'dcim.view_site'
+
+        # Enforce object-level permissions
+        if permission_required not in self.request.user._perm_cache:
+            attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, permission_required)
+            if attrs:
+                # Update the view's QuerySet to filter only the permitted objects
+                self.queryset = self.queryset.filter(attrs)
+                return True
+
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
 

From 64f60228ecb85e0dd2d96ec796e84bf833d880ad Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 20 May 2020 13:35:54 -0400
Subject: [PATCH 015/505] Add web UI view tests for object-level permissions

---
 netbox/ipam/views.py                       |  14 +-
 netbox/netbox/tests/test_authentication.py | 221 ++++++++++++++++++++-
 2 files changed, 227 insertions(+), 8 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 92eb5b823..0c7d0770f 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -8,6 +8,7 @@ from django.views.generic import View
 from django_tables2 import RequestConfig
 
 from dcim.models import Device, Interface
+from netbox.authentication import ObjectPermissionRequiredMixin
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
@@ -440,7 +441,7 @@ class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Prefixes
 #
 
-class PrefixListView(PermissionRequiredMixin, ObjectListView):
+class PrefixListView(ObjectPermissionRequiredMixin, ObjectListView):
     permission_required = 'ipam.view_prefix'
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
@@ -454,14 +455,13 @@ class PrefixListView(PermissionRequiredMixin, ObjectListView):
         return self.queryset.annotate_depth(limit=limit)
 
 
-class PrefixView(PermissionRequiredMixin, View):
+class PrefixView(ObjectPermissionRequiredMixin, View):
     permission_required = 'ipam.view_prefix'
+    queryset = Prefix.objects.prefetch_related('vrf', 'site__region', 'tenant__group', 'vlan__group', 'role')
 
     def get(self, request, pk):
 
-        prefix = get_object_or_404(Prefix.objects.prefetch_related(
-            'vrf', 'site__region', 'tenant__group', 'vlan__group', 'role'
-        ), pk=pk)
+        prefix = get_object_or_404(self.queryset, pk=pk)
 
         try:
             aggregate = Aggregate.objects.get(prefix__net_contains_or_equals=str(prefix.prefix))
@@ -586,7 +586,7 @@ class PrefixIPAddressesView(PermissionRequiredMixin, View):
         })
 
 
-class PrefixCreateView(PermissionRequiredMixin, ObjectEditView):
+class PrefixCreateView(ObjectPermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.add_prefix'
     queryset = Prefix.objects.all()
     model_form = forms.PrefixForm
@@ -598,7 +598,7 @@ class PrefixEditView(PrefixCreateView):
     permission_required = 'ipam.change_prefix'
 
 
-class PrefixDeleteView(PermissionRequiredMixin, ObjectDeleteView):
+class PrefixDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_prefix'
     queryset = Prefix.objects.all()
     template_name = 'ipam/prefix_delete.html'
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 42cddb082..59e4dcde4 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -1,8 +1,16 @@
 from django.conf import settings
 from django.contrib.auth.models import Group, User
-from django.test import Client, TestCase
+from django.contrib.contenttypes.models import ContentType
+from django.test import Client
 from django.test.utils import override_settings
 from django.urls import reverse
+from netaddr import IPNetwork
+
+from dcim.models import Site
+from ipam.choices import PrefixStatusChoices
+from ipam.models import Prefix
+from users.models import ObjectPermission
+from utilities.testing.testcases import TestCase
 
 
 class ExternalAuthenticationTestCase(TestCase):
@@ -157,3 +165,214 @@ class ExternalAuthenticationTestCase(TestCase):
         new_user = User.objects.get(username='remoteuser2')
         self.assertEqual(int(self.client.session.get('_auth_user_id')), new_user.pk, msg='Authentication failed')
         self.assertTrue(new_user.has_perms(['dcim.add_site', 'dcim.change_site']))
+
+
+class ObjectPermissionTestCase(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+
+        cls.sites = (
+            Site(name='Site 1', slug='site-1'),
+            Site(name='Site 2', slug='site-2'),
+            Site(name='Site 3', slug='site-3'),
+        )
+        Site.objects.bulk_create(cls.sites)
+
+        cls.prefixes = (
+            Prefix(prefix=IPNetwork('10.0.0.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.1.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.2.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.3.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.4.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.5.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.6.0/24'), site=cls.sites[2]),
+            Prefix(prefix=IPNetwork('10.0.7.0/24'), site=cls.sites[2]),
+            Prefix(prefix=IPNetwork('10.0.8.0/24'), site=cls.sites[2]),
+        )
+        Prefix.objects.bulk_create(cls.prefixes)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_ui_get_object(self):
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Retrieve permitted object
+        response = self.client.get(self.prefixes[0].get_absolute_url())
+        self.assertHttpStatus(response, 200)
+
+        # Attempt to retrieve non-permitted object
+        response = self.client.get(self.prefixes[3].get_absolute_url())
+        self.assertHttpStatus(response, 404)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_ui_list_objects(self):
+
+        # Attempt to list objects without permission
+        response = self.client.get(reverse('ipam:prefix_list'))
+        self.assertHttpStatus(response, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Retrieve all objects. Only permitted objects should be returned.
+        response = self.client.get(reverse('ipam:prefix_list'))
+        self.assertHttpStatus(response, 200)
+        self.assertIn(str(self.prefixes[0].prefix), str(response.content))
+        self.assertNotIn(str(self.prefixes[3].prefix), str(response.content))
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_ui_create_object(self):
+        initial_count = Prefix.objects.count()
+        form_data = {
+            'prefix': '10.0.9.0/24',
+            'site': self.sites[1].pk,
+            'status': PrefixStatusChoices.STATUS_ACTIVE,
+        }
+
+        # Attempt to create an object without permission
+        request = {
+            'path': reverse('ipam:prefix_add'),
+            'data': form_data,
+            'follow': False,  # Do not follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+        self.assertEqual(initial_count, Prefix.objects.count())
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True,
+            can_add=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to create a non-permitted object
+        request = {
+            'path': reverse('ipam:prefix_add'),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertEqual(initial_count, Prefix.objects.count())
+
+        # Create a permitted object
+        form_data['site'] = self.sites[0].pk
+        request = {
+            'path': reverse('ipam:prefix_add'),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertEqual(initial_count + 1, Prefix.objects.count())
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_ui_edit_object(self):
+        form_data = {
+            'prefix': '10.0.9.0/24',
+            'site': self.sites[0].pk,
+            'status': PrefixStatusChoices.STATUS_RESERVED,
+        }
+
+        # Attempt to edit an object without permission
+        request = {
+            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[0].pk}),
+            'data': form_data,
+            'follow': False,  # Do not follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True,
+            can_change=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to edit a non-permitted object
+        request = {
+            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[3].pk}),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 404)
+
+        # Edit a permitted object
+        request = {
+            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[0].pk}),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        prefix = Prefix.objects.get(pk=self.prefixes[0].pk)
+        self.assertEqual(prefix.status, PrefixStatusChoices.STATUS_RESERVED)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_ui_delete_object(self):
+        form_data = {
+            'confirm': True
+        }
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True,
+            can_delete=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Delete permitted object
+        request = {
+            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[0].pk}),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertFalse(Prefix.objects.filter(pk=self.prefixes[0].pk).exists())
+
+        # Attempt to delete non-permitted object
+        request = {
+            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[3].pk}),
+            'data': form_data,
+            'follow': True,  # Follow 302 redirects
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 404)
+        self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())

From 8eb4d0a36be636e03d728a23391dc57fc130b387 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 20 May 2020 16:27:56 -0400
Subject: [PATCH 016/505] Remove ViewExemptBackend; use same for model- and
 object-level permissions

---
 netbox/netbox/authentication.py            |  25 ++--
 netbox/netbox/settings.py                  |   3 +-
 netbox/netbox/tests/test_authentication.py |  43 +++---
 netbox/utilities/auth_backends.py          | 152 +++++++++------------
 4 files changed, 98 insertions(+), 125 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index d85b2f124..2e68e6ef1 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -13,23 +13,28 @@ class ObjectPermissionRequiredMixin(AccessMixin):
     permission_required = None
 
     def has_permission(self):
-        # First, check whether the user is granted the requested permissions from any backend.
-        if not self.request.user.has_perm(self.permission_required):
+        user = self.request.user
+
+        # First, check that the user is granted the required permission at either the model or object level.
+        if not user.has_perm(self.permission_required):
             return False
 
-        # Next, determine whether the permission is model-level or object-level. Model-level permissions grant the
+        # Superusers implicitly have all permissions
+        if user.is_superuser:
+            return True
+
+        # Determine whether the permission is model-level or object-level. Model-level permissions grant the
         # specified action to *all* objects, so no further action is needed.
-        if self.request.user.is_superuser or self.permission_required in self.request.user._perm_cache:
+        if self.permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
             return True
 
         # If the permission is granted only at the object level, filter the view's queryset to return only objects
         # on which the user is permitted to perform the specified action.
-        if self.permission_required in self.request.user._obj_perm_cache:
-            attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, self.permission_required)
-            if attrs:
-                # Update the view's QuerySet to filter only the permitted objects
-                self.queryset = self.queryset.filter(attrs)
-                return True
+        attrs = ObjectPermission.objects.get_attr_constraints(user, self.permission_required)
+        if attrs:
+            # Update the view's QuerySet to filter only the permitted objects
+            self.queryset = self.queryset.filter(attrs)
+            return True
 
     def dispatch(self, request, *args, **kwargs):
         if self.permission_required is None:
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 5c48ee620..d265cc58c 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -333,8 +333,7 @@ TEMPLATES = [
 
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
-    REMOTE_AUTH_BACKEND,
-    'utilities.auth_backends.ViewExemptModelBackend',
+    # REMOTE_AUTH_BACKEND,
     'utilities.auth_backends.ObjectPermissionBackend',
 ]
 
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 59e4dcde4..18bf251d4 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -5,11 +5,12 @@ from django.test import Client
 from django.test.utils import override_settings
 from django.urls import reverse
 from netaddr import IPNetwork
+from rest_framework.test import APIClient
 
 from dcim.models import Site
 from ipam.choices import PrefixStatusChoices
 from ipam.models import Prefix
-from users.models import ObjectPermission
+from users.models import ObjectPermission, Token
 from utilities.testing.testcases import TestCase
 
 
@@ -167,7 +168,7 @@ class ExternalAuthenticationTestCase(TestCase):
         self.assertTrue(new_user.has_perms(['dcim.add_site', 'dcim.change_site']))
 
 
-class ObjectPermissionTestCase(TestCase):
+class ObjectPermissionViewTestCase(TestCase):
 
     @classmethod
     def setUpTestData(cls):
@@ -193,14 +194,16 @@ class ObjectPermissionTestCase(TestCase):
         Prefix.objects.bulk_create(cls.prefixes)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_ui_get_object(self):
+    def test_get_object(self):
+
+        # Attempt to retrieve object without permission
+        response = self.client.get(self.prefixes[0].get_absolute_url())
+        self.assertHttpStatus(response, 403)
 
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True
         )
         obj_perm.save()
@@ -215,7 +218,7 @@ class ObjectPermissionTestCase(TestCase):
         self.assertHttpStatus(response, 404)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_ui_list_objects(self):
+    def test_list_objects(self):
 
         # Attempt to list objects without permission
         response = self.client.get(reverse('ipam:prefix_list'))
@@ -224,9 +227,7 @@ class ObjectPermissionTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True
         )
         obj_perm.save()
@@ -239,7 +240,7 @@ class ObjectPermissionTestCase(TestCase):
         self.assertNotIn(str(self.prefixes[3].prefix), str(response.content))
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_ui_create_object(self):
+    def test_create_object(self):
         initial_count = Prefix.objects.count()
         form_data = {
             'prefix': '10.0.9.0/24',
@@ -260,9 +261,7 @@ class ObjectPermissionTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True,
             can_add=True
         )
@@ -277,7 +276,7 @@ class ObjectPermissionTestCase(TestCase):
         }
         response = self.client.post(**request)
         self.assertHttpStatus(response, 200)
-        self.assertEqual(initial_count, Prefix.objects.count())
+        self.assertEqual(Prefix.objects.count(), initial_count)
 
         # Create a permitted object
         form_data['site'] = self.sites[0].pk
@@ -288,10 +287,10 @@ class ObjectPermissionTestCase(TestCase):
         }
         response = self.client.post(**request)
         self.assertHttpStatus(response, 200)
-        self.assertEqual(initial_count + 1, Prefix.objects.count())
+        self.assertEqual(Prefix.objects.count(), initial_count + 1)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_ui_edit_object(self):
+    def test_edit_object(self):
         form_data = {
             'prefix': '10.0.9.0/24',
             'site': self.sites[0].pk,
@@ -310,9 +309,7 @@ class ObjectPermissionTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True,
             can_change=True
         )
@@ -340,7 +337,7 @@ class ObjectPermissionTestCase(TestCase):
         self.assertEqual(prefix.status, PrefixStatusChoices.STATUS_RESERVED)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_ui_delete_object(self):
+    def test_delete_object(self):
         form_data = {
             'confirm': True
         }
@@ -348,9 +345,7 @@ class ObjectPermissionTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True,
             can_delete=True
         )
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 46ec69458..e540a04e0 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -8,115 +8,89 @@ from django.db.models import Q
 from users.models import ObjectPermission
 
 
-class ViewExemptModelBackend(ModelBackend):
-    """
-    Custom implementation of Django's stock ModelBackend which allows for the exemption of arbitrary models from view
-    permission enforcement.
-    """
-    def _get_user_permissions(self, user_obj):
-
-        if not settings.EXEMPT_VIEW_PERMISSIONS:
-            # No view permissions have been exempted from enforcement, so fall back to the built-in logic.
-            return super()._get_user_permissions(user_obj)
-
-        if '*' in settings.EXEMPT_VIEW_PERMISSIONS:
-            # All view permissions have been exempted from enforcement, so include all view permissions when fetching
-            # User permissions.
-            return Permission.objects.filter(
-                Q(user=user_obj) | Q(codename__startswith='view_')
-            )
-
-        # Return all Permissions that are either assigned to the user or that are view permissions listed in
-        # EXEMPT_VIEW_PERMISSIONS.
-        qs_filter = Q(user=user_obj)
-        for model in settings.EXEMPT_VIEW_PERMISSIONS:
-            app, name = model.split('.')
-            qs_filter |= Q(content_type__app_label=app, codename=f'view_{name}')
-        return Permission.objects.filter(qs_filter)
-
-    def has_perm(self, user_obj, perm, obj=None):
-
-        # Authenticated users need to have the view permissions cached for assessment
-        if user_obj.is_authenticated:
-            return super().has_perm(user_obj, perm, obj)
-
-        # If this is a view permission, check whether the model has been exempted from enforcement
-        try:
-            app, codename = perm.split('.')
-            action, model = codename.split('_')
-            if action == 'view':
-                if (
-                    # All models are exempt from view permission enforcement
-                    '*' in settings.EXEMPT_VIEW_PERMISSIONS
-                ) or (
-                    # This specific model is exempt from view permission enforcement
-                    '{}.{}'.format(app, model) in settings.EXEMPT_VIEW_PERMISSIONS
-                ):
-                    return True
-        except ValueError:
-            pass
-
-
 class ObjectPermissionBackend(ModelBackend):
-    """
-    Evaluates permission of a user to access or modify a specific object based on the assignment of ObjectPermissions
-    either to the user directly or to a group of which the user is a member. Model-level permissions supersede this
-    check: For example, if a user has the dcim.view_site model-level permission assigned, the ViewExemptModelBackend
-    will grant permission before this backend is evaluated for permission to view a specific site.
-    """
-    def _get_all_permissions(self, user_obj):
+
+    def get_object_permissions(self, user_obj):
         """
-        Retrieve all ObjectPermissions assigned to this User (either directly or through a Group) and return the model-
-        level equivalent codenames.
+        Return all model-level permissions granted to the user by an ObjectPermission.
         """
-        perm_names = set()
-        for obj_perm in ObjectPermission.objects.filter(
-            Q(users=user_obj) | Q(groups__user=user_obj)
-        ).prefetch_related('model'):
-            for action in ['view', 'add', 'change', 'delete']:
-                if getattr(obj_perm, f"can_{action}"):
-                    perm_names.add(f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}")
-        return perm_names
+        if not hasattr(user_obj, '_object_perm_cache'):
+
+            # Cache all assigned ObjectPermissions on the User instance
+            perms = set()
+            for obj_perm in ObjectPermission.objects.filter(
+                Q(users=user_obj) |
+                Q(groups__user=user_obj)
+            ).prefetch_related('model'):
+                for action in ['view', 'add', 'change', 'delete']:
+                    if getattr(obj_perm, f"can_{action}"):
+                        perms.add(f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}")
+            setattr(user_obj, '_object_perm_cache', perms)
+
+        return user_obj._object_perm_cache
 
     def get_all_permissions(self, user_obj, obj=None):
-        """
-        Get all model-level permissions assigned by this backend. Permissions are cached on the User instance.
-        """
+
+        # Handle inactive/anonymous users
         if not user_obj.is_active or user_obj.is_anonymous:
             return set()
-        if not hasattr(user_obj, '_obj_perm_cache'):
-            user_obj._obj_perm_cache = self._get_all_permissions(user_obj)
-        return user_obj._obj_perm_cache
+
+        # Cache model-level permissions on the User instance
+        if not hasattr(user_obj, '_perm_cache'):
+            user_obj._perm_cache = {
+                *self.get_user_permissions(user_obj, obj=obj),
+                *self.get_group_permissions(user_obj, obj=obj),
+                *self.get_object_permissions(user_obj)
+            }
+
+        return user_obj._perm_cache
 
     def has_perm(self, user_obj, perm, obj=None):
+        app_label, codename = perm.split('.')
+        action, model_name = codename.split('_')
 
-        # If no object is specified, look for any matching ObjectPermissions. If one or more are found, this indicates
-        # that the user has permission to perform the requested action on at least *some* objects, but not necessarily
-        # on all of them.
+        # If this is a view permission, check whether the model has been exempted from enforcement
+        if action == 'view':
+            if (
+                # All models are exempt from view permission enforcement
+                '*' in settings.EXEMPT_VIEW_PERMISSIONS
+            ) or (
+                # This specific model is exempt from view permission enforcement
+                '{}.{}'.format(app_label, model_name) in settings.EXEMPT_VIEW_PERMISSIONS
+            ):
+                return True
+
+        # If no object is specified, evaluate model-level permissions. The presence of a permission in this set tells
+        # us that the user has permission for *some* objects, but not necessarily a specific object.
         if obj is None:
             return perm in self.get_all_permissions(user_obj)
 
-        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, perm)
-
-        # No ObjectPermissions found for this combination of user, model, and action
-        if not attrs:
-            return
-
+        # Sanity check: Ensure that the requested permission applies to the specified object
         model = obj._meta.model
-
-        # Check that the requested permission applies to the specified object
-        app_label, codename = perm.split('.')
-        action, model_name = codename.split('_')
         if model._meta.label_lower != '.'.join((app_label, model_name)):
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
-        # Attempt to retrieve the model from the database using the attributes defined in the
-        # ObjectPermission. If we have a match, assert that the user has permission.
-        if model.objects.filter(attrs, pk=obj.pk).exists():
+        # If the user has been granted model-level permission for the object, return True
+        model_perms = {
+            *self.get_user_permissions(user_obj),
+            *self.get_group_permissions(user_obj),
+        }
+        if perm in model_perms:
             return True
 
+        # Gather all ObjectPermissions pertinent to the requested permission. If none are found, the User has no
+        # applicable permissions.
+        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, perm)
+        if not attrs:
+            return False
 
-class RemoteUserBackend(ViewExemptModelBackend, RemoteUserBackend_):
+        # Permission to perform the requested action on the object depends on whether the specified object matches
+        # the specified attributes. Note that this check is made against the *database* record representing the object,
+        # not the instance itself.
+        return model.objects.filter(attrs, pk=obj.pk).exists()
+
+
+class RemoteUserBackend(RemoteUserBackend_):
     """
     Custom implementation of Django's RemoteUserBackend which provides configuration hooks for basic customization.
     """

From 8c40148ca730f21ec65b0ffa53d0e5bf924603bc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 20 May 2020 16:47:33 -0400
Subject: [PATCH 017/505] Add object permission tests for get and list API
 views

---
 netbox/netbox/tests/test_authentication.py | 121 +++++++++++++++++++++
 netbox/utilities/api.py                    |  10 +-
 2 files changed, 128 insertions(+), 3 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 18bf251d4..64dd83783 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -371,3 +371,124 @@ class ObjectPermissionViewTestCase(TestCase):
         response = self.client.post(**request)
         self.assertHttpStatus(response, 404)
         self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())
+
+
+class ObjectPermissionAPIViewTestCase(TestCase):
+    client_class = APIClient
+
+    @classmethod
+    def setUpTestData(cls):
+
+        cls.sites = (
+            Site(name='Site 1', slug='site-1'),
+            Site(name='Site 2', slug='site-2'),
+            Site(name='Site 3', slug='site-3'),
+        )
+        Site.objects.bulk_create(cls.sites)
+
+        cls.prefixes = (
+            Prefix(prefix=IPNetwork('10.0.0.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.1.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.2.0/24'), site=cls.sites[0]),
+            Prefix(prefix=IPNetwork('10.0.3.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.4.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.5.0/24'), site=cls.sites[1]),
+            Prefix(prefix=IPNetwork('10.0.6.0/24'), site=cls.sites[2]),
+            Prefix(prefix=IPNetwork('10.0.7.0/24'), site=cls.sites[2]),
+            Prefix(prefix=IPNetwork('10.0.8.0/24'), site=cls.sites[2]),
+        )
+        Prefix.objects.bulk_create(cls.prefixes)
+
+    def setUp(self):
+        """
+        Create a test user and token for API calls.
+        """
+        self.user = User.objects.create(username='testuser')
+        self.token = Token.objects.create(user=self.user)
+        self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_get_object(self):
+
+        # Attempt to retrieve object without permission
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Retrieve permitted object
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 200)
+
+        # Attempt to retrieve non-permitted object
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 404)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_list_objects(self):
+        url = reverse('ipam-api:prefix-list')
+
+        # Attempt to list objects without permission
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={
+                'site__name': 'Site 1',
+            },
+            can_view=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Retrieve all objects. Only permitted objects should be returned.
+        response = self.client.get(url, **self.header)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data['count'], 3)
+
+    # TODO
+    # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    # def test_create_object(self):
+    #     url = reverse('ipam-api:prefix-list')
+    #     data = {
+    #         'prefix': '10.0.9.0/24',
+    #         'site': self.sites[1].pk,
+    #     }
+    #     initial_count = Prefix.objects.count()
+    #
+    #     # Attempt to create an object without permission
+    #     response = self.client.post(url, data, format='json', **self.header)
+    #     self.assertEqual(response.status_code, 403)
+    #
+    #     # Assign object permission
+    #     obj_perm = ObjectPermission(
+    #         model=ContentType.objects.get_for_model(Prefix),
+    #         attrs={'site__name': 'Site 1'},
+    #         can_view=True
+    #     )
+    #     obj_perm.save()
+    #     obj_perm.users.add(self.user)
+    #
+    #     # Attempt to create a non-permitted object
+    #     response = self.client.post(url, data, format='json', **self.header)
+    #     self.assertEqual(response.status_code, 403)
+    #     self.assertEqual(Prefix.objects.count(), initial_count)
+    #
+    #     # Create a permitted object
+    #     response = self.client.post(url, data, format='json', **self.header)
+    #     self.assertEqual(response.status_code, 200)
+    #     self.assertEqual(Prefix.objects.count(), initial_count + 1)
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 405c26878..9ec587369 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -329,11 +329,15 @@ class ModelViewSet(_ModelViewSet):
         if not request.user.is_authenticated or request.user.is_superuser:
             return
 
-        permission_required = 'dcim.view_site'
+        # Determine the required permission
+        permission_required = "{}.view_{}".format(
+            self.queryset.model._meta.app_label,
+            self.queryset.model._meta.model_name
+        )
 
         # Enforce object-level permissions
-        if permission_required not in self.request.user._perm_cache:
-            attrs = ObjectPermission.objects.get_attr_constraints(self.request.user, permission_required)
+        if permission_required not in {*request.user._user_perm_cache, *request.user._group_perm_cache}:
+            attrs = ObjectPermission.objects.get_attr_constraints(request.user, permission_required)
             if attrs:
                 # Update the view's QuerySet to filter only the permitted objects
                 self.queryset = self.queryset.filter(attrs)

From fa8407371bc10e1739009d537978c4ed1c80a375 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 20 May 2020 16:56:40 -0400
Subject: [PATCH 018/505] Swap position of REMOTE_AUTH_BACKEND

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index d265cc58c..659eadb1c 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -333,8 +333,8 @@ TEMPLATES = [
 
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
-    # REMOTE_AUTH_BACKEND,
     'utilities.auth_backends.ObjectPermissionBackend',
+    REMOTE_AUTH_BACKEND,
 ]
 
 # Internationalization

From a928d337d902ee72bd4a1e5127fde6c0e9c4694b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 10:51:40 -0400
Subject: [PATCH 019/505] Add object permission support for
 create/update/delete API views

---
 netbox/netbox/tests/test_authentication.py | 127 +++++++++++++++------
 netbox/utilities/api.py                    |  67 +++++++----
 2 files changed, 138 insertions(+), 56 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 64dd83783..03d0a1dc3 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -460,35 +460,98 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['count'], 3)
 
-    # TODO
-    # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    # def test_create_object(self):
-    #     url = reverse('ipam-api:prefix-list')
-    #     data = {
-    #         'prefix': '10.0.9.0/24',
-    #         'site': self.sites[1].pk,
-    #     }
-    #     initial_count = Prefix.objects.count()
-    #
-    #     # Attempt to create an object without permission
-    #     response = self.client.post(url, data, format='json', **self.header)
-    #     self.assertEqual(response.status_code, 403)
-    #
-    #     # Assign object permission
-    #     obj_perm = ObjectPermission(
-    #         model=ContentType.objects.get_for_model(Prefix),
-    #         attrs={'site__name': 'Site 1'},
-    #         can_view=True
-    #     )
-    #     obj_perm.save()
-    #     obj_perm.users.add(self.user)
-    #
-    #     # Attempt to create a non-permitted object
-    #     response = self.client.post(url, data, format='json', **self.header)
-    #     self.assertEqual(response.status_code, 403)
-    #     self.assertEqual(Prefix.objects.count(), initial_count)
-    #
-    #     # Create a permitted object
-    #     response = self.client.post(url, data, format='json', **self.header)
-    #     self.assertEqual(response.status_code, 200)
-    #     self.assertEqual(Prefix.objects.count(), initial_count + 1)
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_create_object(self):
+        url = reverse('ipam-api:prefix-list')
+        data = {
+            'prefix': '10.0.9.0/24',
+            'site': self.sites[1].pk,
+        }
+        initial_count = Prefix.objects.count()
+
+        # Attempt to create an object without permission
+        response = self.client.post(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_add=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to create a non-permitted object
+        response = self.client.post(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(Prefix.objects.count(), initial_count)
+
+        # Create a permitted object
+        data['site'] = self.sites[0].pk
+        response = self.client.post(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(Prefix.objects.count(), initial_count + 1)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_edit_object(self):
+
+        # Attempt to edit an object without permission
+        data = {'site': self.sites[0].pk}
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.patch(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_change=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to edit a non-permitted object
+        data = {'site': self.sites[0].pk}
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
+        response = self.client.patch(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 404)
+
+        # Edit a permitted object
+        data['status'] = 'reserved'
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.patch(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 200)
+
+        # Attempt to modify a permitted object to a non-permitted object
+        data['site'] = self.sites[1].pk
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.patch(url, data, format='json', **self.header)
+        self.assertEqual(response.status_code, 403)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_delete_object(self):
+
+        # Attempt to delete an object without permission
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.delete(url, format='json', **self.header)
+        self.assertEqual(response.status_code, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_delete=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to delete a non-permitted object
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
+        response = self.client.delete(url, format='json', **self.header)
+        self.assertEqual(response.status_code, 404)
+
+        # Delete a permitted object
+        url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
+        response = self.client.delete(url, format='json', **self.header)
+        self.assertEqual(response.status_code, 204)
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 9ec587369..745f812ff 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -4,7 +4,8 @@ from collections import OrderedDict
 import pytz
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist
+from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied
+from django.db import transaction
 from django.db.models import ManyToManyField, ProtectedError
 from django.urls import reverse
 from rest_framework.exceptions import APIException
@@ -14,6 +15,7 @@ from rest_framework.response import Response
 from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
+from netbox.api import TokenPermissions
 from users.models import ObjectPermission
 from .utils import dict_to_filter_params, dynamic_import
 
@@ -329,11 +331,13 @@ class ModelViewSet(_ModelViewSet):
         if not request.user.is_authenticated or request.user.is_superuser:
             return
 
-        # Determine the required permission
-        permission_required = "{}.view_{}".format(
-            self.queryset.model._meta.app_label,
-            self.queryset.model._meta.model_name
-        )
+        # TODO: Move this to a cleaner function
+        # Determine the required permission based on the request method
+        kwargs = {
+            'app_label': self.queryset.model._meta.app_label,
+            'model_name': self.queryset.model._meta.model_name
+        }
+        permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
 
         # Enforce object-level permissions
         if permission_required not in {*request.user._user_perm_cache, *request.user._group_perm_cache}:
@@ -361,34 +365,49 @@ class ModelViewSet(_ModelViewSet):
                 **kwargs
             )
 
-    def list(self, *args, **kwargs):
+    def _validate_objects(self, instance):
         """
-        Call to super to allow for caching
+        Check that the provided instance or list of instances are matched by the current queryset. This confirms that
+        any newly created or modified objects abide by the attributes granted by any applicable ObjectPermissions.
         """
-        return super().list(*args, **kwargs)
-
-    def retrieve(self, *args, **kwargs):
-        """
-        Call to super to allow for caching
-        """
-        return super().retrieve(*args, **kwargs)
-
-    #
-    # Logging
-    #
+        if type(instance) is list:
+            # Check that all instances are still included in the view's queryset
+            conforming_count = self.queryset.filter(pk__in=[obj.pk for obj in instance]).count()
+            if conforming_count != len(instance):
+                raise ObjectDoesNotExist
+        else:
+            # Check that the instance is matched by the view's queryset
+            self.queryset.get(pk=instance.pk)
 
     def perform_create(self, serializer):
-        model = serializer.child.Meta.model if hasattr(serializer, 'many') else serializer.Meta.model
+        model = self.queryset.model
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
         logger.info(f"Creating new {model._meta.verbose_name}")
-        return super().perform_create(serializer)
+
+        # Enforce object-level permissions on save()
+        try:
+            with transaction.atomic():
+                instance = serializer.save()
+                self._validate_objects(instance)
+        except ObjectDoesNotExist:
+            raise PermissionDenied()
 
     def perform_update(self, serializer):
+        model = self.queryset.model
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
-        logger.info(f"Updating {serializer.instance} (PK: {serializer.instance.pk})")
-        return super().perform_update(serializer)
+        logger.info(f"Updating {model._meta.verbose_name} {serializer.instance} (PK: {serializer.instance.pk})")
+
+        # Enforce object-level permissions on save()
+        try:
+            with transaction.atomic():
+                instance = serializer.save()
+                self._validate_objects(instance)
+        except ObjectDoesNotExist:
+            raise PermissionDenied()
 
     def perform_destroy(self, instance):
+        model = self.queryset.model
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
-        logger.info(f"Deleting {instance} (PK: {instance.pk})")
+        logger.info(f"Deleting {model._meta.verbose_name} {instance} (PK: {instance.pk})")
+
         return super().perform_destroy(instance)

From 5486cff4410c2a86ab0f20e2fae781a5e3ecee1a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 11:49:50 -0400
Subject: [PATCH 020/505] Add object permission support, tests for bulk
 import/edit/delete views

---
 netbox/ipam/views.py                       |   7 +-
 netbox/netbox/tests/test_authentication.py | 149 +++++++++++++++++++++
 netbox/utilities/views.py                  |  41 ++++--
 3 files changed, 183 insertions(+), 14 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 0c7d0770f..ace85bc1a 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -605,14 +605,15 @@ class PrefixDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkImportView(PermissionRequiredMixin, BulkImportView):
+class PrefixBulkImportView(ObjectPermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_prefix'
+    queryset = Prefix.objects.all()
     model_form = forms.PrefixCSVForm
     table = tables.PrefixTable
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkEditView(PermissionRequiredMixin, BulkEditView):
+class PrefixBulkEditView(ObjectPermissionRequiredMixin, BulkEditView):
     permission_required = 'ipam.change_prefix'
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
@@ -621,7 +622,7 @@ class PrefixBulkEditView(PermissionRequiredMixin, BulkEditView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
+class PrefixBulkDeleteView(ObjectPermissionRequiredMixin, BulkDeleteView):
     permission_required = 'ipam.delete_prefix'
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 03d0a1dc3..d82ef6752 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -342,6 +342,14 @@ class ObjectPermissionViewTestCase(TestCase):
             'confirm': True
         }
 
+        # Attempt to delete object without permission
+        request = {
+            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[0].pk}),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+
         # Assign object permission
         obj_perm = ObjectPermission(
             model=ContentType.objects.get_for_model(Prefix),
@@ -372,6 +380,147 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 404)
         self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_bulk_import_objects(self):
+        initial_count = Prefix.objects.count()
+        form_data = {
+            'csv': "prefix,status,site\n"
+                   "10.0.9.0/24,Active,Site 1\n"
+                   "10.0.10.0/24,Active,Site 2\n"
+                   "10.0.11.0/24,Active,Site 3\n",
+        }
+
+        # Attempt to import objects without permission
+        request = {
+            'path': reverse('ipam:prefix_import'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+        self.assertEqual(initial_count, Prefix.objects.count())
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_add=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to create non-permitted objects
+        request = {
+            'path': reverse('ipam:prefix_import'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertEqual(Prefix.objects.count(), initial_count)
+
+        # Create a permitted object
+        form_data = {
+            'csv': "prefix,status,site\n"
+                   "10.0.9.0/24,Active,Site 1\n"
+                   "10.0.10.0/24,Active,Site 1\n"
+                   "10.0.11.0/24,Active,Site 1\n",
+        }
+        request = {
+            'path': reverse('ipam:prefix_import'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertEqual(Prefix.objects.count(), initial_count + 3)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_bulk_edit_objects(self):
+        form_data = {
+            'pk': [p.pk for p in self.prefixes],
+            'status': 'reserved',
+            '_apply': True,
+        }
+
+        # Attempt to edit objects without permission
+        request = {
+            'path': reverse('ipam:prefix_bulk_edit'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_change=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to edit non-permitted objects
+        request = {
+            'path': reverse('ipam:prefix_bulk_edit'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertEqual(Prefix.objects.get(pk=self.prefixes[3].pk).status, 'active')
+
+        # Edit permitted objects
+        form_data['pk'] = [p.pk for p in self.prefixes[:3]]
+        request = {
+            'path': reverse('ipam:prefix_bulk_edit'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 302)
+        self.assertEqual(Prefix.objects.get(pk=self.prefixes[0].pk).status, 'reserved')
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+    def test_bulk_delete_objects(self):
+        form_data = {
+            'pk': [p.pk for p in self.prefixes],
+            'confirm': True,
+            '_confirm': True,
+        }
+
+        # Attempt to delete objects without permission
+        request = {
+            'path': reverse('ipam:prefix_bulk_delete'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 403)
+
+        # Assign object permission
+        obj_perm = ObjectPermission(
+            model=ContentType.objects.get_for_model(Prefix),
+            attrs={'site__name': 'Site 1'},
+            can_view=True,
+            can_delete=True
+        )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+
+        # Attempt to delete non-permitted object
+        request = {
+            'path': reverse('ipam:prefix_bulk_delete'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 200)
+        self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())
+
+        # Delete permitted objects
+        form_data['pk'] = [p.pk for p in self.prefixes[:3]]
+        request = {
+            'path': reverse('ipam:prefix_bulk_delete'),
+            'data': form_data,
+        }
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 302)
+        self.assertFalse(Prefix.objects.filter(pk=self.prefixes[0].pk).exists())
+
 
 class ObjectPermissionAPIViewTestCase(TestCase):
     client_class = APIClient
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index d9eace90b..44dd40d90 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -297,9 +297,9 @@ class ObjectEditView(GetReturnURLMixin, View):
                     return redirect(self.get_return_url(request, obj))
 
             except ObjectDoesNotExist:
-                logger.debug("Object save failed due to object-level permissions violation")
-                # TODO: Link user to personal permissions view
-                form.add_error(None, "Object save failed due to object-level permissions violation")
+                msg = "Object save failed due to object-level permissions violation"
+                logger.debug(msg)
+                form.add_error(None, msg)
 
         else:
             logger.debug("Form validation failed")
@@ -576,11 +576,13 @@ class BulkImportView(GetReturnURLMixin, View):
     """
     Import objects in bulk (CSV format).
 
-    model_form: The form used to create each imported object
-    table: The django-tables2 Table used to render the list of imported objects
-    template_name: The name of the template
-    widget_attrs: A dict of attributes to apply to the import widget (e.g. to require a session key)
+    :param queryset: Base queryset for the model
+    :param model_form: The form used to create each imported object
+    :param table: The django-tables2 Table used to render the list of imported objects
+    :param template_name: The name of the template
+    :param widget_attrs: A dict of attributes to apply to the import widget (e.g. to require a session key)
     """
+    queryset = None
     model_form = None
     table = None
     template_name = 'utilities/obj_bulk_import.html'
@@ -634,6 +636,10 @@ class BulkImportView(GetReturnURLMixin, View):
                                 form.add_error('csv', "Row {} {}: {}".format(row, field, err[0]))
                             raise ValidationError("")
 
+                    # Enforce object-level permissions
+                    if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs):
+                        raise ObjectDoesNotExist
+
                 # Compile a table containing the imported objects
                 obj_table = self.table(new_objs)
 
@@ -650,6 +656,11 @@ class BulkImportView(GetReturnURLMixin, View):
             except ValidationError:
                 pass
 
+            except ObjectDoesNotExist:
+                msg = "Object import failed due to object-level permissions violation"
+                logger.debug(msg)
+                form.add_error(None, msg)
+
         else:
             logger.debug("Form validation failed")
 
@@ -707,7 +718,7 @@ class BulkEditView(GetReturnURLMixin, View):
 
                     with transaction.atomic():
 
-                        updated_count = 0
+                        updated_objects = []
                         for obj in model.objects.filter(pk__in=form.cleaned_data['pk']):
 
                             # Update standard fields. If a field is listed in _nullify, delete its value.
@@ -736,6 +747,7 @@ class BulkEditView(GetReturnURLMixin, View):
 
                             obj.full_clean()
                             obj.save()
+                            updated_objects.append(obj)
                             logger.debug(f"Saved {obj} (PK: {obj.pk})")
 
                             # Update custom fields
@@ -765,10 +777,12 @@ class BulkEditView(GetReturnURLMixin, View):
                             if form.cleaned_data.get('remove_tags', None):
                                 obj.tags.remove(*form.cleaned_data['remove_tags'])
 
-                            updated_count += 1
+                        # Enforce object-level permissions
+                        if self.queryset.filter(pk__in=[obj.pk for obj in updated_objects]).count() != len(updated_objects):
+                            raise ObjectDoesNotExist
 
-                    if updated_count:
-                        msg = 'Updated {} {}'.format(updated_count, model._meta.verbose_name_plural)
+                    if updated_objects:
+                        msg = 'Updated {} {}'.format(len(updated_objects), model._meta.verbose_name_plural)
                         logger.info(msg)
                         messages.success(self.request, msg)
 
@@ -777,6 +791,11 @@ class BulkEditView(GetReturnURLMixin, View):
                 except ValidationError as e:
                     messages.error(self.request, "{} failed validation: {}".format(obj, e))
 
+                except ObjectDoesNotExist:
+                    msg = "Object update failed due to object-level permissions violation"
+                    logger.debug(msg)
+                    form.add_error(None, msg)
+
             else:
                 logger.debug("Form validation failed")
 

From 40c590f44535f663f6b314b9e366b01fff9bcd8e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 11:58:27 -0400
Subject: [PATCH 021/505] Add queryset to all BulkImportViews

---
 netbox/circuits/views.py       |  3 +++
 netbox/dcim/views.py           | 23 +++++++++++++++++++++++
 netbox/ipam/views.py           |  8 ++++++++
 netbox/secrets/views.py        |  2 ++
 netbox/tenancy/views.py        |  2 ++
 netbox/utilities/views.py      | 20 ++++++++++----------
 netbox/virtualization/views.py |  4 ++++
 7 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 0546b3832..c3b09f596 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -80,6 +80,7 @@ class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'circuits.add_provider'
+    queryset = Provider.objects.all()
     model_form = forms.ProviderCSVForm
     table = tables.ProviderTable
     default_return_url = 'circuits:provider_list'
@@ -125,6 +126,7 @@ class CircuitTypeEditView(CircuitTypeCreateView):
 
 class CircuitTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'circuits.add_circuittype'
+    queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeCSVForm
     table = tables.CircuitTypeTable
     default_return_url = 'circuits:circuittype_list'
@@ -196,6 +198,7 @@ class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'circuits.add_circuit'
+    queryset = Circuit.objects.all()
     model_form = forms.CircuitCSVForm
     table = tables.CircuitTable
     default_return_url = 'circuits:circuit_list'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 03e375d35..d6b97e128 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -169,6 +169,7 @@ class RegionEditView(RegionCreateView):
 
 class RegionBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_region'
+    queryset = Region.objects.all()
     model_form = forms.RegionCSVForm
     table = tables.RegionTable
     default_return_url = 'dcim:region_list'
@@ -240,6 +241,7 @@ class SiteDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
 
 class SiteBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_site'
+    queryset = Site.objects.all()
     model_form = forms.SiteCSVForm
     table = tables.SiteTable
     default_return_url = 'dcim:site_list'
@@ -293,6 +295,7 @@ class RackGroupEditView(RackGroupCreateView):
 
 class RackGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rackgroup'
+    queryset = RackGroup.objects.all()
     model_form = forms.RackGroupCSVForm
     table = tables.RackGroupTable
     default_return_url = 'dcim:rackgroup_list'
@@ -329,6 +332,7 @@ class RackRoleEditView(RackRoleCreateView):
 
 class RackRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rackrole'
+    queryset = RackRole.objects.all()
     model_form = forms.RackRoleCSVForm
     table = tables.RackRoleTable
     default_return_url = 'dcim:rackrole_list'
@@ -446,6 +450,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class RackBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rack'
+    queryset = Rack.objects.all()
     model_form = forms.RackCSVForm
     table = tables.RackTable
     default_return_url = 'dcim:rack_list'
@@ -520,6 +525,7 @@ class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class RackReservationImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rackreservation'
+    queryset = RackReservation.objects.all()
     model_form = forms.RackReservationCSVForm
     table = tables.RackReservationTable
     default_return_url = 'dcim:rackreservation_list'
@@ -579,6 +585,7 @@ class ManufacturerEditView(ManufacturerCreateView):
 
 class ManufacturerBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_manufacturer'
+    queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerCSVForm
     table = tables.ManufacturerTable
     default_return_url = 'dcim:manufacturer_list'
@@ -1039,6 +1046,7 @@ class DeviceRoleEditView(DeviceRoleCreateView):
 
 class DeviceRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_devicerole'
+    queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleCSVForm
     table = tables.DeviceRoleTable
     default_return_url = 'dcim:devicerole_list'
@@ -1074,6 +1082,7 @@ class PlatformEditView(PlatformCreateView):
 
 class PlatformBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_platform'
+    queryset = Platform.objects.all()
     model_form = forms.PlatformCSVForm
     table = tables.PlatformTable
     default_return_url = 'dcim:platform_list'
@@ -1267,6 +1276,7 @@ class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_device'
+    queryset = Device.objects.all()
     model_form = forms.DeviceCSVForm
     table = tables.DeviceImportTable
     template_name = 'dcim/device_import.html'
@@ -1275,6 +1285,7 @@ class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
 
 class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_device'
+    queryset = Device.objects.all()
     model_form = forms.ChildDeviceCSVForm
     table = tables.DeviceImportTable
     template_name = 'dcim/device_import_child.html'
@@ -1343,6 +1354,7 @@ class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_consoleport'
+    queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortCSVForm
     table = tables.ConsolePortImportTable
     default_return_url = 'dcim:consoleport_list'
@@ -1398,6 +1410,7 @@ class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_consoleserverport'
+    queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortCSVForm
     table = tables.ConsoleServerPortImportTable
     default_return_url = 'dcim:consoleserverport_list'
@@ -1465,6 +1478,7 @@ class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_powerport'
+    queryset = PowerPort.objects.all()
     model_form = forms.PowerPortCSVForm
     table = tables.PowerPortImportTable
     default_return_url = 'dcim:powerport_list'
@@ -1520,6 +1534,7 @@ class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_poweroutlet'
+    queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletCSVForm
     table = tables.PowerOutletImportTable
     default_return_url = 'dcim:poweroutlet_list'
@@ -1624,6 +1639,7 @@ class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_interface'
+    queryset = Interface.objects.all()
     model_form = forms.InterfaceCSVForm
     table = tables.InterfaceImportTable
     default_return_url = 'dcim:interface_list'
@@ -1691,6 +1707,7 @@ class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_frontport'
+    queryset = FrontPort.objects.all()
     model_form = forms.FrontPortCSVForm
     table = tables.FrontPortImportTable
     default_return_url = 'dcim:frontport_list'
@@ -1758,6 +1775,7 @@ class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rearport'
+    queryset = RearPort.objects.all()
     model_form = forms.RearPortCSVForm
     table = tables.RearPortImportTable
     default_return_url = 'dcim:rearport_list'
@@ -1896,6 +1914,7 @@ class DeviceBayDepopulateView(PermissionRequiredMixin, View):
 
 class DeviceBayBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_devicebay'
+    queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayCSVForm
     table = tables.DeviceBayImportTable
     default_return_url = 'dcim:devicebay_list'
@@ -2170,6 +2189,7 @@ class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class CableBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_cable'
+    queryset = Cable.objects.all()
     model_form = forms.CableCSVForm
     table = tables.CableTable
     default_return_url = 'dcim:cable_list'
@@ -2330,6 +2350,7 @@ class InventoryItemDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_inventoryitem'
+    queryset = InventoryItem.objects.all()
     model_form = forms.InventoryItemCSVForm
     table = tables.InventoryItemTable
     default_return_url = 'dcim:inventoryitem_list'
@@ -2673,6 +2694,7 @@ class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_powerpanel'
+    queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelCSVForm
     table = tables.PowerPanelTable
     default_return_url = 'dcim:powerpanel_list'
@@ -2745,6 +2767,7 @@ class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_powerfeed'
+    queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedCSVForm
     table = tables.PowerFeedTable
     default_return_url = 'dcim:powerfeed_list'
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index ace85bc1a..ab97afc2a 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -155,6 +155,7 @@ class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class VRFBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_vrf'
+    queryset = VRF.objects.all()
     model_form = forms.VRFCSVForm
     table = tables.VRFTable
     default_return_url = 'ipam:vrf_list'
@@ -271,6 +272,7 @@ class RIREditView(RIRCreateView):
 
 class RIRBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_rir'
+    queryset = RIR.objects.all()
     model_form = forms.RIRCSVForm
     table = tables.RIRTable
     default_return_url = 'ipam:rir_list'
@@ -380,6 +382,7 @@ class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_aggregate'
+    queryset = Aggregate.objects.all()
     model_form = forms.AggregateCSVForm
     table = tables.AggregateTable
     default_return_url = 'ipam:aggregate_list'
@@ -425,6 +428,7 @@ class RoleEditView(RoleCreateView):
 
 class RoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_role'
+    queryset = Role.objects.all()
     model_form = forms.RoleCSVForm
     table = tables.RoleTable
     default_return_url = 'ipam:role_list'
@@ -782,6 +786,7 @@ class IPAddressBulkCreateView(PermissionRequiredMixin, BulkCreateView):
 
 class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_ipaddress'
+    queryset = IPAddress.objects.all()
     model_form = forms.IPAddressCSVForm
     table = tables.IPAddressTable
     default_return_url = 'ipam:ipaddress_list'
@@ -829,6 +834,7 @@ class VLANGroupEditView(VLANGroupCreateView):
 
 class VLANGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_vlangroup'
+    queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupCSVForm
     table = tables.VLANGroupTable
     default_return_url = 'ipam:vlangroup_list'
@@ -952,6 +958,7 @@ class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class VLANBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_vlan'
+    queryset = VLAN.objects.all()
     model_form = forms.VLANCSVForm
     table = tables.VLANTable
     default_return_url = 'ipam:vlan_list'
@@ -1018,6 +1025,7 @@ class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
 
 class ServiceBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_service'
+    queryset = Service.objects.all()
     model_form = forms.ServiceCSVForm
     table = tables.ServiceTable
     default_return_url = 'ipam:service_list'
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index b40e41cb3..8ce9addb4 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -49,6 +49,7 @@ class SecretRoleEditView(SecretRoleCreateView):
 
 class SecretRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'secrets.add_secretrole'
+    queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleCSVForm
     table = tables.SecretRoleTable
     default_return_url = 'secrets:secretrole_list'
@@ -197,6 +198,7 @@ class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class SecretBulkImportView(BulkImportView):
     permission_required = 'secrets.add_secret'
+    queryset = Secret.objects.all()
     model_form = forms.SecretCSVForm
     table = tables.SecretTable
     template_name = 'secrets/secret_import.html'
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 2af44094f..745362271 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -43,6 +43,7 @@ class TenantGroupEditView(TenantGroupCreateView):
 
 class TenantGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'tenancy.add_tenantgroup'
+    queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupCSVForm
     table = tables.TenantGroupTable
     default_return_url = 'tenancy:tenantgroup_list'
@@ -113,6 +114,7 @@ class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class TenantBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'tenancy.add_tenant'
+    queryset = Tenant.objects.all()
     model_form = forms.TenantCSVForm
     table = tables.TenantTable
     default_return_url = 'tenancy:tenant_list'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 44dd40d90..01eb6d2ba 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -676,11 +676,11 @@ class BulkEditView(GetReturnURLMixin, View):
     """
     Edit objects in bulk.
 
-    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
-    filter: FilterSet to apply when deleting by QuerySet
-    table: The table used to display devices being edited
-    form: The form class used to edit objects in bulk
-    template_name: The name of the template
+    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
+    :param filter: FilterSet to apply when deleting by QuerySet
+    :param table: The table used to display devices being edited
+    :param form: The form class used to edit objects in bulk
+    :param template_name: The name of the template
     """
     queryset = None
     filterset = None
@@ -829,11 +829,11 @@ class BulkDeleteView(GetReturnURLMixin, View):
     """
     Delete objects in bulk.
 
-    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
-    filter: FilterSet to apply when deleting by QuerySet
-    table: The table used to display devices being deleted
-    form: The form class used to delete objects in bulk
-    template_name: The name of the template
+    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
+    :param filter: FilterSet to apply when deleting by QuerySet
+    :param table: The table used to display devices being deleted
+    :param form: The form class used to delete objects in bulk
+    :param template_name: The name of the template
     """
     queryset = None
     filterset = None
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 68a2443ae..c6f107be7 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -41,6 +41,7 @@ class ClusterTypeEditView(ClusterTypeCreateView):
 
 class ClusterTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_clustertype'
+    queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeCSVForm
     table = tables.ClusterTypeTable
     default_return_url = 'virtualization:clustertype_list'
@@ -76,6 +77,7 @@ class ClusterGroupEditView(ClusterGroupCreateView):
 
 class ClusterGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_clustergroup'
+    queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupCSVForm
     table = tables.ClusterGroupTable
     default_return_url = 'virtualization:clustergroup_list'
@@ -138,6 +140,7 @@ class ClusterDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class ClusterBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_cluster'
+    queryset = Cluster.objects.all()
     model_form = forms.ClusterCSVForm
     table = tables.ClusterTable
     default_return_url = 'virtualization:cluster_list'
@@ -299,6 +302,7 @@ class VirtualMachineDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 class VirtualMachineBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_virtualmachine'
+    queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineCSVForm
     table = tables.VirtualMachineTable
     default_return_url = 'virtualization:virtualmachine_list'

From cc6e74dfd53b9d8fc3c5937055c9e90fcaa05275 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 13:12:15 -0400
Subject: [PATCH 022/505] Move ObjectPermissionRequiredMixin to utilities.views

---
 netbox/dcim/views.py            |  3 +-
 netbox/ipam/views.py            |  2 +-
 netbox/netbox/authentication.py | 55 -----------------------------
 netbox/utilities/permissions.py | 15 ++++++++
 netbox/utilities/views.py       | 62 ++++++++++++++++++++++++++++++++-
 5 files changed, 78 insertions(+), 59 deletions(-)
 delete mode 100644 netbox/netbox/authentication.py
 create mode 100644 netbox/utilities/permissions.py

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d6b97e128..2bcf876c6 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -21,13 +21,12 @@ from extras.models import Graph
 from extras.views import ObjectConfigContextView
 from ipam.models import Prefix, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
-from netbox.authentication import ObjectPermissionRequiredMixin
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import csv_format
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, GetReturnURLMixin,
-    ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView, ObjectPermissionRequiredMixin,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index ab97afc2a..bb0844d4d 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -8,10 +8,10 @@ from django.views.generic import View
 from django_tables2 import RequestConfig
 
 from dcim.models import Device, Interface
-from netbox.authentication import ObjectPermissionRequiredMixin
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    ObjectPermissionRequiredMixin,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
deleted file mode 100644
index 2e68e6ef1..000000000
--- a/netbox/netbox/authentication.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from django.contrib.auth.mixins import AccessMixin
-from django.core.exceptions import ImproperlyConfigured
-
-from users.models import ObjectPermission
-
-
-class ObjectPermissionRequiredMixin(AccessMixin):
-    """
-    Similar to Django's built-in PermissionRequiredMixin, but extended to check for both model-level and object-level
-    permission assignments. If the user has only object-level permissions assigned, the view's queryset is filtered
-    to return only those objects on which the user is permitted to perform the specified action.
-    """
-    permission_required = None
-
-    def has_permission(self):
-        user = self.request.user
-
-        # First, check that the user is granted the required permission at either the model or object level.
-        if not user.has_perm(self.permission_required):
-            return False
-
-        # Superusers implicitly have all permissions
-        if user.is_superuser:
-            return True
-
-        # Determine whether the permission is model-level or object-level. Model-level permissions grant the
-        # specified action to *all* objects, so no further action is needed.
-        if self.permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
-            return True
-
-        # If the permission is granted only at the object level, filter the view's queryset to return only objects
-        # on which the user is permitted to perform the specified action.
-        attrs = ObjectPermission.objects.get_attr_constraints(user, self.permission_required)
-        if attrs:
-            # Update the view's QuerySet to filter only the permitted objects
-            self.queryset = self.queryset.filter(attrs)
-            return True
-
-    def dispatch(self, request, *args, **kwargs):
-        if self.permission_required is None:
-            raise ImproperlyConfigured(
-                '{0} is missing the permission_required attribute. Define {0}.permission_required, or override '
-                '{0}.get_permission_required().'.format(self.__class__.__name__)
-            )
-
-        if not hasattr(self, 'queryset'):
-            raise ImproperlyConfigured(
-                '{} has no queryset defined. ObjectPermissionRequiredMixin may only be used on views which define '
-                'a base queryset'.format(self.__class__.__name__)
-            )
-
-        if not self.has_permission():
-            return self.handle_no_permission()
-
-        return super().dispatch(request, *args, **kwargs)
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
new file mode 100644
index 000000000..516d6fe5b
--- /dev/null
+++ b/netbox/utilities/permissions.py
@@ -0,0 +1,15 @@
+def get_permission_for_model(model, action):
+    """
+    Resolve the named permission for a given model (or instance) and action (e.g. view or add).
+
+    :param model: A model or instance
+    :param action: View, add, change, or delete (string)
+    """
+    if action not in ('view', 'add', 'change', 'delete'):
+        raise ValueError(f"Unsupported action: {action}")
+
+    return '{}.{}_{}'.format(
+        model._meta.app_label,
+        action,
+        model._meta.model_name
+    )
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 01eb6d2ba..6097fa5b2 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -4,7 +4,8 @@ from copy import deepcopy
 
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist, ValidationError
+from django.contrib.auth.mixins import AccessMixin
+from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured, ObjectDoesNotExist, ValidationError
 from django.db import transaction, IntegrityError
 from django.db.models import ManyToManyField, ProtectedError
 from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
@@ -32,6 +33,61 @@ from .forms import ConfirmationForm, ImportForm
 from .paginator import EnhancedPaginator, get_paginate_count
 
 
+#
+# Mixins
+#
+
+class ObjectPermissionRequiredMixin(AccessMixin):
+    """
+    Similar to Django's built-in PermissionRequiredMixin, but extended to check for both model-level and object-level
+    permission assignments. If the user has only object-level permissions assigned, the view's queryset is filtered
+    to return only those objects on which the user is permitted to perform the specified action.
+    """
+    permission_required = None
+
+    def has_permission(self):
+        user = self.request.user
+
+        # First, check that the user is granted the required permission at either the model or object level.
+        if not user.has_perm(self.permission_required):
+            return False
+
+        # Superusers implicitly have all permissions
+        if user.is_superuser:
+            return True
+
+        # Determine whether the permission is model-level or object-level. Model-level permissions grant the
+        # specified action to *all* objects, so no further action is needed.
+        if self.permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
+            return True
+
+        # If the permission is granted only at the object level, filter the view's queryset to return only objects
+        # on which the user is permitted to perform the specified action.
+        attrs = ObjectPermission.objects.get_attr_constraints(user, self.permission_required)
+        if attrs:
+            # Update the view's QuerySet to filter only the permitted objects
+            self.queryset = self.queryset.filter(attrs)
+            return True
+
+    def dispatch(self, request, *args, **kwargs):
+        if self.permission_required is None:
+            raise ImproperlyConfigured(
+                '{0} is missing the permission_required attribute. Define {0}.permission_required, or override '
+                '{0}.get_permission_required().'.format(self.__class__.__name__)
+            )
+
+        if not hasattr(self, 'queryset'):
+            raise ImproperlyConfigured(
+                '{} has no queryset defined. ObjectPermissionRequiredMixin may only be used on views which define '
+                'a base queryset'.format(self.__class__.__name__)
+            )
+
+        if not self.has_permission():
+            return self.handle_no_permission()
+
+        return super().dispatch(request, *args, **kwargs)
+
+
 class GetReturnURLMixin(object):
     """
     Provides logic for determining where a user should be redirected after processing a form.
@@ -58,6 +114,10 @@ class GetReturnURLMixin(object):
         return reverse('home')
 
 
+#
+# Generic views
+#
+
 class ObjectListView(View):
     """
     List a series of objects.

From 993ee8c900a45b433e20dee8d3751f42992bf7f8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 13:22:09 -0400
Subject: [PATCH 023/505] Transition ObjectListView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/views.py       |  9 ++--
 netbox/dcim/views.py           | 79 ++++++++++++----------------------
 netbox/extras/views.py         |  9 ++--
 netbox/ipam/views.py           | 27 ++++--------
 netbox/secrets/views.py        |  6 +--
 netbox/tenancy/views.py        |  6 +--
 netbox/utilities/views.py      | 33 ++++++++------
 netbox/virtualization/views.py | 12 ++----
 8 files changed, 69 insertions(+), 112 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index c3b09f596..e3f347398 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -23,8 +23,7 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider
 # Providers
 #
 
-class ProviderListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_provider'
+class ProviderListView(ObjectListView):
     queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
     filterset = filters.ProviderFilterSet
     filterset_form = forms.ProviderFilterForm
@@ -107,8 +106,7 @@ class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Circuit Types
 #
 
-class CircuitTypeListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_circuittype'
+class CircuitTypeListView(ObjectListView):
     queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
     table = tables.CircuitTypeTable
 
@@ -143,8 +141,7 @@ class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Circuits
 #
 
-class CircuitListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'circuits.view_circuit'
+class CircuitListView(ObjectListView):
     _terminations = CircuitTermination.objects.filter(circuit=OuterRef('pk'))
     queryset = Circuit.objects.prefetch_related(
         'provider', 'type', 'tenant', 'terminations__site'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 2bcf876c6..9faad490e 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -141,8 +141,7 @@ class BulkDisconnectView(GetReturnURLMixin, View):
 # Regions
 #
 
-class RegionListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_region'
+class RegionListView(ObjectListView):
     queryset = Region.objects.add_related_count(
         Region.objects.all(),
         Site,
@@ -186,8 +185,7 @@ class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Sites
 #
 
-class SiteListView(ObjectPermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_site'
+class SiteListView(ObjectListView):
     queryset = Site.objects.prefetch_related('region', 'tenant')
     filterset = filters.SiteFilterSet
     filterset_form = forms.SiteFilterForm
@@ -267,8 +265,7 @@ class SiteBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Rack groups
 #
 
-class RackGroupListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_rackgroup'
+class RackGroupListView(ObjectListView):
     queryset = RackGroup.objects.add_related_count(
         RackGroup.objects.all(),
         Rack,
@@ -312,8 +309,7 @@ class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Rack roles
 #
 
-class RackRoleListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_rackrole'
+class RackRoleListView(ObjectListView):
     queryset = RackRole.objects.annotate(rack_count=Count('racks'))
     table = tables.RackRoleTable
 
@@ -348,8 +344,7 @@ class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Racks
 #
 
-class RackListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_rack'
+class RackListView(ObjectListView):
     queryset = Rack.objects.prefetch_related(
         'site', 'group', 'tenant', 'role', 'devices__device_type'
     ).annotate(
@@ -476,8 +471,7 @@ class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Rack reservations
 #
 
-class RackReservationListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_rackreservation'
+class RackReservationListView(ObjectListView):
     queryset = RackReservation.objects.prefetch_related('rack__site')
     filterset = filters.RackReservationFilterSet
     filterset_form = forms.RackReservationFilterForm
@@ -561,8 +555,7 @@ class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Manufacturers
 #
 
-class ManufacturerListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_manufacturer'
+class ManufacturerListView(ObjectListView):
     queryset = Manufacturer.objects.annotate(
         devicetype_count=Count('device_types', distinct=True),
         inventoryitem_count=Count('inventory_items', distinct=True),
@@ -601,8 +594,7 @@ class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Device types
 #
 
-class DeviceTypeListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_devicetype'
+class DeviceTypeListView(ObjectListView):
     queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
     filterset = filters.DeviceTypeFilterSet
     filterset_form = forms.DeviceTypeFilterForm
@@ -1026,8 +1018,7 @@ class DeviceBayTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Device roles
 #
 
-class DeviceRoleListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_devicerole'
+class DeviceRoleListView(ObjectListView):
     queryset = DeviceRole.objects.all()
     table = tables.DeviceRoleTable
 
@@ -1062,8 +1053,7 @@ class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Platforms
 #
 
-class PlatformListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_platform'
+class PlatformListView(ObjectListView):
     queryset = Platform.objects.all()
     table = tables.PlatformTable
 
@@ -1098,8 +1088,7 @@ class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Devices
 #
 
-class DeviceListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_device'
+class DeviceListView(ObjectListView):
     queryset = Device.objects.prefetch_related(
         'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6'
     )
@@ -1323,8 +1312,7 @@ class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Console ports
 #
 
-class ConsolePortListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_consoleport'
+class ConsolePortListView(ObjectListView):
     queryset = ConsolePort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.ConsolePortFilterSet
     filterset_form = forms.ConsolePortFilterForm
@@ -1379,8 +1367,7 @@ class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Console server ports
 #
 
-class ConsoleServerPortListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_consoleserverport'
+class ConsoleServerPortListView(ObjectListView):
     queryset = ConsoleServerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.ConsoleServerPortFilterSet
     filterset_form = forms.ConsoleServerPortFilterForm
@@ -1447,8 +1434,7 @@ class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Power ports
 #
 
-class PowerPortListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_powerport'
+class PowerPortListView(ObjectListView):
     queryset = PowerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.PowerPortFilterSet
     filterset_form = forms.PowerPortFilterForm
@@ -1503,8 +1489,7 @@ class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Power outlets
 #
 
-class PowerOutletListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_poweroutlet'
+class PowerOutletListView(ObjectListView):
     queryset = PowerOutlet.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.PowerOutletFilterSet
     filterset_form = forms.PowerOutletFilterForm
@@ -1571,8 +1556,7 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Interfaces
 #
 
-class InterfaceListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_interface'
+class InterfaceListView(ObjectListView):
     queryset = Interface.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.InterfaceFilterSet
     filterset_form = forms.InterfaceFilterForm
@@ -1676,8 +1660,7 @@ class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Front ports
 #
 
-class FrontPortListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_frontport'
+class FrontPortListView(ObjectListView):
     queryset = FrontPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.FrontPortFilterSet
     filterset_form = forms.FrontPortFilterForm
@@ -1744,8 +1727,7 @@ class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Rear ports
 #
 
-class RearPortListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_rearport'
+class RearPortListView(ObjectListView):
     queryset = RearPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
     filterset = filters.RearPortFilterSet
     filterset_form = forms.RearPortFilterForm
@@ -1812,8 +1794,7 @@ class RearPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Device bays
 #
 
-class DeviceBayListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_devicebay'
+class DeviceBayListView(ObjectListView):
     queryset = DeviceBay.objects.prefetch_related(
         'device', 'device__site', 'installed_device', 'installed_device__site'
     )
@@ -2045,8 +2026,7 @@ class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateVie
 # Cables
 #
 
-class CableListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_cable'
+class CableListView(ObjectListView):
     queryset = Cable.objects.prefetch_related(
         'termination_a', 'termination_b'
     )
@@ -2215,7 +2195,7 @@ class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Connections
 #
 
-class ConsoleConnectionsListView(PermissionRequiredMixin, ObjectListView):
+class ConsoleConnectionsListView(ObjectListView):
     permission_required = ('dcim.view_consoleport', 'dcim.view_consoleserverport')
     queryset = ConsolePort.objects.prefetch_related(
         'device', 'connected_endpoint__device'
@@ -2247,7 +2227,7 @@ class ConsoleConnectionsListView(PermissionRequiredMixin, ObjectListView):
         return '\n'.join(csv_data)
 
 
-class PowerConnectionsListView(PermissionRequiredMixin, ObjectListView):
+class PowerConnectionsListView(ObjectListView):
     permission_required = ('dcim.view_powerport', 'dcim.view_poweroutlet')
     queryset = PowerPort.objects.prefetch_related(
         'device', '_connected_poweroutlet__device'
@@ -2279,8 +2259,7 @@ class PowerConnectionsListView(PermissionRequiredMixin, ObjectListView):
         return '\n'.join(csv_data)
 
 
-class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_interface'
+class InterfaceConnectionsListView(ObjectListView):
     queryset = Interface.objects.prefetch_related(
         'device', 'cable', '_connected_interface__device'
     ).filter(
@@ -2319,8 +2298,7 @@ class InterfaceConnectionsListView(PermissionRequiredMixin, ObjectListView):
 # Inventory items
 #
 
-class InventoryItemListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_inventoryitem'
+class InventoryItemListView(ObjectListView):
     queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
     filterset = filters.InventoryItemFilterSet
     filterset_form = forms.InventoryItemFilterForm
@@ -2376,8 +2354,7 @@ class InventoryItemBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Virtual chassis
 #
 
-class VirtualChassisListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_virtualchassis'
+class VirtualChassisListView(ObjectListView):
     queryset = VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members'))
     table = tables.VirtualChassisTable
     filterset = filters.VirtualChassisFilterSet
@@ -2644,8 +2621,7 @@ class VirtualChassisBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Power panels
 #
 
-class PowerPanelListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_powerpanel'
+class PowerPanelListView(ObjectListView):
     queryset = PowerPanel.objects.prefetch_related(
         'site', 'rack_group'
     ).annotate(
@@ -2724,8 +2700,7 @@ class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Power feeds
 #
 
-class PowerFeedListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'dcim.view_powerfeed'
+class PowerFeedListView(ObjectListView):
     queryset = PowerFeed.objects.prefetch_related(
         'power_panel', 'rack'
     )
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index e466414b6..c1bee4dd7 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -25,8 +25,7 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemT
 # Tags
 #
 
-class TagListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'extras.view_tag'
+class TagListView(ObjectListView):
     queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
@@ -106,8 +105,7 @@ class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Config contexts
 #
 
-class ConfigContextListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'extras.view_configcontext'
+class ConfigContextListView(ObjectListView):
     queryset = ConfigContext.objects.all()
     filterset = filters.ConfigContextFilterSet
     filterset_form = forms.ConfigContextFilterForm
@@ -200,8 +198,7 @@ class ObjectConfigContextView(View):
 # Change logging
 #
 
-class ObjectChangeListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'extras.view_objectchange'
+class ObjectChangeListView(ObjectListView):
     queryset = ObjectChange.objects.prefetch_related('user', 'changed_object_type')
     filterset = filters.ObjectChangeFilterSet
     filterset_form = forms.ObjectChangeFilterForm
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index bb0844d4d..09c3f7892 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -113,8 +113,7 @@ def add_available_vlans(vlan_group, vlans):
 # VRFs
 #
 
-class VRFListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_vrf'
+class VRFListView(ObjectListView):
     queryset = VRF.objects.prefetch_related('tenant')
     filterset = filters.VRFFilterSet
     filterset_form = forms.VRFFilterForm
@@ -182,8 +181,7 @@ class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # RIRs
 #
 
-class RIRListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_rir'
+class RIRListView(ObjectListView):
     queryset = RIR.objects.annotate(aggregate_count=Count('aggregates'))
     filterset = filters.RIRFilterSet
     filterset_form = forms.RIRFilterForm
@@ -290,8 +288,7 @@ class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Aggregates
 #
 
-class AggregateListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_aggregate'
+class AggregateListView(ObjectListView):
     queryset = Aggregate.objects.prefetch_related('rir').annotate(
         child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ())
     )
@@ -409,8 +406,7 @@ class AggregateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Prefix/VLAN roles
 #
 
-class RoleListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_role'
+class RoleListView(ObjectListView):
     queryset = Role.objects.all()
     table = tables.RoleTable
 
@@ -445,8 +441,7 @@ class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Prefixes
 #
 
-class PrefixListView(ObjectPermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_prefix'
+class PrefixListView(ObjectListView):
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
     filterset_form = forms.PrefixFilterForm
@@ -638,8 +633,7 @@ class PrefixBulkDeleteView(ObjectPermissionRequiredMixin, BulkDeleteView):
 # IP addresses
 #
 
-class IPAddressListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_ipaddress'
+class IPAddressListView(ObjectListView):
     queryset = IPAddress.objects.prefetch_related(
         'vrf__tenant', 'tenant', 'nat_inside', 'interface__device', 'interface__virtual_machine'
     )
@@ -813,8 +807,7 @@ class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # VLAN groups
 #
 
-class VLANGroupListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_vlangroup'
+class VLANGroupListView(ObjectListView):
     queryset = VLANGroup.objects.prefetch_related('site').annotate(vlan_count=Count('vlans'))
     filterset = filters.VLANGroupFilterSet
     filterset_form = forms.VLANGroupFilterForm
@@ -889,8 +882,7 @@ class VLANGroupVLANsView(PermissionRequiredMixin, View):
 # VLANs
 #
 
-class VLANListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_vlan'
+class VLANListView(ObjectListView):
     queryset = VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role').prefetch_related('prefixes')
     filterset = filters.VLANFilterSet
     filterset_form = forms.VLANFilterForm
@@ -985,8 +977,7 @@ class VLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Services
 #
 
-class ServiceListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'ipam.view_service'
+class ServiceListView(ObjectListView):
     queryset = Service.objects.prefetch_related('device', 'virtual_machine')
     filterset = filters.ServiceFilterSet
     filterset_form = forms.ServiceFilterForm
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 8ce9addb4..eda845375 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -30,8 +30,7 @@ def get_session_key(request):
 # Secret roles
 #
 
-class SecretRoleListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'secrets.view_secretrole'
+class SecretRoleListView(ObjectListView):
     queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
     table = tables.SecretRoleTable
 
@@ -66,8 +65,7 @@ class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Secrets
 #
 
-class SecretListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'secrets.view_secret'
+class SecretListView(ObjectListView):
     queryset = Secret.objects.prefetch_related('role', 'device')
     filterset = filters.SecretFilterSet
     filterset_form = forms.SecretFilterForm
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 745362271..b4e37d153 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -18,8 +18,7 @@ from .models import Tenant, TenantGroup
 # Tenant groups
 #
 
-class TenantGroupListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'tenancy.view_tenantgroup'
+class TenantGroupListView(ObjectListView):
     queryset = TenantGroup.objects.add_related_count(
         TenantGroup.objects.all(),
         Tenant,
@@ -60,8 +59,7 @@ class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 #  Tenants
 #
 
-class TenantListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'tenancy.view_tenant'
+class TenantListView(ObjectListView):
     queryset = Tenant.objects.prefetch_related('group')
     filterset = filters.TenantFilterSet
     filterset_form = forms.TenantFilterForm
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 6097fa5b2..8b4efeb5a 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -27,6 +27,7 @@ from extras.querysets import CustomFieldQueryset
 from users.models import ObjectPermission
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
+from utilities.permissions import get_permission_for_model
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm, ImportForm
@@ -45,11 +46,15 @@ class ObjectPermissionRequiredMixin(AccessMixin):
     """
     permission_required = None
 
+    def get_required_permission(self):
+        return self.permission_required
+
     def has_permission(self):
         user = self.request.user
+        permission_required = self.get_required_permission()
 
         # First, check that the user is granted the required permission at either the model or object level.
-        if not user.has_perm(self.permission_required):
+        if not user.has_perm(permission_required):
             return False
 
         # Superusers implicitly have all permissions
@@ -58,23 +63,18 @@ class ObjectPermissionRequiredMixin(AccessMixin):
 
         # Determine whether the permission is model-level or object-level. Model-level permissions grant the
         # specified action to *all* objects, so no further action is needed.
-        if self.permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
+        if permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
             return True
 
         # If the permission is granted only at the object level, filter the view's queryset to return only objects
         # on which the user is permitted to perform the specified action.
-        attrs = ObjectPermission.objects.get_attr_constraints(user, self.permission_required)
+        attrs = ObjectPermission.objects.get_attr_constraints(user, permission_required)
         if attrs:
             # Update the view's QuerySet to filter only the permitted objects
             self.queryset = self.queryset.filter(attrs)
             return True
 
     def dispatch(self, request, *args, **kwargs):
-        if self.permission_required is None:
-            raise ImproperlyConfigured(
-                '{0} is missing the permission_required attribute. Define {0}.permission_required, or override '
-                '{0}.get_permission_required().'.format(self.__class__.__name__)
-            )
 
         if not hasattr(self, 'queryset'):
             raise ImproperlyConfigured(
@@ -118,15 +118,15 @@ class GetReturnURLMixin(object):
 # Generic views
 #
 
-class ObjectListView(View):
+class ObjectListView(ObjectPermissionRequiredMixin, View):
     """
     List a series of objects.
 
-    queryset: The queryset of objects to display
-    filter: A django-filter FilterSet that is applied to the queryset
-    filter_form: The form used to render filter options
-    table: The django-tables2 Table used to render the objects list
-    template_name: The name of the template
+    :param queryset: The queryset of objects to display
+    :param filter: A django-filter FilterSet that is applied to the queryset
+    :param filter_form: The form used to render filter options
+    :param table: The django-tables2 Table used to render the objects list
+    :param template_name: The name of the template
     """
     queryset = None
     filterset = None
@@ -135,6 +135,11 @@ class ObjectListView(View):
     template_name = 'utilities/obj_list.html'
     action_buttons = ('add', 'import', 'export')
 
+    def get_required_permission(self):
+        if getattr(self, 'permission_required') is not None:
+            return self.permission_required
+        return get_permission_for_model(self.queryset.model, 'view')
+
     def queryset_to_yaml(self):
         """
         Export the queryset of objects as concatenated YAML documents.
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index c6f107be7..85dbf4774 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -22,8 +22,7 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
 # Cluster types
 #
 
-class ClusterTypeListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'virtualization.view_clustertype'
+class ClusterTypeListView(ObjectListView):
     queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterTypeTable
 
@@ -58,8 +57,7 @@ class ClusterTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Cluster groups
 #
 
-class ClusterGroupListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'virtualization.view_clustergroup'
+class ClusterGroupListView(ObjectListView):
     queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterGroupTable
 
@@ -94,8 +92,7 @@ class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
 # Clusters
 #
 
-class ClusterListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'virtualization.view_cluster'
+class ClusterListView(ObjectListView):
     queryset = Cluster.objects.prefetch_related('type', 'group', 'site', 'tenant')
     table = tables.ClusterTable
     filterset = filters.ClusterFilterSet
@@ -251,8 +248,7 @@ class ClusterRemoveDevicesView(PermissionRequiredMixin, View):
 # Virtual machines
 #
 
-class VirtualMachineListView(PermissionRequiredMixin, ObjectListView):
-    permission_required = 'virtualization.view_virtualmachine'
+class VirtualMachineListView(ObjectListView):
     queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role', 'primary_ip4', 'primary_ip6')
     filterset = filters.VirtualMachineFilterSet
     filterset_form = forms.VirtualMachineFilterForm

From 406b076b95c94d1f307b9ddb823095da34d7b346 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 13:59:19 -0400
Subject: [PATCH 024/505] Transition ObjectEditView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/urls.py        |   8 +-
 netbox/circuits/views.py       |  28 +------
 netbox/dcim/urls.py            |  30 +++----
 netbox/dcim/views.py           | 145 +++++++--------------------------
 netbox/extras/urls.py          |   2 +-
 netbox/extras/views.py         |  13 +--
 netbox/ipam/urls.py            |  16 ++--
 netbox/ipam/views.py           |  62 ++------------
 netbox/secrets/urls.py         |   2 +-
 netbox/secrets/views.py        |   7 +-
 netbox/tenancy/urls.py         |   4 +-
 netbox/tenancy/views.py        |  14 +---
 netbox/utilities/views.py      |   8 +-
 netbox/virtualization/urls.py  |  12 +--
 netbox/virtualization/views.py |  31 ++-----
 15 files changed, 99 insertions(+), 283 deletions(-)

diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py
index 72d9720df..1a7fa283b 100644
--- a/netbox/circuits/urls.py
+++ b/netbox/circuits/urls.py
@@ -10,7 +10,7 @@ urlpatterns = [
 
     # Providers
     path('providers/', views.ProviderListView.as_view(), name='provider_list'),
-    path('providers/add/', views.ProviderCreateView.as_view(), name='provider_add'),
+    path('providers/add/', views.ProviderEditView.as_view(), name='provider_add'),
     path('providers/import/', views.ProviderBulkImportView.as_view(), name='provider_import'),
     path('providers/edit/', views.ProviderBulkEditView.as_view(), name='provider_bulk_edit'),
     path('providers/delete/', views.ProviderBulkDeleteView.as_view(), name='provider_bulk_delete'),
@@ -21,7 +21,7 @@ urlpatterns = [
 
     # Circuit types
     path('circuit-types/', views.CircuitTypeListView.as_view(), name='circuittype_list'),
-    path('circuit-types/add/', views.CircuitTypeCreateView.as_view(), name='circuittype_add'),
+    path('circuit-types/add/', views.CircuitTypeEditView.as_view(), name='circuittype_add'),
     path('circuit-types/import/', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'),
     path('circuit-types/delete/', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'),
     path('circuit-types/<slug:slug>/edit/', views.CircuitTypeEditView.as_view(), name='circuittype_edit'),
@@ -29,7 +29,7 @@ urlpatterns = [
 
     # Circuits
     path('circuits/', views.CircuitListView.as_view(), name='circuit_list'),
-    path('circuits/add/', views.CircuitCreateView.as_view(), name='circuit_add'),
+    path('circuits/add/', views.CircuitEditView.as_view(), name='circuit_add'),
     path('circuits/import/', views.CircuitBulkImportView.as_view(), name='circuit_import'),
     path('circuits/edit/', views.CircuitBulkEditView.as_view(), name='circuit_bulk_edit'),
     path('circuits/delete/', views.CircuitBulkDeleteView.as_view(), name='circuit_bulk_delete'),
@@ -41,7 +41,7 @@ urlpatterns = [
 
     # Circuit terminations
 
-    path('circuits/<int:circuit>/terminations/add/', views.CircuitTerminationCreateView.as_view(), name='circuittermination_add'),
+    path('circuits/<int:circuit>/terminations/add/', views.CircuitTerminationEditView.as_view(), name='circuittermination_add'),
     path('circuit-terminations/<int:pk>/edit/', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'),
     path('circuit-terminations/<int:pk>/delete/', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'),
     path('circuit-terminations/<int:termination_a_id>/connect/<str:termination_b_type>/', CableCreateView.as_view(), name='circuittermination_connect', kwargs={'termination_a_type': CircuitTermination}),
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index e3f347398..59cdac930 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -59,18 +59,13 @@ class ProviderView(PermissionRequiredMixin, View):
         })
 
 
-class ProviderCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'circuits.add_provider'
+class ProviderEditView(ObjectEditView):
     queryset = Provider.objects.all()
     model_form = forms.ProviderForm
     template_name = 'circuits/provider_edit.html'
     default_return_url = 'circuits:provider_list'
 
 
-class ProviderEditView(ProviderCreateView):
-    permission_required = 'circuits.change_provider'
-
-
 class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_provider'
     queryset = Provider.objects.all()
@@ -111,17 +106,12 @@ class CircuitTypeListView(ObjectListView):
     table = tables.CircuitTypeTable
 
 
-class CircuitTypeCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'circuits.add_circuittype'
+class CircuitTypeEditView(ObjectEditView):
     queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeForm
     default_return_url = 'circuits:circuittype_list'
 
 
-class CircuitTypeEditView(CircuitTypeCreateView):
-    permission_required = 'circuits.change_circuittype'
-
-
 class CircuitTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'circuits.add_circuittype'
     queryset = CircuitType.objects.all()
@@ -175,18 +165,13 @@ class CircuitView(PermissionRequiredMixin, View):
         })
 
 
-class CircuitCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'circuits.add_circuit'
+class CircuitEditView(ObjectEditView):
     queryset = Circuit.objects.all()
     model_form = forms.CircuitForm
     template_name = 'circuits/circuit_edit.html'
     default_return_url = 'circuits:circuit_list'
 
 
-class CircuitEditView(CircuitCreateView):
-    permission_required = 'circuits.change_circuit'
-
-
 class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_circuit'
     queryset = Circuit.objects.all()
@@ -271,8 +256,7 @@ def circuit_terminations_swap(request, pk):
 # Circuit terminations
 #
 
-class CircuitTerminationCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'circuits.add_circuittermination'
+class CircuitTerminationEditView(ObjectEditView):
     queryset = CircuitTermination.objects.all()
     model_form = forms.CircuitTerminationForm
     template_name = 'circuits/circuittermination_edit.html'
@@ -286,10 +270,6 @@ class CircuitTerminationCreateView(PermissionRequiredMixin, ObjectEditView):
         return obj.circuit.get_absolute_url()
 
 
-class CircuitTerminationEditView(CircuitTerminationCreateView):
-    permission_required = 'circuits.change_circuittermination'
-
-
 class CircuitTerminationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'circuits.delete_circuittermination'
     queryset = CircuitTermination.objects.all()
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 0b1f6250e..a0d6bdc92 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path
 
 from extras.views import ObjectChangeLogView, ImageAttachmentEditView
-from ipam.views import ServiceCreateView
+from ipam.views import ServiceEditView
 from . import views
 from .models import (
     Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform,
@@ -14,7 +14,7 @@ urlpatterns = [
 
     # Regions
     path('regions/', views.RegionListView.as_view(), name='region_list'),
-    path('regions/add/', views.RegionCreateView.as_view(), name='region_add'),
+    path('regions/add/', views.RegionEditView.as_view(), name='region_add'),
     path('regions/import/', views.RegionBulkImportView.as_view(), name='region_import'),
     path('regions/delete/', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'),
     path('regions/<int:pk>/edit/', views.RegionEditView.as_view(), name='region_edit'),
@@ -22,7 +22,7 @@ urlpatterns = [
 
     # Sites
     path('sites/', views.SiteListView.as_view(), name='site_list'),
-    path('sites/add/', views.SiteCreateView.as_view(), name='site_add'),
+    path('sites/add/', views.SiteEditView.as_view(), name='site_add'),
     path('sites/import/', views.SiteBulkImportView.as_view(), name='site_import'),
     path('sites/edit/', views.SiteBulkEditView.as_view(), name='site_bulk_edit'),
     path('sites/delete/', views.SiteBulkDeleteView.as_view(), name='site_bulk_delete'),
@@ -34,7 +34,7 @@ urlpatterns = [
 
     # Rack groups
     path('rack-groups/', views.RackGroupListView.as_view(), name='rackgroup_list'),
-    path('rack-groups/add/', views.RackGroupCreateView.as_view(), name='rackgroup_add'),
+    path('rack-groups/add/', views.RackGroupEditView.as_view(), name='rackgroup_add'),
     path('rack-groups/import/', views.RackGroupBulkImportView.as_view(), name='rackgroup_import'),
     path('rack-groups/delete/', views.RackGroupBulkDeleteView.as_view(), name='rackgroup_bulk_delete'),
     path('rack-groups/<int:pk>/edit/', views.RackGroupEditView.as_view(), name='rackgroup_edit'),
@@ -42,7 +42,7 @@ urlpatterns = [
 
     # Rack roles
     path('rack-roles/', views.RackRoleListView.as_view(), name='rackrole_list'),
-    path('rack-roles/add/', views.RackRoleCreateView.as_view(), name='rackrole_add'),
+    path('rack-roles/add/', views.RackRoleEditView.as_view(), name='rackrole_add'),
     path('rack-roles/import/', views.RackRoleBulkImportView.as_view(), name='rackrole_import'),
     path('rack-roles/delete/', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'),
     path('rack-roles/<int:pk>/edit/', views.RackRoleEditView.as_view(), name='rackrole_edit'),
@@ -50,7 +50,7 @@ urlpatterns = [
 
     # Rack reservations
     path('rack-reservations/', views.RackReservationListView.as_view(), name='rackreservation_list'),
-    path('rack-reservations/add/', views.RackReservationCreateView.as_view(), name='rackreservation_add'),
+    path('rack-reservations/add/', views.RackReservationEditView.as_view(), name='rackreservation_add'),
     path('rack-reservations/import/', views.RackReservationImportView.as_view(), name='rackreservation_import'),
     path('rack-reservations/edit/', views.RackReservationBulkEditView.as_view(), name='rackreservation_bulk_edit'),
     path('rack-reservations/delete/', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'),
@@ -62,7 +62,7 @@ urlpatterns = [
     # Racks
     path('racks/', views.RackListView.as_view(), name='rack_list'),
     path('rack-elevations/', views.RackElevationListView.as_view(), name='rack_elevation_list'),
-    path('racks/add/', views.RackCreateView.as_view(), name='rack_add'),
+    path('racks/add/', views.RackEditView.as_view(), name='rack_add'),
     path('racks/import/', views.RackBulkImportView.as_view(), name='rack_import'),
     path('racks/edit/', views.RackBulkEditView.as_view(), name='rack_bulk_edit'),
     path('racks/delete/', views.RackBulkDeleteView.as_view(), name='rack_bulk_delete'),
@@ -74,7 +74,7 @@ urlpatterns = [
 
     # Manufacturers
     path('manufacturers/', views.ManufacturerListView.as_view(), name='manufacturer_list'),
-    path('manufacturers/add/', views.ManufacturerCreateView.as_view(), name='manufacturer_add'),
+    path('manufacturers/add/', views.ManufacturerEditView.as_view(), name='manufacturer_add'),
     path('manufacturers/import/', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'),
     path('manufacturers/delete/', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'),
     path('manufacturers/<slug:slug>/edit/', views.ManufacturerEditView.as_view(), name='manufacturer_edit'),
@@ -82,7 +82,7 @@ urlpatterns = [
 
     # Device types
     path('device-types/', views.DeviceTypeListView.as_view(), name='devicetype_list'),
-    path('device-types/add/', views.DeviceTypeCreateView.as_view(), name='devicetype_add'),
+    path('device-types/add/', views.DeviceTypeEditView.as_view(), name='devicetype_add'),
     path('device-types/import/', views.DeviceTypeImportView.as_view(), name='devicetype_import'),
     path('device-types/edit/', views.DeviceTypeBulkEditView.as_view(), name='devicetype_bulk_edit'),
     path('device-types/delete/', views.DeviceTypeBulkDeleteView.as_view(), name='devicetype_bulk_delete'),
@@ -149,7 +149,7 @@ urlpatterns = [
 
     # Device roles
     path('device-roles/', views.DeviceRoleListView.as_view(), name='devicerole_list'),
-    path('device-roles/add/', views.DeviceRoleCreateView.as_view(), name='devicerole_add'),
+    path('device-roles/add/', views.DeviceRoleEditView.as_view(), name='devicerole_add'),
     path('device-roles/import/', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'),
     path('device-roles/delete/', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'),
     path('device-roles/<slug:slug>/edit/', views.DeviceRoleEditView.as_view(), name='devicerole_edit'),
@@ -157,7 +157,7 @@ urlpatterns = [
 
     # Platforms
     path('platforms/', views.PlatformListView.as_view(), name='platform_list'),
-    path('platforms/add/', views.PlatformCreateView.as_view(), name='platform_add'),
+    path('platforms/add/', views.PlatformEditView.as_view(), name='platform_add'),
     path('platforms/import/', views.PlatformBulkImportView.as_view(), name='platform_import'),
     path('platforms/delete/', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'),
     path('platforms/<slug:slug>/edit/', views.PlatformEditView.as_view(), name='platform_edit'),
@@ -165,7 +165,7 @@ urlpatterns = [
 
     # Devices
     path('devices/', views.DeviceListView.as_view(), name='device_list'),
-    path('devices/add/', views.DeviceCreateView.as_view(), name='device_add'),
+    path('devices/add/', views.DeviceEditView.as_view(), name='device_add'),
     path('devices/import/', views.DeviceBulkImportView.as_view(), name='device_import'),
     path('devices/import/child-devices/', views.ChildDeviceBulkImportView.as_view(), name='device_import_child'),
     path('devices/edit/', views.DeviceBulkEditView.as_view(), name='device_bulk_edit'),
@@ -179,7 +179,7 @@ urlpatterns = [
     path('devices/<int:pk>/status/', views.DeviceStatusView.as_view(), name='device_status'),
     path('devices/<int:pk>/lldp-neighbors/', views.DeviceLLDPNeighborsView.as_view(), name='device_lldp_neighbors'),
     path('devices/<int:pk>/config/', views.DeviceConfigView.as_view(), name='device_config'),
-    path('devices/<int:device>/services/assign/', ServiceCreateView.as_view(), name='device_service_assign'),
+    path('devices/<int:device>/services/assign/', ServiceEditView.as_view(), name='device_service_assign'),
     path('devices/<int:object_id>/images/add/', ImageAttachmentEditView.as_view(), name='device_add_image', kwargs={'model': Device}),
 
     # Console ports
@@ -332,7 +332,7 @@ urlpatterns = [
 
     # Power panels
     path('power-panels/', views.PowerPanelListView.as_view(), name='powerpanel_list'),
-    path('power-panels/add/', views.PowerPanelCreateView.as_view(), name='powerpanel_add'),
+    path('power-panels/add/', views.PowerPanelEditView.as_view(), name='powerpanel_add'),
     path('power-panels/import/', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'),
     path('power-panels/edit/', views.PowerPanelBulkEditView.as_view(), name='powerpanel_bulk_edit'),
     path('power-panels/delete/', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'),
@@ -343,7 +343,7 @@ urlpatterns = [
 
     # Power feeds
     path('power-feeds/', views.PowerFeedListView.as_view(), name='powerfeed_list'),
-    path('power-feeds/add/', views.PowerFeedCreateView.as_view(), name='powerfeed_add'),
+    path('power-feeds/add/', views.PowerFeedEditView.as_view(), name='powerfeed_add'),
     path('power-feeds/import/', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'),
     path('power-feeds/edit/', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'),
     path('power-feeds/delete/', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 9faad490e..e33f3bd04 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -154,17 +154,12 @@ class RegionListView(ObjectListView):
     table = tables.RegionTable
 
 
-class RegionCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_region'
+class RegionEditView(ObjectEditView):
     queryset = Region.objects.all()
     model_form = forms.RegionForm
     default_return_url = 'dcim:region_list'
 
 
-class RegionEditView(RegionCreateView):
-    permission_required = 'dcim.change_region'
-
-
 class RegionBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_region'
     queryset = Region.objects.all()
@@ -218,18 +213,13 @@ class SiteView(ObjectPermissionRequiredMixin, View):
         })
 
 
-class SiteCreateView(ObjectPermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_site'
+class SiteEditView(ObjectEditView):
     queryset = Site.objects.all()
     model_form = forms.SiteForm
     template_name = 'dcim/site_edit.html'
     default_return_url = 'dcim:site_list'
 
 
-class SiteEditView(SiteCreateView):
-    permission_required = 'dcim.change_site'
-
-
 class SiteDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_site'
     queryset = Site.objects.all()
@@ -278,17 +268,12 @@ class RackGroupListView(ObjectListView):
     table = tables.RackGroupTable
 
 
-class RackGroupCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_rackgroup'
+class RackGroupEditView(ObjectEditView):
     queryset = RackGroup.objects.all()
     model_form = forms.RackGroupForm
     default_return_url = 'dcim:rackgroup_list'
 
 
-class RackGroupEditView(RackGroupCreateView):
-    permission_required = 'dcim.change_rackgroup'
-
-
 class RackGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rackgroup'
     queryset = RackGroup.objects.all()
@@ -314,17 +299,12 @@ class RackRoleListView(ObjectListView):
     table = tables.RackRoleTable
 
 
-class RackRoleCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_rackrole'
+class RackRoleEditView(ObjectEditView):
     queryset = RackRole.objects.all()
     model_form = forms.RackRoleForm
     default_return_url = 'dcim:rackrole_list'
 
 
-class RackRoleEditView(RackRoleCreateView):
-    permission_required = 'dcim.change_rackrole'
-
-
 class RackRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_rackrole'
     queryset = RackRole.objects.all()
@@ -424,18 +404,13 @@ class RackView(PermissionRequiredMixin, View):
         })
 
 
-class RackCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_rack'
+class RackEditView(ObjectEditView):
     queryset = Rack.objects.all()
     model_form = forms.RackForm
     template_name = 'dcim/rack_edit.html'
     default_return_url = 'dcim:rack_list'
 
 
-class RackEditView(RackCreateView):
-    permission_required = 'dcim.change_rack'
-
-
 class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rack'
     queryset = Rack.objects.all()
@@ -491,8 +466,7 @@ class RackReservationView(PermissionRequiredMixin, View):
         })
 
 
-class RackReservationCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_rackreservation'
+class RackReservationEditView(ObjectEditView):
     queryset = RackReservation.objects.all()
     model_form = forms.RackReservationForm
     template_name = 'dcim/rackreservation_edit.html'
@@ -506,10 +480,6 @@ class RackReservationCreateView(PermissionRequiredMixin, ObjectEditView):
         return obj
 
 
-class RackReservationEditView(RackReservationCreateView):
-    permission_required = 'dcim.change_rackreservation'
-
-
 class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_rackreservation'
     queryset = RackReservation.objects.all()
@@ -564,17 +534,12 @@ class ManufacturerListView(ObjectListView):
     table = tables.ManufacturerTable
 
 
-class ManufacturerCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_manufacturer'
+class ManufacturerEditView(ObjectEditView):
     queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerForm
     default_return_url = 'dcim:manufacturer_list'
 
 
-class ManufacturerEditView(ManufacturerCreateView):
-    permission_required = 'dcim.change_manufacturer'
-
-
 class ManufacturerBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_manufacturer'
     queryset = Manufacturer.objects.all()
@@ -664,18 +629,13 @@ class DeviceTypeView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceTypeCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_devicetype'
+class DeviceTypeEditView(ObjectEditView):
     queryset = DeviceType.objects.all()
     model_form = forms.DeviceTypeForm
     template_name = 'dcim/devicetype_edit.html'
     default_return_url = 'dcim:devicetype_list'
 
 
-class DeviceTypeEditView(DeviceTypeCreateView):
-    permission_required = 'dcim.change_devicetype'
-
-
 class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_devicetype'
     queryset = DeviceType.objects.all()
@@ -738,8 +698,7 @@ class ConsolePortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsolePortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_consoleporttemplate'
+class ConsolePortTemplateEditView(ObjectEditView):
     queryset = ConsolePortTemplate.objects.all()
     model_form = forms.ConsolePortTemplateForm
 
@@ -774,8 +733,7 @@ class ConsoleServerPortTemplateCreateView(PermissionRequiredMixin, ComponentCrea
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsoleServerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_consoleserverporttemplate'
+class ConsoleServerPortTemplateEditView(ObjectEditView):
     queryset = ConsoleServerPortTemplate.objects.all()
     model_form = forms.ConsoleServerPortTemplateForm
 
@@ -810,8 +768,7 @@ class PowerPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_powerporttemplate'
+class PowerPortTemplateEditView(ObjectEditView):
     queryset = PowerPortTemplate.objects.all()
     model_form = forms.PowerPortTemplateForm
 
@@ -846,8 +803,7 @@ class PowerOutletTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerOutletTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_poweroutlettemplate'
+class PowerOutletTemplateEditView(ObjectEditView):
     queryset = PowerOutletTemplate.objects.all()
     model_form = forms.PowerOutletTemplateForm
 
@@ -882,8 +838,7 @@ class InterfaceTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class InterfaceTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_interfacetemplate'
+class InterfaceTemplateEditView(ObjectEditView):
     queryset = InterfaceTemplate.objects.all()
     model_form = forms.InterfaceTemplateForm
 
@@ -918,8 +873,7 @@ class FrontPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class FrontPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_frontporttemplate'
+class FrontPortTemplateEditView(ObjectEditView):
     queryset = FrontPortTemplate.objects.all()
     model_form = forms.FrontPortTemplateForm
 
@@ -954,8 +908,7 @@ class RearPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class RearPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_rearporttemplate'
+class RearPortTemplateEditView(ObjectEditView):
     queryset = RearPortTemplate.objects.all()
     model_form = forms.RearPortTemplateForm
 
@@ -990,8 +943,7 @@ class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class DeviceBayTemplateEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_devicebaytemplate'
+class DeviceBayTemplateEditView(ObjectEditView):
     queryset = DeviceBayTemplate.objects.all()
     model_form = forms.DeviceBayTemplateForm
 
@@ -1023,17 +975,12 @@ class DeviceRoleListView(ObjectListView):
     table = tables.DeviceRoleTable
 
 
-class DeviceRoleCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_devicerole'
+class DeviceRoleEditView(ObjectEditView):
     queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleForm
     default_return_url = 'dcim:devicerole_list'
 
 
-class DeviceRoleEditView(DeviceRoleCreateView):
-    permission_required = 'dcim.change_devicerole'
-
-
 class DeviceRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_devicerole'
     queryset = DeviceRole.objects.all()
@@ -1058,17 +1005,12 @@ class PlatformListView(ObjectListView):
     table = tables.PlatformTable
 
 
-class PlatformCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_platform'
+class PlatformEditView(ObjectEditView):
     queryset = Platform.objects.all()
     model_form = forms.PlatformForm
     default_return_url = 'dcim:platform_list'
 
 
-class PlatformEditView(PlatformCreateView):
-    permission_required = 'dcim.change_platform'
-
-
 class PlatformBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'dcim.add_platform'
     queryset = Platform.objects.all()
@@ -1244,18 +1186,13 @@ class DeviceConfigContextView(PermissionRequiredMixin, ObjectConfigContextView):
     base_template = 'dcim/device.html'
 
 
-class DeviceCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_device'
+class DeviceEditView(ObjectEditView):
     queryset = Device.objects.all()
     model_form = forms.DeviceForm
     template_name = 'dcim/device_edit.html'
     default_return_url = 'dcim:device_list'
 
 
-class DeviceEditView(DeviceCreateView):
-    permission_required = 'dcim.change_device'
-
-
 class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_device'
     queryset = Device.objects.all()
@@ -1328,8 +1265,7 @@ class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_consoleport'
+class ConsolePortEditView(ObjectEditView):
     queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortForm
 
@@ -1383,8 +1319,7 @@ class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_consoleserverport'
+class ConsoleServerPortEditView(ObjectEditView):
     queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortForm
 
@@ -1450,8 +1385,7 @@ class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerPortEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_powerport'
+class PowerPortEditView(ObjectEditView):
     queryset = PowerPort.objects.all()
     model_form = forms.PowerPortForm
 
@@ -1505,8 +1439,7 @@ class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_poweroutlet'
+class PowerOutletEditView(ObjectEditView):
     queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletForm
 
@@ -1608,8 +1541,7 @@ class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_interface'
+class InterfaceEditView(ObjectEditView):
     queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     template_name = 'dcim/interface_edit.html'
@@ -1676,8 +1608,7 @@ class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class FrontPortEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_frontport'
+class FrontPortEditView(ObjectEditView):
     queryset = FrontPort.objects.all()
     model_form = forms.FrontPortForm
 
@@ -1743,8 +1674,7 @@ class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class RearPortEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_rearport'
+class RearPortEditView(ObjectEditView):
     queryset = RearPort.objects.all()
     model_form = forms.RearPortForm
 
@@ -1812,8 +1742,7 @@ class DeviceBayCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class DeviceBayEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_devicebay'
+class DeviceBayEditView(ObjectEditView):
     queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayForm
 
@@ -2152,8 +2081,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View):
         })
 
 
-class CableEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_cable'
+class CableEditView(ObjectEditView):
     queryset = Cable.objects.all()
     model_form = forms.CableForm
     template_name = 'dcim/cable_edit.html'
@@ -2306,8 +2234,7 @@ class InventoryItemListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class InventoryItemEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_inventoryitem'
+class InventoryItemEditView(ObjectEditView):
     queryset = InventoryItem.objects.all()
     model_form = forms.InventoryItemForm
 
@@ -2650,17 +2577,12 @@ class PowerPanelView(PermissionRequiredMixin, View):
         })
 
 
-class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_powerpanel'
+class PowerPanelEditView(ObjectEditView):
     queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelForm
     default_return_url = 'dcim:powerpanel_list'
 
 
-class PowerPanelEditView(PowerPanelCreateView):
-    permission_required = 'dcim.change_powerpanel'
-
-
 class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerpanel'
     queryset = PowerPanel.objects.all()
@@ -2721,18 +2643,13 @@ class PowerFeedView(PermissionRequiredMixin, View):
         })
 
 
-class PowerFeedCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.add_powerfeed'
+class PowerFeedEditView(ObjectEditView):
     queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedForm
     template_name = 'dcim/powerfeed_edit.html'
     default_return_url = 'dcim:powerfeed_list'
 
 
-class PowerFeedEditView(PowerFeedCreateView):
-    permission_required = 'dcim.change_powerfeed'
-
-
 class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'dcim.delete_powerfeed'
     queryset = PowerFeed.objects.all()
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index a486ce7fc..3eee303a3 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -18,7 +18,7 @@ urlpatterns = [
 
     # Config contexts
     path('config-contexts/', views.ConfigContextListView.as_view(), name='configcontext_list'),
-    path('config-contexts/add/', views.ConfigContextCreateView.as_view(), name='configcontext_add'),
+    path('config-contexts/add/', views.ConfigContextEditView.as_view(), name='configcontext_add'),
     path('config-contexts/edit/', views.ConfigContextBulkEditView.as_view(), name='configcontext_bulk_edit'),
     path('config-contexts/delete/', views.ConfigContextBulkDeleteView.as_view(), name='configcontext_bulk_delete'),
     path('config-contexts/<int:pk>/', views.ConfigContextView.as_view(), name='configcontext'),
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index c1bee4dd7..b5d9306f8 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -64,8 +64,7 @@ class TagView(PermissionRequiredMixin, View):
         })
 
 
-class TagEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'extras.change_tag'
+class TagEditView(ObjectEditView):
     queryset = Tag.objects.all()
     model_form = forms.TagForm
     default_return_url = 'extras:tag_list'
@@ -132,18 +131,13 @@ class ConfigContextView(PermissionRequiredMixin, View):
         })
 
 
-class ConfigContextCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'extras.add_configcontext'
+class ConfigContextEditView(ObjectEditView):
     queryset = ConfigContext.objects.all()
     model_form = forms.ConfigContextForm
     default_return_url = 'extras:configcontext_list'
     template_name = 'extras/configcontext_edit.html'
 
 
-class ConfigContextEditView(ConfigContextCreateView):
-    permission_required = 'extras.change_configcontext'
-
-
 class ConfigContextBulkEditView(PermissionRequiredMixin, BulkEditView):
     permission_required = 'extras.change_configcontext'
     queryset = ConfigContext.objects.all()
@@ -301,8 +295,7 @@ class ObjectChangeLogView(View):
 # Image attachments
 #
 
-class ImageAttachmentEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'extras.change_imageattachment'
+class ImageAttachmentEditView(ObjectEditView):
     queryset = ImageAttachment.objects.all()
     model_form = forms.ImageAttachmentForm
 
diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py
index f1211473e..de8fc86eb 100644
--- a/netbox/ipam/urls.py
+++ b/netbox/ipam/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
 
     # VRFs
     path('vrfs/', views.VRFListView.as_view(), name='vrf_list'),
-    path('vrfs/add/', views.VRFCreateView.as_view(), name='vrf_add'),
+    path('vrfs/add/', views.VRFEditView.as_view(), name='vrf_add'),
     path('vrfs/import/', views.VRFBulkImportView.as_view(), name='vrf_import'),
     path('vrfs/edit/', views.VRFBulkEditView.as_view(), name='vrf_bulk_edit'),
     path('vrfs/delete/', views.VRFBulkDeleteView.as_view(), name='vrf_bulk_delete'),
@@ -20,7 +20,7 @@ urlpatterns = [
 
     # RIRs
     path('rirs/', views.RIRListView.as_view(), name='rir_list'),
-    path('rirs/add/', views.RIRCreateView.as_view(), name='rir_add'),
+    path('rirs/add/', views.RIREditView.as_view(), name='rir_add'),
     path('rirs/import/', views.RIRBulkImportView.as_view(), name='rir_import'),
     path('rirs/delete/', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'),
     path('rirs/<slug:slug>/edit/', views.RIREditView.as_view(), name='rir_edit'),
@@ -28,7 +28,7 @@ urlpatterns = [
 
     # Aggregates
     path('aggregates/', views.AggregateListView.as_view(), name='aggregate_list'),
-    path('aggregates/add/', views.AggregateCreateView.as_view(), name='aggregate_add'),
+    path('aggregates/add/', views.AggregateEditView.as_view(), name='aggregate_add'),
     path('aggregates/import/', views.AggregateBulkImportView.as_view(), name='aggregate_import'),
     path('aggregates/edit/', views.AggregateBulkEditView.as_view(), name='aggregate_bulk_edit'),
     path('aggregates/delete/', views.AggregateBulkDeleteView.as_view(), name='aggregate_bulk_delete'),
@@ -39,7 +39,7 @@ urlpatterns = [
 
     # Roles
     path('roles/', views.RoleListView.as_view(), name='role_list'),
-    path('roles/add/', views.RoleCreateView.as_view(), name='role_add'),
+    path('roles/add/', views.RoleEditView.as_view(), name='role_add'),
     path('roles/import/', views.RoleBulkImportView.as_view(), name='role_import'),
     path('roles/delete/', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'),
     path('roles/<slug:slug>/edit/', views.RoleEditView.as_view(), name='role_edit'),
@@ -47,7 +47,7 @@ urlpatterns = [
 
     # Prefixes
     path('prefixes/', views.PrefixListView.as_view(), name='prefix_list'),
-    path('prefixes/add/', views.PrefixCreateView.as_view(), name='prefix_add'),
+    path('prefixes/add/', views.PrefixEditView.as_view(), name='prefix_add'),
     path('prefixes/import/', views.PrefixBulkImportView.as_view(), name='prefix_import'),
     path('prefixes/edit/', views.PrefixBulkEditView.as_view(), name='prefix_bulk_edit'),
     path('prefixes/delete/', views.PrefixBulkDeleteView.as_view(), name='prefix_bulk_delete'),
@@ -60,7 +60,7 @@ urlpatterns = [
 
     # IP addresses
     path('ip-addresses/', views.IPAddressListView.as_view(), name='ipaddress_list'),
-    path('ip-addresses/add/', views.IPAddressCreateView.as_view(), name='ipaddress_add'),
+    path('ip-addresses/add/', views.IPAddressEditView.as_view(), name='ipaddress_add'),
     path('ip-addresses/bulk-add/', views.IPAddressBulkCreateView.as_view(), name='ipaddress_bulk_add'),
     path('ip-addresses/import/', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'),
     path('ip-addresses/edit/', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'),
@@ -73,7 +73,7 @@ urlpatterns = [
 
     # VLAN groups
     path('vlan-groups/', views.VLANGroupListView.as_view(), name='vlangroup_list'),
-    path('vlan-groups/add/', views.VLANGroupCreateView.as_view(), name='vlangroup_add'),
+    path('vlan-groups/add/', views.VLANGroupEditView.as_view(), name='vlangroup_add'),
     path('vlan-groups/import/', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'),
     path('vlan-groups/delete/', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'),
     path('vlan-groups/<int:pk>/edit/', views.VLANGroupEditView.as_view(), name='vlangroup_edit'),
@@ -82,7 +82,7 @@ urlpatterns = [
 
     # VLANs
     path('vlans/', views.VLANListView.as_view(), name='vlan_list'),
-    path('vlans/add/', views.VLANCreateView.as_view(), name='vlan_add'),
+    path('vlans/add/', views.VLANEditView.as_view(), name='vlan_add'),
     path('vlans/import/', views.VLANBulkImportView.as_view(), name='vlan_import'),
     path('vlans/edit/', views.VLANBulkEditView.as_view(), name='vlan_bulk_edit'),
     path('vlans/delete/', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'),
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 09c3f7892..220205c19 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -134,18 +134,13 @@ class VRFView(PermissionRequiredMixin, View):
         })
 
 
-class VRFCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_vrf'
+class VRFEditView(ObjectEditView):
     queryset = VRF.objects.all()
     model_form = forms.VRFForm
     template_name = 'ipam/vrf_edit.html'
     default_return_url = 'ipam:vrf_list'
 
 
-class VRFEditView(VRFCreateView):
-    permission_required = 'ipam.change_vrf'
-
-
 class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_vrf'
     queryset = VRF.objects.all()
@@ -257,17 +252,12 @@ class RIRListView(ObjectListView):
         return rirs
 
 
-class RIRCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_rir'
+class RIREditView(ObjectEditView):
     queryset = RIR.objects.all()
     model_form = forms.RIRForm
     default_return_url = 'ipam:rir_list'
 
 
-class RIREditView(RIRCreateView):
-    permission_required = 'ipam.change_rir'
-
-
 class RIRBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_rir'
     queryset = RIR.objects.all()
@@ -359,18 +349,13 @@ class AggregateView(PermissionRequiredMixin, View):
         })
 
 
-class AggregateCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_aggregate'
+class AggregateEditView(ObjectEditView):
     queryset = Aggregate.objects.all()
     model_form = forms.AggregateForm
     template_name = 'ipam/aggregate_edit.html'
     default_return_url = 'ipam:aggregate_list'
 
 
-class AggregateEditView(AggregateCreateView):
-    permission_required = 'ipam.change_aggregate'
-
-
 class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_aggregate'
     queryset = Aggregate.objects.all()
@@ -411,17 +396,12 @@ class RoleListView(ObjectListView):
     table = tables.RoleTable
 
 
-class RoleCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_role'
+class RoleEditView(ObjectEditView):
     queryset = Role.objects.all()
     model_form = forms.RoleForm
     default_return_url = 'ipam:role_list'
 
 
-class RoleEditView(RoleCreateView):
-    permission_required = 'ipam.change_role'
-
-
 class RoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_role'
     queryset = Role.objects.all()
@@ -585,18 +565,13 @@ class PrefixIPAddressesView(PermissionRequiredMixin, View):
         })
 
 
-class PrefixCreateView(ObjectPermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_prefix'
+class PrefixEditView(ObjectEditView):
     queryset = Prefix.objects.all()
     model_form = forms.PrefixForm
     template_name = 'ipam/prefix_edit.html'
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixEditView(PrefixCreateView):
-    permission_required = 'ipam.change_prefix'
-
-
 class PrefixDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_prefix'
     queryset = Prefix.objects.all()
@@ -696,8 +671,7 @@ class IPAddressView(PermissionRequiredMixin, View):
         })
 
 
-class IPAddressCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_ipaddress'
+class IPAddressEditView(ObjectEditView):
     queryset = IPAddress.objects.all()
     model_form = forms.IPAddressForm
     template_name = 'ipam/ipaddress_edit.html'
@@ -715,10 +689,6 @@ class IPAddressCreateView(PermissionRequiredMixin, ObjectEditView):
         return obj
 
 
-class IPAddressEditView(IPAddressCreateView):
-    permission_required = 'ipam.change_ipaddress'
-
-
 class IPAddressAssignView(PermissionRequiredMixin, View):
     """
     Search for IPAddresses to be assigned to an Interface.
@@ -814,17 +784,13 @@ class VLANGroupListView(ObjectListView):
     table = tables.VLANGroupTable
 
 
-class VLANGroupCreateView(PermissionRequiredMixin, ObjectEditView):
+class VLANGroupEditView(ObjectEditView):
     permission_required = 'ipam.add_vlangroup'
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupForm
     default_return_url = 'ipam:vlangroup_list'
 
 
-class VLANGroupEditView(VLANGroupCreateView):
-    permission_required = 'ipam.change_vlangroup'
-
-
 class VLANGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'ipam.add_vlangroup'
     queryset = VLANGroup.objects.all()
@@ -930,18 +896,13 @@ class VLANMembersView(PermissionRequiredMixin, View):
         })
 
 
-class VLANCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_vlan'
+class VLANEditView(ObjectEditView):
     queryset = VLAN.objects.all()
     model_form = forms.VLANForm
     template_name = 'ipam/vlan_edit.html'
     default_return_url = 'ipam:vlan_list'
 
 
-class VLANEditView(VLANCreateView):
-    permission_required = 'ipam.change_vlan'
-
-
 class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_vlan'
     queryset = VLAN.objects.all()
@@ -997,8 +958,7 @@ class ServiceView(PermissionRequiredMixin, View):
         })
 
 
-class ServiceCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'ipam.add_service'
+class ServiceEditView(ObjectEditView):
     queryset = Service.objects.all()
     model_form = forms.ServiceForm
     template_name = 'ipam/service_edit.html'
@@ -1022,10 +982,6 @@ class ServiceBulkImportView(PermissionRequiredMixin, BulkImportView):
     default_return_url = 'ipam:service_list'
 
 
-class ServiceEditView(ServiceCreateView):
-    permission_required = 'ipam.change_service'
-
-
 class ServiceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'ipam.delete_service'
     queryset = Service.objects.all()
diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py
index a19ec6ae0..ac75a7ed4 100644
--- a/netbox/secrets/urls.py
+++ b/netbox/secrets/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
 
     # Secret roles
     path('secret-roles/', views.SecretRoleListView.as_view(), name='secretrole_list'),
-    path('secret-roles/add/', views.SecretRoleCreateView.as_view(), name='secretrole_add'),
+    path('secret-roles/add/', views.SecretRoleEditView.as_view(), name='secretrole_add'),
     path('secret-roles/import/', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'),
     path('secret-roles/delete/', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'),
     path('secret-roles/<slug:slug>/edit/', views.SecretRoleEditView.as_view(), name='secretrole_edit'),
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index eda845375..be0c87cee 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -35,17 +35,12 @@ class SecretRoleListView(ObjectListView):
     table = tables.SecretRoleTable
 
 
-class SecretRoleCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'secrets.add_secretrole'
+class SecretRoleEditView(ObjectEditView):
     queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleForm
     default_return_url = 'secrets:secretrole_list'
 
 
-class SecretRoleEditView(SecretRoleCreateView):
-    permission_required = 'secrets.change_secretrole'
-
-
 class SecretRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'secrets.add_secretrole'
     queryset = SecretRole.objects.all()
diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py
index 0218a5674..4c65ce4e8 100644
--- a/netbox/tenancy/urls.py
+++ b/netbox/tenancy/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
 
     # Tenant groups
     path('tenant-groups/', views.TenantGroupListView.as_view(), name='tenantgroup_list'),
-    path('tenant-groups/add/', views.TenantGroupCreateView.as_view(), name='tenantgroup_add'),
+    path('tenant-groups/add/', views.TenantGroupEditView.as_view(), name='tenantgroup_add'),
     path('tenant-groups/import/', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'),
     path('tenant-groups/delete/', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'),
     path('tenant-groups/<slug:slug>/edit/', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'),
@@ -17,7 +17,7 @@ urlpatterns = [
 
     # Tenants
     path('tenants/', views.TenantListView.as_view(), name='tenant_list'),
-    path('tenants/add/', views.TenantCreateView.as_view(), name='tenant_add'),
+    path('tenants/add/', views.TenantEditView.as_view(), name='tenant_add'),
     path('tenants/import/', views.TenantBulkImportView.as_view(), name='tenant_import'),
     path('tenants/edit/', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'),
     path('tenants/delete/', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'),
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index b4e37d153..4dbc99815 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -29,17 +29,12 @@ class TenantGroupListView(ObjectListView):
     table = tables.TenantGroupTable
 
 
-class TenantGroupCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'tenancy.add_tenantgroup'
+class TenantGroupEditView(ObjectEditView):
     queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupForm
     default_return_url = 'tenancy:tenantgroup_list'
 
 
-class TenantGroupEditView(TenantGroupCreateView):
-    permission_required = 'tenancy.change_tenantgroup'
-
-
 class TenantGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'tenancy.add_tenantgroup'
     queryset = TenantGroup.objects.all()
@@ -92,18 +87,13 @@ class TenantView(PermissionRequiredMixin, View):
         })
 
 
-class TenantCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'tenancy.add_tenant'
+class TenantEditView(ObjectEditView):
     queryset = Tenant.objects.all()
     model_form = forms.TenantForm
     template_name = 'tenancy/tenant_edit.html'
     default_return_url = 'tenancy:tenant_list'
 
 
-class TenantEditView(TenantCreateView):
-    permission_required = 'tenancy.change_tenant'
-
-
 class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'tenancy.delete_tenant'
     queryset = Tenant.objects.all()
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 8b4efeb5a..127e0daeb 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -278,7 +278,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
         return {}
 
 
-class ObjectEditView(GetReturnURLMixin, View):
+class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Create or edit a single object.
 
@@ -290,6 +290,12 @@ class ObjectEditView(GetReturnURLMixin, View):
     model_form = None
     template_name = 'utilities/obj_edit.html'
 
+    def get_required_permission(self):
+        # Determine required permission based on whether we are editing an existing object
+        if self.obj.pk is None:
+            return get_permission_for_model(self.queryset.model, 'add')
+        return get_permission_for_model(self.queryset.model, 'change')
+
     def get_object(self, kwargs):
         # Look up an existing object by slug or PK, if provided.
         if 'slug' in kwargs:
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 557f8a9ca..38ad1a8b1 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path
 
 from extras.views import ObjectChangeLogView
-from ipam.views import ServiceCreateView
+from ipam.views import ServiceEditView
 from . import views
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
 
@@ -10,7 +10,7 @@ urlpatterns = [
 
     # Cluster types
     path('cluster-types/', views.ClusterTypeListView.as_view(), name='clustertype_list'),
-    path('cluster-types/add/', views.ClusterTypeCreateView.as_view(), name='clustertype_add'),
+    path('cluster-types/add/', views.ClusterTypeEditView.as_view(), name='clustertype_add'),
     path('cluster-types/import/', views.ClusterTypeBulkImportView.as_view(), name='clustertype_import'),
     path('cluster-types/delete/', views.ClusterTypeBulkDeleteView.as_view(), name='clustertype_bulk_delete'),
     path('cluster-types/<slug:slug>/edit/', views.ClusterTypeEditView.as_view(), name='clustertype_edit'),
@@ -18,7 +18,7 @@ urlpatterns = [
 
     # Cluster groups
     path('cluster-groups/', views.ClusterGroupListView.as_view(), name='clustergroup_list'),
-    path('cluster-groups/add/', views.ClusterGroupCreateView.as_view(), name='clustergroup_add'),
+    path('cluster-groups/add/', views.ClusterGroupEditView.as_view(), name='clustergroup_add'),
     path('cluster-groups/import/', views.ClusterGroupBulkImportView.as_view(), name='clustergroup_import'),
     path('cluster-groups/delete/', views.ClusterGroupBulkDeleteView.as_view(), name='clustergroup_bulk_delete'),
     path('cluster-groups/<slug:slug>/edit/', views.ClusterGroupEditView.as_view(), name='clustergroup_edit'),
@@ -26,7 +26,7 @@ urlpatterns = [
 
     # Clusters
     path('clusters/', views.ClusterListView.as_view(), name='cluster_list'),
-    path('clusters/add/', views.ClusterCreateView.as_view(), name='cluster_add'),
+    path('clusters/add/', views.ClusterEditView.as_view(), name='cluster_add'),
     path('clusters/import/', views.ClusterBulkImportView.as_view(), name='cluster_import'),
     path('clusters/edit/', views.ClusterBulkEditView.as_view(), name='cluster_bulk_edit'),
     path('clusters/delete/', views.ClusterBulkDeleteView.as_view(), name='cluster_bulk_delete'),
@@ -39,7 +39,7 @@ urlpatterns = [
 
     # Virtual machines
     path('virtual-machines/', views.VirtualMachineListView.as_view(), name='virtualmachine_list'),
-    path('virtual-machines/add/', views.VirtualMachineCreateView.as_view(), name='virtualmachine_add'),
+    path('virtual-machines/add/', views.VirtualMachineEditView.as_view(), name='virtualmachine_add'),
     path('virtual-machines/import/', views.VirtualMachineBulkImportView.as_view(), name='virtualmachine_import'),
     path('virtual-machines/edit/', views.VirtualMachineBulkEditView.as_view(), name='virtualmachine_bulk_edit'),
     path('virtual-machines/delete/', views.VirtualMachineBulkDeleteView.as_view(), name='virtualmachine_bulk_delete'),
@@ -48,7 +48,7 @@ urlpatterns = [
     path('virtual-machines/<int:pk>/delete/', views.VirtualMachineDeleteView.as_view(), name='virtualmachine_delete'),
     path('virtual-machines/<int:pk>/config-context/', views.VirtualMachineConfigContextView.as_view(), name='virtualmachine_configcontext'),
     path('virtual-machines/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='virtualmachine_changelog', kwargs={'model': VirtualMachine}),
-    path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceCreateView.as_view(), name='virtualmachine_service_assign'),
+    path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
 
     # VM interfaces
     path('interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 85dbf4774..11090def8 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -27,17 +27,12 @@ class ClusterTypeListView(ObjectListView):
     table = tables.ClusterTypeTable
 
 
-class ClusterTypeCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'virtualization.add_clustertype'
+class ClusterTypeEditView(ObjectEditView):
     queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeForm
     default_return_url = 'virtualization:clustertype_list'
 
 
-class ClusterTypeEditView(ClusterTypeCreateView):
-    permission_required = 'virtualization.change_clustertype'
-
-
 class ClusterTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_clustertype'
     queryset = ClusterType.objects.all()
@@ -62,17 +57,12 @@ class ClusterGroupListView(ObjectListView):
     table = tables.ClusterGroupTable
 
 
-class ClusterGroupCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'virtualization.add_clustergroup'
+class ClusterGroupEditView(ObjectEditView):
     queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupForm
     default_return_url = 'virtualization:clustergroup_list'
 
 
-class ClusterGroupEditView(ClusterGroupCreateView):
-    permission_required = 'virtualization.change_clustergroup'
-
-
 class ClusterGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
     permission_required = 'virtualization.add_clustergroup'
     queryset = ClusterGroup.objects.all()
@@ -118,17 +108,12 @@ class ClusterView(PermissionRequiredMixin, View):
         })
 
 
-class ClusterCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'virtualization.add_cluster'
+class ClusterEditView(ObjectEditView):
     template_name = 'virtualization/cluster_edit.html'
     queryset = Cluster.objects.all()
     model_form = forms.ClusterForm
 
 
-class ClusterEditView(ClusterCreateView):
-    permission_required = 'virtualization.change_cluster'
-
-
 class ClusterDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'virtualization.delete_cluster'
     queryset = Cluster.objects.all()
@@ -278,18 +263,13 @@ class VirtualMachineConfigContextView(PermissionRequiredMixin, ObjectConfigConte
     base_template = 'virtualization/virtualmachine.html'
 
 
-class VirtualMachineCreateView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'virtualization.add_virtualmachine'
+class VirtualMachineEditView(ObjectEditView):
     queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineForm
     template_name = 'virtualization/virtualmachine_edit.html'
     default_return_url = 'virtualization:virtualmachine_list'
 
 
-class VirtualMachineEditView(VirtualMachineCreateView):
-    permission_required = 'virtualization.change_virtualmachine'
-
-
 class VirtualMachineDeleteView(PermissionRequiredMixin, ObjectDeleteView):
     permission_required = 'virtualization.delete_virtualmachine'
     queryset = VirtualMachine.objects.all()
@@ -333,8 +313,7 @@ class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'virtualization/virtualmachine_component_add.html'
 
 
-class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
-    permission_required = 'dcim.change_interface'
+class InterfaceEditView(ObjectEditView):
     queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     template_name = 'virtualization/interface_edit.html'

From 5381c4e0aeae0ede246d28f795ebea843d1b209b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 14:26:56 -0400
Subject: [PATCH 025/505] Tweak evaluation of required permission for
 ObjectEditView

---
 netbox/utilities/views.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 127e0daeb..9815018b7 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -291,10 +291,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name = 'utilities/obj_edit.html'
 
     def get_required_permission(self):
-        # Determine required permission based on whether we are editing an existing object
-        if self.obj.pk is None:
-            return get_permission_for_model(self.queryset.model, 'add')
-        return get_permission_for_model(self.queryset.model, 'change')
+        # self._permission_action is set by dispatch() to either "add" or "change" depending on whether
+        # we are modifying an existing object or creating a new one.
+        return get_permission_for_model(self.queryset.model, self._permission_action)
 
     def get_object(self, kwargs):
         # Look up an existing object by slug or PK, if provided.
@@ -311,25 +310,32 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         return obj
 
     def dispatch(self, request, *args, **kwargs):
-        self.obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
+        # Determine required permission based on whether we are editing an existing object
+        self._permission_action = 'change' if kwargs else 'add'
 
         return super().dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
+        obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
+
         # Parse initial data manually to avoid setting field values as lists
         initial_data = {k: request.GET[k] for k in request.GET}
-        form = self.model_form(instance=self.obj, initial=initial_data)
+        form = self.model_form(instance=obj, initial=initial_data)
 
         return render(request, self.template_name, {
-            'obj': self.obj,
+            'obj': obj,
             'obj_type': self.queryset.model._meta.verbose_name,
             'form': form,
-            'return_url': self.get_return_url(request, self.obj),
+            'return_url': self.get_return_url(request, obj),
         })
 
     def post(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.views.ObjectEditView')
-        form = self.model_form(request.POST, request.FILES, instance=self.obj)
+        form = self.model_form(
+            data=request.POST,
+            files=request.FILES,
+            instance=self.alter_obj(self.get_object(kwargs), request, args, kwargs)
+        )
 
         if form.is_valid():
             logger.debug("Form validation was successful")
@@ -376,10 +382,10 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             logger.debug("Form validation failed")
 
         return render(request, self.template_name, {
-            'obj': self.obj,
+            'obj': obj,
             'obj_type': self.queryset.model._meta.verbose_name,
             'form': form,
-            'return_url': self.get_return_url(request, self.obj),
+            'return_url': self.get_return_url(request, obj),
         })
 
 

From 2b32430a1070b3bf0bddddc7c30e0dc20b3573be Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 14:34:40 -0400
Subject: [PATCH 026/505] Transition ObjectDeleteView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/views.py       | 11 ++---
 netbox/dcim/views.py           | 78 ++++++++++++----------------------
 netbox/extras/views.py         |  9 ++--
 netbox/ipam/views.py           | 18 +++-----
 netbox/secrets/views.py        |  3 +-
 netbox/tenancy/views.py        |  3 +-
 netbox/utilities/views.py      | 15 ++++---
 netbox/virtualization/views.py |  9 ++--
 8 files changed, 53 insertions(+), 93 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 59cdac930..7016a5b9d 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -3,7 +3,7 @@ from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
-from django.db.models import Count, OuterRef, Subquery
+from django.db.models import Count, OuterRef
 from django.shortcuts import get_object_or_404, redirect, render
 from django.views.generic import View
 from django_tables2 import RequestConfig
@@ -66,8 +66,7 @@ class ProviderEditView(ObjectEditView):
     default_return_url = 'circuits:provider_list'
 
 
-class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'circuits.delete_provider'
+class ProviderDeleteView(ObjectDeleteView):
     queryset = Provider.objects.all()
     default_return_url = 'circuits:provider_list'
 
@@ -172,8 +171,7 @@ class CircuitEditView(ObjectEditView):
     default_return_url = 'circuits:circuit_list'
 
 
-class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'circuits.delete_circuit'
+class CircuitDeleteView(ObjectDeleteView):
     queryset = Circuit.objects.all()
     default_return_url = 'circuits:circuit_list'
 
@@ -270,6 +268,5 @@ class CircuitTerminationEditView(ObjectEditView):
         return obj.circuit.get_absolute_url()
 
 
-class CircuitTerminationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'circuits.delete_circuittermination'
+class CircuitTerminationDeleteView(ObjectDeleteView):
     queryset = CircuitTermination.objects.all()
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index e33f3bd04..d61d0f82f 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -220,8 +220,7 @@ class SiteEditView(ObjectEditView):
     default_return_url = 'dcim:site_list'
 
 
-class SiteDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_site'
+class SiteDeleteView(ObjectDeleteView):
     queryset = Site.objects.all()
     default_return_url = 'dcim:site_list'
 
@@ -411,8 +410,7 @@ class RackEditView(ObjectEditView):
     default_return_url = 'dcim:rack_list'
 
 
-class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_rack'
+class RackDeleteView(ObjectDeleteView):
     queryset = Rack.objects.all()
     default_return_url = 'dcim:rack_list'
 
@@ -480,8 +478,7 @@ class RackReservationEditView(ObjectEditView):
         return obj
 
 
-class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_rackreservation'
+class RackReservationDeleteView(ObjectDeleteView):
     queryset = RackReservation.objects.all()
     default_return_url = 'dcim:rackreservation_list'
 
@@ -636,8 +633,7 @@ class DeviceTypeEditView(ObjectEditView):
     default_return_url = 'dcim:devicetype_list'
 
 
-class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_devicetype'
+class DeviceTypeDeleteView(ObjectDeleteView):
     queryset = DeviceType.objects.all()
     default_return_url = 'dcim:devicetype_list'
 
@@ -703,8 +699,7 @@ class ConsolePortTemplateEditView(ObjectEditView):
     model_form = forms.ConsolePortTemplateForm
 
 
-class ConsolePortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_consoleporttemplate'
+class ConsolePortTemplateDeleteView(ObjectDeleteView):
     queryset = ConsolePortTemplate.objects.all()
 
 
@@ -738,8 +733,7 @@ class ConsoleServerPortTemplateEditView(ObjectEditView):
     model_form = forms.ConsoleServerPortTemplateForm
 
 
-class ConsoleServerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_consoleserverporttemplate'
+class ConsoleServerPortTemplateDeleteView(ObjectDeleteView):
     queryset = ConsoleServerPortTemplate.objects.all()
 
 
@@ -773,8 +767,7 @@ class PowerPortTemplateEditView(ObjectEditView):
     model_form = forms.PowerPortTemplateForm
 
 
-class PowerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_powerporttemplate'
+class PowerPortTemplateDeleteView(ObjectDeleteView):
     queryset = PowerPortTemplate.objects.all()
 
 
@@ -808,8 +801,7 @@ class PowerOutletTemplateEditView(ObjectEditView):
     model_form = forms.PowerOutletTemplateForm
 
 
-class PowerOutletTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_poweroutlettemplate'
+class PowerOutletTemplateDeleteView(ObjectDeleteView):
     queryset = PowerOutletTemplate.objects.all()
 
 
@@ -843,8 +835,7 @@ class InterfaceTemplateEditView(ObjectEditView):
     model_form = forms.InterfaceTemplateForm
 
 
-class InterfaceTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_interfacetemplate'
+class InterfaceTemplateDeleteView(ObjectDeleteView):
     queryset = InterfaceTemplate.objects.all()
 
 
@@ -878,8 +869,7 @@ class FrontPortTemplateEditView(ObjectEditView):
     model_form = forms.FrontPortTemplateForm
 
 
-class FrontPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_frontporttemplate'
+class FrontPortTemplateDeleteView(ObjectDeleteView):
     queryset = FrontPortTemplate.objects.all()
 
 
@@ -913,8 +903,7 @@ class RearPortTemplateEditView(ObjectEditView):
     model_form = forms.RearPortTemplateForm
 
 
-class RearPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_rearporttemplate'
+class RearPortTemplateDeleteView(ObjectDeleteView):
     queryset = RearPortTemplate.objects.all()
 
 
@@ -948,8 +937,7 @@ class DeviceBayTemplateEditView(ObjectEditView):
     model_form = forms.DeviceBayTemplateForm
 
 
-class DeviceBayTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_devicebaytemplate'
+class DeviceBayTemplateDeleteView(ObjectDeleteView):
     queryset = DeviceBayTemplate.objects.all()
 
 
@@ -1193,8 +1181,7 @@ class DeviceEditView(ObjectEditView):
     default_return_url = 'dcim:device_list'
 
 
-class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_device'
+class DeviceDeleteView(ObjectDeleteView):
     queryset = Device.objects.all()
     default_return_url = 'dcim:device_list'
 
@@ -1270,8 +1257,7 @@ class ConsolePortEditView(ObjectEditView):
     model_form = forms.ConsolePortForm
 
 
-class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_consoleport'
+class ConsolePortDeleteView(ObjectDeleteView):
     queryset = ConsolePort.objects.all()
 
 
@@ -1324,8 +1310,7 @@ class ConsoleServerPortEditView(ObjectEditView):
     model_form = forms.ConsoleServerPortForm
 
 
-class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_consoleserverport'
+class ConsoleServerPortDeleteView(ObjectDeleteView):
     queryset = ConsoleServerPort.objects.all()
 
 
@@ -1390,8 +1375,7 @@ class PowerPortEditView(ObjectEditView):
     model_form = forms.PowerPortForm
 
 
-class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_powerport'
+class PowerPortDeleteView(ObjectDeleteView):
     queryset = PowerPort.objects.all()
 
 
@@ -1444,8 +1428,7 @@ class PowerOutletEditView(ObjectEditView):
     model_form = forms.PowerOutletForm
 
 
-class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_poweroutlet'
+class PowerOutletDeleteView(ObjectDeleteView):
     queryset = PowerOutlet.objects.all()
 
 
@@ -1547,8 +1530,7 @@ class InterfaceEditView(ObjectEditView):
     template_name = 'dcim/interface_edit.html'
 
 
-class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_interface'
+class InterfaceDeleteView(ObjectDeleteView):
     queryset = Interface.objects.all()
 
 
@@ -1613,8 +1595,7 @@ class FrontPortEditView(ObjectEditView):
     model_form = forms.FrontPortForm
 
 
-class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_frontport'
+class FrontPortDeleteView(ObjectDeleteView):
     queryset = FrontPort.objects.all()
 
 
@@ -1679,8 +1660,7 @@ class RearPortEditView(ObjectEditView):
     model_form = forms.RearPortForm
 
 
-class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_rearport'
+class RearPortDeleteView(ObjectDeleteView):
     queryset = RearPort.objects.all()
 
 
@@ -1747,8 +1727,7 @@ class DeviceBayEditView(ObjectEditView):
     model_form = forms.DeviceBayForm
 
 
-class DeviceBayDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_devicebay'
+class DeviceBayDeleteView(ObjectDeleteView):
     queryset = DeviceBay.objects.all()
 
 
@@ -2088,8 +2067,7 @@ class CableEditView(ObjectEditView):
     default_return_url = 'dcim:cable_list'
 
 
-class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_cable'
+class CableDeleteView(ObjectDeleteView):
     queryset = Cable.objects.all()
     default_return_url = 'dcim:cable_list'
 
@@ -2247,8 +2225,7 @@ class InventoryItemCreateView(PermissionRequiredMixin, ComponentCreateView):
     template_name = 'dcim/device_component_add.html'
 
 
-class InventoryItemDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_inventoryitem'
+class InventoryItemDeleteView(ObjectDeleteView):
     queryset = InventoryItem.objects.all()
 
 
@@ -2420,8 +2397,7 @@ class VirtualChassisEditView(PermissionRequiredMixin, GetReturnURLMixin, View):
         })
 
 
-class VirtualChassisDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_virtualchassis'
+class VirtualChassisDeleteView(ObjectDeleteView):
     queryset = VirtualChassis.objects.all()
     default_return_url = 'dcim:device_list'
 
@@ -2583,8 +2559,7 @@ class PowerPanelEditView(ObjectEditView):
     default_return_url = 'dcim:powerpanel_list'
 
 
-class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_powerpanel'
+class PowerPanelDeleteView(ObjectDeleteView):
     queryset = PowerPanel.objects.all()
     default_return_url = 'dcim:powerpanel_list'
 
@@ -2650,8 +2625,7 @@ class PowerFeedEditView(ObjectEditView):
     default_return_url = 'dcim:powerfeed_list'
 
 
-class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_powerfeed'
+class PowerFeedDeleteView(ObjectDeleteView):
     queryset = PowerFeed.objects.all()
     default_return_url = 'dcim:powerfeed_list'
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index b5d9306f8..63764b683 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -71,8 +71,7 @@ class TagEditView(ObjectEditView):
     template_name = 'extras/tag_edit.html'
 
 
-class TagDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'extras.delete_tag'
+class TagDeleteView(ObjectDeleteView):
     queryset = Tag.objects.all()
     default_return_url = 'extras:tag_list'
 
@@ -147,8 +146,7 @@ class ConfigContextBulkEditView(PermissionRequiredMixin, BulkEditView):
     default_return_url = 'extras:configcontext_list'
 
 
-class ConfigContextDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'extras.delete_configcontext'
+class ConfigContextDeleteView(ObjectDeleteView):
     queryset = ConfigContext.objects.all()
     default_return_url = 'extras:configcontext_list'
 
@@ -310,8 +308,7 @@ class ImageAttachmentEditView(ObjectEditView):
         return imageattachment.parent.get_absolute_url()
 
 
-class ImageAttachmentDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'extras.delete_imageattachment'
+class ImageAttachmentDeleteView(ObjectDeleteView):
     queryset = ImageAttachment.objects.all()
 
     def get_return_url(self, request, imageattachment):
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 220205c19..176321982 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -141,8 +141,7 @@ class VRFEditView(ObjectEditView):
     default_return_url = 'ipam:vrf_list'
 
 
-class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_vrf'
+class VRFDeleteView(ObjectDeleteView):
     queryset = VRF.objects.all()
     default_return_url = 'ipam:vrf_list'
 
@@ -356,8 +355,7 @@ class AggregateEditView(ObjectEditView):
     default_return_url = 'ipam:aggregate_list'
 
 
-class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_aggregate'
+class AggregateDeleteView(ObjectDeleteView):
     queryset = Aggregate.objects.all()
     default_return_url = 'ipam:aggregate_list'
 
@@ -572,8 +570,7 @@ class PrefixEditView(ObjectEditView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixDeleteView(ObjectPermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_prefix'
+class PrefixDeleteView(ObjectDeleteView):
     queryset = Prefix.objects.all()
     template_name = 'ipam/prefix_delete.html'
     default_return_url = 'ipam:prefix_list'
@@ -733,8 +730,7 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
         })
 
 
-class IPAddressDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_ipaddress'
+class IPAddressDeleteView(ObjectDeleteView):
     queryset = IPAddress.objects.all()
     default_return_url = 'ipam:ipaddress_list'
 
@@ -903,8 +899,7 @@ class VLANEditView(ObjectEditView):
     default_return_url = 'ipam:vlan_list'
 
 
-class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_vlan'
+class VLANDeleteView(ObjectDeleteView):
     queryset = VLAN.objects.all()
     default_return_url = 'ipam:vlan_list'
 
@@ -982,8 +977,7 @@ class ServiceBulkImportView(PermissionRequiredMixin, BulkImportView):
     default_return_url = 'ipam:service_list'
 
 
-class ServiceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'ipam.delete_service'
+class ServiceDeleteView(ObjectDeleteView):
     queryset = Service.objects.all()
 
 
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index be0c87cee..7c69d0ac4 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -183,8 +183,7 @@ def secret_edit(request, pk):
     })
 
 
-class SecretDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'secrets.delete_secret'
+class SecretDeleteView(ObjectDeleteView):
     queryset = Secret.objects.all()
     default_return_url = 'secrets:secret_list'
 
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 4dbc99815..97480bb6a 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -94,8 +94,7 @@ class TenantEditView(ObjectEditView):
     default_return_url = 'tenancy:tenant_list'
 
 
-class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'tenancy.delete_tenant'
+class TenantDeleteView(ObjectDeleteView):
     queryset = Tenant.objects.all()
     default_return_url = 'tenancy:tenant_list'
 
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 9815018b7..f4267748f 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -282,9 +282,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Create or edit a single object.
 
-    queryset: The base queryset for the object being modified
-    model_form: The form used to create or edit the object
-    template_name: The name of the template
+    :param queryset: The base queryset for the object being modified
+    :param model_form: The form used to create or edit the object
+    :param template_name: The name of the template
     """
     queryset = None
     model_form = None
@@ -389,16 +389,19 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class ObjectDeleteView(GetReturnURLMixin, View):
+class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Delete a single object.
 
-    queryset: The base queryset for the object being deleted
-    template_name: The name of the template
+    :param queryset: The base queryset for the object being deleted
+    :param template_name: The name of the template
     """
     queryset = None
     template_name = 'utilities/obj_delete.html'
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'delete')
+
     def get_object(self, kwargs):
         # Look up object by slug if one has been provided. Otherwise, use PK.
         if 'slug' in kwargs:
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 11090def8..8bc3876ca 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -114,8 +114,7 @@ class ClusterEditView(ObjectEditView):
     model_form = forms.ClusterForm
 
 
-class ClusterDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'virtualization.delete_cluster'
+class ClusterDeleteView(ObjectDeleteView):
     queryset = Cluster.objects.all()
     default_return_url = 'virtualization:cluster_list'
 
@@ -270,8 +269,7 @@ class VirtualMachineEditView(ObjectEditView):
     default_return_url = 'virtualization:virtualmachine_list'
 
 
-class VirtualMachineDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'virtualization.delete_virtualmachine'
+class VirtualMachineDeleteView(ObjectDeleteView):
     queryset = VirtualMachine.objects.all()
     default_return_url = 'virtualization:virtualmachine_list'
 
@@ -319,8 +317,7 @@ class InterfaceEditView(ObjectEditView):
     template_name = 'virtualization/interface_edit.html'
 
 
-class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
-    permission_required = 'dcim.delete_interface'
+class InterfaceDeleteView(ObjectDeleteView):
     queryset = Interface.objects.all()
 
 

From 5e5038d7808870347dc07c22c3ab693368fcf783 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 14:43:27 -0400
Subject: [PATCH 027/505] Transition BulkImportView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/views.py       |  9 ++---
 netbox/dcim/views.py           | 69 ++++++++++++----------------------
 netbox/ipam/views.py           | 27 +++++--------
 netbox/secrets/views.py        |  4 +-
 netbox/tenancy/views.py        |  6 +--
 netbox/utilities/views.py      |  5 ++-
 netbox/virtualization/views.py | 12 ++----
 7 files changed, 46 insertions(+), 86 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 7016a5b9d..7ee6a7dc1 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -71,8 +71,7 @@ class ProviderDeleteView(ObjectDeleteView):
     default_return_url = 'circuits:provider_list'
 
 
-class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'circuits.add_provider'
+class ProviderBulkImportView(BulkImportView):
     queryset = Provider.objects.all()
     model_form = forms.ProviderCSVForm
     table = tables.ProviderTable
@@ -111,8 +110,7 @@ class CircuitTypeEditView(ObjectEditView):
     default_return_url = 'circuits:circuittype_list'
 
 
-class CircuitTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'circuits.add_circuittype'
+class CircuitTypeBulkImportView(BulkImportView):
     queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeCSVForm
     table = tables.CircuitTypeTable
@@ -176,8 +174,7 @@ class CircuitDeleteView(ObjectDeleteView):
     default_return_url = 'circuits:circuit_list'
 
 
-class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'circuits.add_circuit'
+class CircuitBulkImportView(BulkImportView):
     queryset = Circuit.objects.all()
     model_form = forms.CircuitCSVForm
     table = tables.CircuitTable
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d61d0f82f..d1882359d 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -160,8 +160,7 @@ class RegionEditView(ObjectEditView):
     default_return_url = 'dcim:region_list'
 
 
-class RegionBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_region'
+class RegionBulkImportView(BulkImportView):
     queryset = Region.objects.all()
     model_form = forms.RegionCSVForm
     table = tables.RegionTable
@@ -225,8 +224,7 @@ class SiteDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:site_list'
 
 
-class SiteBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_site'
+class SiteBulkImportView(BulkImportView):
     queryset = Site.objects.all()
     model_form = forms.SiteCSVForm
     table = tables.SiteTable
@@ -273,8 +271,7 @@ class RackGroupEditView(ObjectEditView):
     default_return_url = 'dcim:rackgroup_list'
 
 
-class RackGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rackgroup'
+class RackGroupBulkImportView(BulkImportView):
     queryset = RackGroup.objects.all()
     model_form = forms.RackGroupCSVForm
     table = tables.RackGroupTable
@@ -304,8 +301,7 @@ class RackRoleEditView(ObjectEditView):
     default_return_url = 'dcim:rackrole_list'
 
 
-class RackRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rackrole'
+class RackRoleBulkImportView(BulkImportView):
     queryset = RackRole.objects.all()
     model_form = forms.RackRoleCSVForm
     table = tables.RackRoleTable
@@ -415,8 +411,7 @@ class RackDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:rack_list'
 
 
-class RackBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rack'
+class RackBulkImportView(BulkImportView):
     queryset = Rack.objects.all()
     model_form = forms.RackCSVForm
     table = tables.RackTable
@@ -483,8 +478,7 @@ class RackReservationDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:rackreservation_list'
 
 
-class RackReservationImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rackreservation'
+class RackReservationImportView(BulkImportView):
     queryset = RackReservation.objects.all()
     model_form = forms.RackReservationCSVForm
     table = tables.RackReservationTable
@@ -537,8 +531,7 @@ class ManufacturerEditView(ObjectEditView):
     default_return_url = 'dcim:manufacturer_list'
 
 
-class ManufacturerBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_manufacturer'
+class ManufacturerBulkImportView(BulkImportView):
     queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerCSVForm
     table = tables.ManufacturerTable
@@ -969,8 +962,7 @@ class DeviceRoleEditView(ObjectEditView):
     default_return_url = 'dcim:devicerole_list'
 
 
-class DeviceRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_devicerole'
+class DeviceRoleBulkImportView(BulkImportView):
     queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleCSVForm
     table = tables.DeviceRoleTable
@@ -999,8 +991,7 @@ class PlatformEditView(ObjectEditView):
     default_return_url = 'dcim:platform_list'
 
 
-class PlatformBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_platform'
+class PlatformBulkImportView(BulkImportView):
     queryset = Platform.objects.all()
     model_form = forms.PlatformCSVForm
     table = tables.PlatformTable
@@ -1186,8 +1177,7 @@ class DeviceDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_device'
+class DeviceBulkImportView(BulkImportView):
     queryset = Device.objects.all()
     model_form = forms.DeviceCSVForm
     table = tables.DeviceImportTable
@@ -1195,8 +1185,7 @@ class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
     default_return_url = 'dcim:device_list'
 
 
-class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_device'
+class ChildDeviceBulkImportView(BulkImportView):
     queryset = Device.objects.all()
     model_form = forms.ChildDeviceCSVForm
     table = tables.DeviceImportTable
@@ -1261,8 +1250,7 @@ class ConsolePortDeleteView(ObjectDeleteView):
     queryset = ConsolePort.objects.all()
 
 
-class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_consoleport'
+class ConsolePortBulkImportView(BulkImportView):
     queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortCSVForm
     table = tables.ConsolePortImportTable
@@ -1314,8 +1302,7 @@ class ConsoleServerPortDeleteView(ObjectDeleteView):
     queryset = ConsoleServerPort.objects.all()
 
 
-class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_consoleserverport'
+class ConsoleServerPortBulkImportView(BulkImportView):
     queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortCSVForm
     table = tables.ConsoleServerPortImportTable
@@ -1379,8 +1366,7 @@ class PowerPortDeleteView(ObjectDeleteView):
     queryset = PowerPort.objects.all()
 
 
-class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_powerport'
+class PowerPortBulkImportView(BulkImportView):
     queryset = PowerPort.objects.all()
     model_form = forms.PowerPortCSVForm
     table = tables.PowerPortImportTable
@@ -1432,8 +1418,7 @@ class PowerOutletDeleteView(ObjectDeleteView):
     queryset = PowerOutlet.objects.all()
 
 
-class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_poweroutlet'
+class PowerOutletBulkImportView(BulkImportView):
     queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletCSVForm
     table = tables.PowerOutletImportTable
@@ -1534,8 +1519,7 @@ class InterfaceDeleteView(ObjectDeleteView):
     queryset = Interface.objects.all()
 
 
-class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_interface'
+class InterfaceBulkImportView(BulkImportView):
     queryset = Interface.objects.all()
     model_form = forms.InterfaceCSVForm
     table = tables.InterfaceImportTable
@@ -1599,8 +1583,7 @@ class FrontPortDeleteView(ObjectDeleteView):
     queryset = FrontPort.objects.all()
 
 
-class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_frontport'
+class FrontPortBulkImportView(BulkImportView):
     queryset = FrontPort.objects.all()
     model_form = forms.FrontPortCSVForm
     table = tables.FrontPortImportTable
@@ -1664,8 +1647,7 @@ class RearPortDeleteView(ObjectDeleteView):
     queryset = RearPort.objects.all()
 
 
-class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_rearport'
+class RearPortBulkImportView(BulkImportView):
     queryset = RearPort.objects.all()
     model_form = forms.RearPortCSVForm
     table = tables.RearPortImportTable
@@ -1800,8 +1782,7 @@ class DeviceBayDepopulateView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceBayBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_devicebay'
+class DeviceBayBulkImportView(BulkImportView):
     queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayCSVForm
     table = tables.DeviceBayImportTable
@@ -2072,8 +2053,7 @@ class CableDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:cable_list'
 
 
-class CableBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_cable'
+class CableBulkImportView(BulkImportView):
     queryset = Cable.objects.all()
     model_form = forms.CableCSVForm
     table = tables.CableTable
@@ -2229,8 +2209,7 @@ class InventoryItemDeleteView(ObjectDeleteView):
     queryset = InventoryItem.objects.all()
 
 
-class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_inventoryitem'
+class InventoryItemBulkImportView(BulkImportView):
     queryset = InventoryItem.objects.all()
     model_form = forms.InventoryItemCSVForm
     table = tables.InventoryItemTable
@@ -2564,8 +2543,7 @@ class PowerPanelDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:powerpanel_list'
 
 
-class PowerPanelBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_powerpanel'
+class PowerPanelBulkImportView(BulkImportView):
     queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelCSVForm
     table = tables.PowerPanelTable
@@ -2630,8 +2608,7 @@ class PowerFeedDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:powerfeed_list'
 
 
-class PowerFeedBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'dcim.add_powerfeed'
+class PowerFeedBulkImportView(BulkImportView):
     queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedCSVForm
     table = tables.PowerFeedTable
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 176321982..dbd45b923 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -146,8 +146,7 @@ class VRFDeleteView(ObjectDeleteView):
     default_return_url = 'ipam:vrf_list'
 
 
-class VRFBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_vrf'
+class VRFBulkImportView(BulkImportView):
     queryset = VRF.objects.all()
     model_form = forms.VRFCSVForm
     table = tables.VRFTable
@@ -257,8 +256,7 @@ class RIREditView(ObjectEditView):
     default_return_url = 'ipam:rir_list'
 
 
-class RIRBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_rir'
+class RIRBulkImportView(BulkImportView):
     queryset = RIR.objects.all()
     model_form = forms.RIRCSVForm
     table = tables.RIRTable
@@ -360,8 +358,7 @@ class AggregateDeleteView(ObjectDeleteView):
     default_return_url = 'ipam:aggregate_list'
 
 
-class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_aggregate'
+class AggregateBulkImportView(BulkImportView):
     queryset = Aggregate.objects.all()
     model_form = forms.AggregateCSVForm
     table = tables.AggregateTable
@@ -400,8 +397,7 @@ class RoleEditView(ObjectEditView):
     default_return_url = 'ipam:role_list'
 
 
-class RoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_role'
+class RoleBulkImportView(BulkImportView):
     queryset = Role.objects.all()
     model_form = forms.RoleCSVForm
     table = tables.RoleTable
@@ -576,8 +572,7 @@ class PrefixDeleteView(ObjectDeleteView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkImportView(ObjectPermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_prefix'
+class PrefixBulkImportView(BulkImportView):
     queryset = Prefix.objects.all()
     model_form = forms.PrefixCSVForm
     table = tables.PrefixTable
@@ -744,8 +739,7 @@ class IPAddressBulkCreateView(PermissionRequiredMixin, BulkCreateView):
     default_return_url = 'ipam:ipaddress_list'
 
 
-class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_ipaddress'
+class IPAddressBulkImportView(BulkImportView):
     queryset = IPAddress.objects.all()
     model_form = forms.IPAddressCSVForm
     table = tables.IPAddressTable
@@ -787,8 +781,7 @@ class VLANGroupEditView(ObjectEditView):
     default_return_url = 'ipam:vlangroup_list'
 
 
-class VLANGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_vlangroup'
+class VLANGroupBulkImportView(BulkImportView):
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupCSVForm
     table = tables.VLANGroupTable
@@ -904,8 +897,7 @@ class VLANDeleteView(ObjectDeleteView):
     default_return_url = 'ipam:vlan_list'
 
 
-class VLANBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_vlan'
+class VLANBulkImportView(BulkImportView):
     queryset = VLAN.objects.all()
     model_form = forms.VLANCSVForm
     table = tables.VLANTable
@@ -969,8 +961,7 @@ class ServiceEditView(ObjectEditView):
         return service.parent.get_absolute_url()
 
 
-class ServiceBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'ipam.add_service'
+class ServiceBulkImportView(BulkImportView):
     queryset = Service.objects.all()
     model_form = forms.ServiceCSVForm
     table = tables.ServiceTable
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 7c69d0ac4..00794f684 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -41,8 +41,7 @@ class SecretRoleEditView(ObjectEditView):
     default_return_url = 'secrets:secretrole_list'
 
 
-class SecretRoleBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'secrets.add_secretrole'
+class SecretRoleBulkImportView(BulkImportView):
     queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleCSVForm
     table = tables.SecretRoleTable
@@ -189,7 +188,6 @@ class SecretDeleteView(ObjectDeleteView):
 
 
 class SecretBulkImportView(BulkImportView):
-    permission_required = 'secrets.add_secret'
     queryset = Secret.objects.all()
     model_form = forms.SecretCSVForm
     table = tables.SecretTable
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 97480bb6a..f666e606a 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -35,8 +35,7 @@ class TenantGroupEditView(ObjectEditView):
     default_return_url = 'tenancy:tenantgroup_list'
 
 
-class TenantGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'tenancy.add_tenantgroup'
+class TenantGroupBulkImportView(BulkImportView):
     queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupCSVForm
     table = tables.TenantGroupTable
@@ -99,8 +98,7 @@ class TenantDeleteView(ObjectDeleteView):
     default_return_url = 'tenancy:tenant_list'
 
 
-class TenantBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'tenancy.add_tenant'
+class TenantBulkImportView(BulkImportView):
     queryset = Tenant.objects.all()
     model_form = forms.TenantCSVForm
     table = tables.TenantTable
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index f4267748f..3d11cf25b 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -652,7 +652,7 @@ class ObjectImportView(GetReturnURLMixin, View):
         })
 
 
-class BulkImportView(GetReturnURLMixin, View):
+class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Import objects in bulk (CSV format).
 
@@ -684,6 +684,9 @@ class BulkImportView(GetReturnURLMixin, View):
         """
         return obj_form.save()
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'add')
+
     def get(self, request):
 
         return render(request, self.template_name, {
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 8bc3876ca..de4569b83 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -33,8 +33,7 @@ class ClusterTypeEditView(ObjectEditView):
     default_return_url = 'virtualization:clustertype_list'
 
 
-class ClusterTypeBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'virtualization.add_clustertype'
+class ClusterTypeBulkImportView(BulkImportView):
     queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeCSVForm
     table = tables.ClusterTypeTable
@@ -63,8 +62,7 @@ class ClusterGroupEditView(ObjectEditView):
     default_return_url = 'virtualization:clustergroup_list'
 
 
-class ClusterGroupBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'virtualization.add_clustergroup'
+class ClusterGroupBulkImportView(BulkImportView):
     queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupCSVForm
     table = tables.ClusterGroupTable
@@ -119,8 +117,7 @@ class ClusterDeleteView(ObjectDeleteView):
     default_return_url = 'virtualization:cluster_list'
 
 
-class ClusterBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'virtualization.add_cluster'
+class ClusterBulkImportView(BulkImportView):
     queryset = Cluster.objects.all()
     model_form = forms.ClusterCSVForm
     table = tables.ClusterTable
@@ -274,8 +271,7 @@ class VirtualMachineDeleteView(ObjectDeleteView):
     default_return_url = 'virtualization:virtualmachine_list'
 
 
-class VirtualMachineBulkImportView(PermissionRequiredMixin, BulkImportView):
-    permission_required = 'virtualization.add_virtualmachine'
+class VirtualMachineBulkImportView(BulkImportView):
     queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineCSVForm
     table = tables.VirtualMachineTable

From 82c247f3cf7660a24791f3e9e6505b0b18ab99b2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 15:07:20 -0400
Subject: [PATCH 028/505] Transition BulkEditView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/views.py                   |  6 +-
 netbox/dcim/views.py                       | 77 ++++++++--------------
 netbox/extras/views.py                     |  6 +-
 netbox/ipam/views.py                       | 18 ++---
 netbox/netbox/tests/test_authentication.py |  2 +-
 netbox/secrets/views.py                    |  3 +-
 netbox/tenancy/views.py                    |  3 +-
 netbox/utilities/views.py                  |  9 ++-
 netbox/virtualization/views.py             |  9 +--
 9 files changed, 48 insertions(+), 85 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 7ee6a7dc1..3dc7032e4 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -78,8 +78,7 @@ class ProviderBulkImportView(BulkImportView):
     default_return_url = 'circuits:provider_list'
 
 
-class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'circuits.change_provider'
+class ProviderBulkEditView(BulkEditView):
     queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
@@ -181,8 +180,7 @@ class CircuitBulkImportView(BulkImportView):
     default_return_url = 'circuits:circuit_list'
 
 
-class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'circuits.change_circuit'
+class CircuitBulkEditView(BulkEditView):
     queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d1882359d..8e2355a9c 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -231,8 +231,7 @@ class SiteBulkImportView(BulkImportView):
     default_return_url = 'dcim:site_list'
 
 
-class SiteBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_site'
+class SiteBulkEditView(BulkEditView):
     queryset = Site.objects.prefetch_related('region', 'tenant')
     filterset = filters.SiteFilterSet
     table = tables.SiteTable
@@ -418,8 +417,7 @@ class RackBulkImportView(BulkImportView):
     default_return_url = 'dcim:rack_list'
 
 
-class RackBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_rack'
+class RackBulkEditView(BulkEditView):
     queryset = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.RackFilterSet
     table = tables.RackTable
@@ -495,8 +493,7 @@ class RackReservationImportView(BulkImportView):
         return instance
 
 
-class RackReservationBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_rackreservation'
+class RackReservationBulkEditView(BulkEditView):
     queryset = RackReservation.objects.prefetch_related('rack', 'user')
     filterset = filters.RackReservationFilterSet
     table = tables.RackReservationTable
@@ -658,8 +655,7 @@ class DeviceTypeImportView(PermissionRequiredMixin, ObjectImportView):
     default_return_url = 'dcim:devicetype_import'
 
 
-class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_devicetype'
+class DeviceTypeBulkEditView(BulkEditView):
     queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
@@ -696,8 +692,7 @@ class ConsolePortTemplateDeleteView(ObjectDeleteView):
     queryset = ConsolePortTemplate.objects.all()
 
 
-class ConsolePortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_consoleporttemplate'
+class ConsolePortTemplateBulkEditView(BulkEditView):
     queryset = ConsolePortTemplate.objects.all()
     table = tables.ConsolePortTemplateTable
     form = forms.ConsolePortTemplateBulkEditForm
@@ -730,8 +725,7 @@ class ConsoleServerPortTemplateDeleteView(ObjectDeleteView):
     queryset = ConsoleServerPortTemplate.objects.all()
 
 
-class ConsoleServerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_consoleserverporttemplate'
+class ConsoleServerPortTemplateBulkEditView(BulkEditView):
     queryset = ConsoleServerPortTemplate.objects.all()
     table = tables.ConsoleServerPortTemplateTable
     form = forms.ConsoleServerPortTemplateBulkEditForm
@@ -764,8 +758,7 @@ class PowerPortTemplateDeleteView(ObjectDeleteView):
     queryset = PowerPortTemplate.objects.all()
 
 
-class PowerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_powerporttemplate'
+class PowerPortTemplateBulkEditView(BulkEditView):
     queryset = PowerPortTemplate.objects.all()
     table = tables.PowerPortTemplateTable
     form = forms.PowerPortTemplateBulkEditForm
@@ -798,8 +791,7 @@ class PowerOutletTemplateDeleteView(ObjectDeleteView):
     queryset = PowerOutletTemplate.objects.all()
 
 
-class PowerOutletTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_poweroutlettemplate'
+class PowerOutletTemplateBulkEditView(BulkEditView):
     queryset = PowerOutletTemplate.objects.all()
     table = tables.PowerOutletTemplateTable
     form = forms.PowerOutletTemplateBulkEditForm
@@ -832,8 +824,7 @@ class InterfaceTemplateDeleteView(ObjectDeleteView):
     queryset = InterfaceTemplate.objects.all()
 
 
-class InterfaceTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_interfacetemplate'
+class InterfaceTemplateBulkEditView(BulkEditView):
     queryset = InterfaceTemplate.objects.all()
     table = tables.InterfaceTemplateTable
     form = forms.InterfaceTemplateBulkEditForm
@@ -866,8 +857,7 @@ class FrontPortTemplateDeleteView(ObjectDeleteView):
     queryset = FrontPortTemplate.objects.all()
 
 
-class FrontPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_frontporttemplate'
+class FrontPortTemplateBulkEditView(BulkEditView):
     queryset = FrontPortTemplate.objects.all()
     table = tables.FrontPortTemplateTable
     form = forms.FrontPortTemplateBulkEditForm
@@ -900,8 +890,7 @@ class RearPortTemplateDeleteView(ObjectDeleteView):
     queryset = RearPortTemplate.objects.all()
 
 
-class RearPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_rearporttemplate'
+class RearPortTemplateBulkEditView(BulkEditView):
     queryset = RearPortTemplate.objects.all()
     table = tables.RearPortTemplateTable
     form = forms.RearPortTemplateBulkEditForm
@@ -934,7 +923,7 @@ class DeviceBayTemplateDeleteView(ObjectDeleteView):
     queryset = DeviceBayTemplate.objects.all()
 
 
-# class DeviceBayTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
+# class DeviceBayTemplateBulkEditView(BulkEditView):
 #     permission_required = 'dcim.change_devicebaytemplate'
 #     queryset = DeviceBayTemplate.objects.all()
 #     table = tables.DeviceBayTemplateTable
@@ -1204,8 +1193,7 @@ class ChildDeviceBulkImportView(BulkImportView):
         return obj
 
 
-class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_device'
+class DeviceBulkEditView(BulkEditView):
     queryset = Device.objects.prefetch_related('tenant', 'site', 'rack', 'device_role', 'device_type__manufacturer')
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
@@ -1257,8 +1245,7 @@ class ConsolePortBulkImportView(BulkImportView):
     default_return_url = 'dcim:consoleport_list'
 
 
-class ConsolePortBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_consoleport'
+class ConsolePortBulkEditView(BulkEditView):
     queryset = ConsolePort.objects.all()
     filterset = filters.ConsolePortFilterSet
     table = tables.ConsolePortTable
@@ -1309,8 +1296,7 @@ class ConsoleServerPortBulkImportView(BulkImportView):
     default_return_url = 'dcim:consoleserverport_list'
 
 
-class ConsoleServerPortBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_consoleserverport'
+class ConsoleServerPortBulkEditView(BulkEditView):
     queryset = ConsoleServerPort.objects.all()
     filterset = filters.ConsoleServerPortFilterSet
     table = tables.ConsoleServerPortTable
@@ -1373,8 +1359,7 @@ class PowerPortBulkImportView(BulkImportView):
     default_return_url = 'dcim:powerport_list'
 
 
-class PowerPortBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_powerport'
+class PowerPortBulkEditView(BulkEditView):
     queryset = PowerPort.objects.all()
     filterset = filters.PowerPortFilterSet
     table = tables.PowerPortTable
@@ -1425,8 +1410,7 @@ class PowerOutletBulkImportView(BulkImportView):
     default_return_url = 'dcim:poweroutlet_list'
 
 
-class PowerOutletBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_poweroutlet'
+class PowerOutletBulkEditView(BulkEditView):
     queryset = PowerOutlet.objects.all()
     filterset = filters.PowerOutletFilterSet
     table = tables.PowerOutletTable
@@ -1526,8 +1510,7 @@ class InterfaceBulkImportView(BulkImportView):
     default_return_url = 'dcim:interface_list'
 
 
-class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_interface'
+class InterfaceBulkEditView(BulkEditView):
     queryset = Interface.objects.all()
     filterset = filters.InterfaceFilterSet
     table = tables.InterfaceTable
@@ -1590,8 +1573,7 @@ class FrontPortBulkImportView(BulkImportView):
     default_return_url = 'dcim:frontport_list'
 
 
-class FrontPortBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_frontport'
+class FrontPortBulkEditView(BulkEditView):
     queryset = FrontPort.objects.all()
     filterset = filters.FrontPortFilterSet
     table = tables.FrontPortTable
@@ -1654,8 +1636,7 @@ class RearPortBulkImportView(BulkImportView):
     default_return_url = 'dcim:rearport_list'
 
 
-class RearPortBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_rearport'
+class RearPortBulkEditView(BulkEditView):
     queryset = RearPort.objects.all()
     filterset = filters.RearPortFilterSet
     table = tables.RearPortTable
@@ -1789,8 +1770,7 @@ class DeviceBayBulkImportView(BulkImportView):
     default_return_url = 'dcim:devicebay_list'
 
 
-class DeviceBayBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_devicebay'
+class DeviceBayBulkEditView(BulkEditView):
     queryset = DeviceBay.objects.all()
     filterset = filters.DeviceBayFilterSet
     table = tables.DeviceBayTable
@@ -2060,8 +2040,7 @@ class CableBulkImportView(BulkImportView):
     default_return_url = 'dcim:cable_list'
 
 
-class CableBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_cable'
+class CableBulkEditView(BulkEditView):
     queryset = Cable.objects.prefetch_related('termination_a', 'termination_b')
     filterset = filters.CableFilterSet
     table = tables.CableTable
@@ -2216,8 +2195,7 @@ class InventoryItemBulkImportView(BulkImportView):
     default_return_url = 'dcim:inventoryitem_list'
 
 
-class InventoryItemBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_inventoryitem'
+class InventoryItemBulkEditView(BulkEditView):
     queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
     filterset = filters.InventoryItemFilterSet
     table = tables.InventoryItemTable
@@ -2482,8 +2460,7 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin,
         })
 
 
-class VirtualChassisBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_virtualchassis'
+class VirtualChassisBulkEditView(BulkEditView):
     queryset = VirtualChassis.objects.all()
     filterset = filters.VirtualChassisFilterSet
     table = tables.VirtualChassisTable
@@ -2550,8 +2527,7 @@ class PowerPanelBulkImportView(BulkImportView):
     default_return_url = 'dcim:powerpanel_list'
 
 
-class PowerPanelBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_powerpanel'
+class PowerPanelBulkEditView(BulkEditView):
     queryset = PowerPanel.objects.prefetch_related('site', 'rack_group')
     filterset = filters.PowerPanelFilterSet
     table = tables.PowerPanelTable
@@ -2615,8 +2591,7 @@ class PowerFeedBulkImportView(BulkImportView):
     default_return_url = 'dcim:powerfeed_list'
 
 
-class PowerFeedBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_powerfeed'
+class PowerFeedBulkEditView(BulkEditView):
     queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack')
     filterset = filters.PowerFeedFilterSet
     table = tables.PowerFeedTable
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 63764b683..3aadbda98 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -76,8 +76,7 @@ class TagDeleteView(ObjectDeleteView):
     default_return_url = 'extras:tag_list'
 
 
-class TagBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'extras.change_tag'
+class TagBulkEditView(BulkEditView):
     queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
@@ -137,8 +136,7 @@ class ConfigContextEditView(ObjectEditView):
     template_name = 'extras/configcontext_edit.html'
 
 
-class ConfigContextBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'extras.change_configcontext'
+class ConfigContextBulkEditView(BulkEditView):
     queryset = ConfigContext.objects.all()
     filterset = filters.ConfigContextFilterSet
     table = ConfigContextTable
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index dbd45b923..ba4b310ef 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -153,8 +153,7 @@ class VRFBulkImportView(BulkImportView):
     default_return_url = 'ipam:vrf_list'
 
 
-class VRFBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_vrf'
+class VRFBulkEditView(BulkEditView):
     queryset = VRF.objects.prefetch_related('tenant')
     filterset = filters.VRFFilterSet
     table = tables.VRFTable
@@ -365,8 +364,7 @@ class AggregateBulkImportView(BulkImportView):
     default_return_url = 'ipam:aggregate_list'
 
 
-class AggregateBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_aggregate'
+class AggregateBulkEditView(BulkEditView):
     queryset = Aggregate.objects.prefetch_related('rir')
     filterset = filters.AggregateFilterSet
     table = tables.AggregateTable
@@ -579,8 +577,7 @@ class PrefixBulkImportView(BulkImportView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkEditView(ObjectPermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_prefix'
+class PrefixBulkEditView(BulkEditView):
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
@@ -746,8 +743,7 @@ class IPAddressBulkImportView(BulkImportView):
     default_return_url = 'ipam:ipaddress_list'
 
 
-class IPAddressBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_ipaddress'
+class IPAddressBulkEditView(BulkEditView):
     queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant').prefetch_related('interface__device')
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
@@ -904,8 +900,7 @@ class VLANBulkImportView(BulkImportView):
     default_return_url = 'ipam:vlan_list'
 
 
-class VLANBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_vlan'
+class VLANBulkEditView(BulkEditView):
     queryset = VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.VLANFilterSet
     table = tables.VLANTable
@@ -972,8 +967,7 @@ class ServiceDeleteView(ObjectDeleteView):
     queryset = Service.objects.all()
 
 
-class ServiceBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'ipam.change_service'
+class ServiceBulkEditView(BulkEditView):
     queryset = Service.objects.prefetch_related('device', 'virtual_machine')
     filterset = filters.ServiceFilterSet
     table = tables.ServiceTable
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index d82ef6752..39e82df61 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -463,7 +463,7 @@ class ObjectPermissionViewTestCase(TestCase):
             'data': form_data,
         }
         response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
+        self.assertHttpStatus(response, 302)
         self.assertEqual(Prefix.objects.get(pk=self.prefixes[3].pk).status, 'active')
 
         # Edit permitted objects
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 00794f684..877133619 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -235,8 +235,7 @@ class SecretBulkImportView(BulkImportView):
         })
 
 
-class SecretBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'secrets.change_secret'
+class SecretBulkEditView(BulkEditView):
     queryset = Secret.objects.prefetch_related('role', 'device')
     filterset = filters.SecretFilterSet
     table = tables.SecretTable
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index f666e606a..fdfcbd7f5 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -105,8 +105,7 @@ class TenantBulkImportView(BulkImportView):
     default_return_url = 'tenancy:tenant_list'
 
 
-class TenantBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'tenancy.change_tenant'
+class TenantBulkEditView(BulkEditView):
     queryset = Tenant.objects.prefetch_related('group')
     filterset = filters.TenantFilterSet
     table = tables.TenantTable
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 3d11cf25b..1c8ceb525 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -755,7 +755,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class BulkEditView(GetReturnURLMixin, View):
+class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Edit objects in bulk.
 
@@ -771,6 +771,9 @@ class BulkEditView(GetReturnURLMixin, View):
     form = None
     template_name = 'utilities/obj_bulk_edit.html'
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'change')
+
     def get(self, request):
         return redirect(self.get_return_url(request))
 
@@ -781,7 +784,7 @@ class BulkEditView(GetReturnURLMixin, View):
         # If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
         if request.POST.get('_all') and self.filterset is not None:
             pk_list = [
-                obj.pk for obj in self.filterset(request.GET, model.objects.only('pk')).qs
+                obj.pk for obj in self.filterset(request.GET, self.queryset.only('pk')).qs
             ]
         else:
             pk_list = request.POST.getlist('pk')
@@ -802,7 +805,7 @@ class BulkEditView(GetReturnURLMixin, View):
                     with transaction.atomic():
 
                         updated_objects = []
-                        for obj in model.objects.filter(pk__in=form.cleaned_data['pk']):
+                        for obj in self.queryset.filter(pk__in=form.cleaned_data['pk']):
 
                             # Update standard fields. If a field is listed in _nullify, delete its value.
                             for name in standard_fields:
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index de4569b83..e565832d8 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -124,8 +124,7 @@ class ClusterBulkImportView(BulkImportView):
     default_return_url = 'virtualization:cluster_list'
 
 
-class ClusterBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'virtualization.change_cluster'
+class ClusterBulkEditView(BulkEditView):
     queryset = Cluster.objects.prefetch_related('type', 'group', 'site')
     filterset = filters.ClusterFilterSet
     table = tables.ClusterTable
@@ -278,8 +277,7 @@ class VirtualMachineBulkImportView(BulkImportView):
     default_return_url = 'virtualization:virtualmachine_list'
 
 
-class VirtualMachineBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'virtualization.change_virtualmachine'
+class VirtualMachineBulkEditView(BulkEditView):
     queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role')
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
@@ -317,8 +315,7 @@ class InterfaceDeleteView(ObjectDeleteView):
     queryset = Interface.objects.all()
 
 
-class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView):
-    permission_required = 'dcim.change_interface'
+class InterfaceBulkEditView(BulkEditView):
     queryset = Interface.objects.all()
     table = tables.InterfaceTable
     form = forms.InterfaceBulkEditForm

From 8fd860a413361b0c1a739e72237d57046f0f2dcb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 15:14:29 -0400
Subject: [PATCH 029/505] Transition BulkDeleteView to use
 ObjectPermissionRequiredMixin

---
 netbox/circuits/views.py       |  9 ++--
 netbox/dcim/views.py           | 96 ++++++++++++----------------------
 netbox/extras/views.py         |  6 +--
 netbox/ipam/views.py           | 27 ++++------
 netbox/secrets/views.py        |  6 +--
 netbox/tenancy/views.py        |  6 +--
 netbox/utilities/views.py      |  5 +-
 netbox/virtualization/views.py | 15 ++----
 8 files changed, 59 insertions(+), 111 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 3dc7032e4..e3260431f 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -86,8 +86,7 @@ class ProviderBulkEditView(BulkEditView):
     default_return_url = 'circuits:provider_list'
 
 
-class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'circuits.delete_provider'
+class ProviderBulkDeleteView(BulkDeleteView):
     queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
@@ -116,8 +115,7 @@ class CircuitTypeBulkImportView(BulkImportView):
     default_return_url = 'circuits:circuittype_list'
 
 
-class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'circuits.delete_circuittype'
+class CircuitTypeBulkDeleteView(BulkDeleteView):
     queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
     table = tables.CircuitTypeTable
     default_return_url = 'circuits:circuittype_list'
@@ -188,8 +186,7 @@ class CircuitBulkEditView(BulkEditView):
     default_return_url = 'circuits:circuit_list'
 
 
-class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'circuits.delete_circuit'
+class CircuitBulkDeleteView(BulkDeleteView):
     queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 8e2355a9c..5559d577c 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -167,8 +167,7 @@ class RegionBulkImportView(BulkImportView):
     default_return_url = 'dcim:region_list'
 
 
-class RegionBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_region'
+class RegionBulkDeleteView(BulkDeleteView):
     queryset = Region.objects.all()
     filterset = filters.RegionFilterSet
     table = tables.RegionTable
@@ -239,8 +238,7 @@ class SiteBulkEditView(BulkEditView):
     default_return_url = 'dcim:site_list'
 
 
-class SiteBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_site'
+class SiteBulkDeleteView(BulkDeleteView):
     queryset = Site.objects.prefetch_related('region', 'tenant')
     filterset = filters.SiteFilterSet
     table = tables.SiteTable
@@ -277,8 +275,7 @@ class RackGroupBulkImportView(BulkImportView):
     default_return_url = 'dcim:rackgroup_list'
 
 
-class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rackgroup'
+class RackGroupBulkDeleteView(BulkDeleteView):
     queryset = RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks'))
     filterset = filters.RackGroupFilterSet
     table = tables.RackGroupTable
@@ -307,8 +304,7 @@ class RackRoleBulkImportView(BulkImportView):
     default_return_url = 'dcim:rackrole_list'
 
 
-class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rackrole'
+class RackRoleBulkDeleteView(BulkDeleteView):
     queryset = RackRole.objects.annotate(rack_count=Count('racks'))
     table = tables.RackRoleTable
     default_return_url = 'dcim:rackrole_list'
@@ -425,8 +421,7 @@ class RackBulkEditView(BulkEditView):
     default_return_url = 'dcim:rack_list'
 
 
-class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rack'
+class RackBulkDeleteView(BulkDeleteView):
     queryset = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.RackFilterSet
     table = tables.RackTable
@@ -501,8 +496,7 @@ class RackReservationBulkEditView(BulkEditView):
     default_return_url = 'dcim:rackreservation_list'
 
 
-class RackReservationBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rackreservation'
+class RackReservationBulkDeleteView(BulkDeleteView):
     queryset = RackReservation.objects.prefetch_related('rack', 'user')
     filterset = filters.RackReservationFilterSet
     table = tables.RackReservationTable
@@ -535,8 +529,7 @@ class ManufacturerBulkImportView(BulkImportView):
     default_return_url = 'dcim:manufacturer_list'
 
 
-class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_manufacturer'
+class ManufacturerBulkDeleteView(BulkDeleteView):
     queryset = Manufacturer.objects.annotate(devicetype_count=Count('device_types'))
     table = tables.ManufacturerTable
     default_return_url = 'dcim:manufacturer_list'
@@ -663,8 +656,7 @@ class DeviceTypeBulkEditView(BulkEditView):
     default_return_url = 'dcim:devicetype_list'
 
 
-class DeviceTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_devicetype'
+class DeviceTypeBulkDeleteView(BulkDeleteView):
     queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
@@ -698,8 +690,7 @@ class ConsolePortTemplateBulkEditView(BulkEditView):
     form = forms.ConsolePortTemplateBulkEditForm
 
 
-class ConsolePortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_consoleporttemplate'
+class ConsolePortTemplateBulkDeleteView(BulkDeleteView):
     queryset = ConsolePortTemplate.objects.all()
     table = tables.ConsolePortTemplateTable
 
@@ -731,8 +722,7 @@ class ConsoleServerPortTemplateBulkEditView(BulkEditView):
     form = forms.ConsoleServerPortTemplateBulkEditForm
 
 
-class ConsoleServerPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_consoleserverporttemplate'
+class ConsoleServerPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = ConsoleServerPortTemplate.objects.all()
     table = tables.ConsoleServerPortTemplateTable
 
@@ -764,8 +754,7 @@ class PowerPortTemplateBulkEditView(BulkEditView):
     form = forms.PowerPortTemplateBulkEditForm
 
 
-class PowerPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_powerporttemplate'
+class PowerPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = PowerPortTemplate.objects.all()
     table = tables.PowerPortTemplateTable
 
@@ -797,8 +786,7 @@ class PowerOutletTemplateBulkEditView(BulkEditView):
     form = forms.PowerOutletTemplateBulkEditForm
 
 
-class PowerOutletTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_poweroutlettemplate'
+class PowerOutletTemplateBulkDeleteView(BulkDeleteView):
     queryset = PowerOutletTemplate.objects.all()
     table = tables.PowerOutletTemplateTable
 
@@ -830,8 +818,7 @@ class InterfaceTemplateBulkEditView(BulkEditView):
     form = forms.InterfaceTemplateBulkEditForm
 
 
-class InterfaceTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_interfacetemplate'
+class InterfaceTemplateBulkDeleteView(BulkDeleteView):
     queryset = InterfaceTemplate.objects.all()
     table = tables.InterfaceTemplateTable
 
@@ -863,8 +850,7 @@ class FrontPortTemplateBulkEditView(BulkEditView):
     form = forms.FrontPortTemplateBulkEditForm
 
 
-class FrontPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_frontporttemplate'
+class FrontPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = FrontPortTemplate.objects.all()
     table = tables.FrontPortTemplateTable
 
@@ -896,8 +882,7 @@ class RearPortTemplateBulkEditView(BulkEditView):
     form = forms.RearPortTemplateBulkEditForm
 
 
-class RearPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rearporttemplate'
+class RearPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = RearPortTemplate.objects.all()
     table = tables.RearPortTemplateTable
 
@@ -930,8 +915,7 @@ class DeviceBayTemplateDeleteView(ObjectDeleteView):
 #     form = forms.DeviceBayTemplateBulkEditForm
 
 
-class DeviceBayTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_devicebaytemplate'
+class DeviceBayTemplateBulkDeleteView(BulkDeleteView):
     queryset = DeviceBayTemplate.objects.all()
     table = tables.DeviceBayTemplateTable
 
@@ -958,8 +942,7 @@ class DeviceRoleBulkImportView(BulkImportView):
     default_return_url = 'dcim:devicerole_list'
 
 
-class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_devicerole'
+class DeviceRoleBulkDeleteView(BulkDeleteView):
     queryset = DeviceRole.objects.all()
     table = tables.DeviceRoleTable
     default_return_url = 'dcim:devicerole_list'
@@ -987,8 +970,7 @@ class PlatformBulkImportView(BulkImportView):
     default_return_url = 'dcim:platform_list'
 
 
-class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_platform'
+class PlatformBulkDeleteView(BulkDeleteView):
     queryset = Platform.objects.all()
     table = tables.PlatformTable
     default_return_url = 'dcim:platform_list'
@@ -1201,8 +1183,7 @@ class DeviceBulkEditView(BulkEditView):
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_device'
+class DeviceBulkDeleteView(BulkDeleteView):
     queryset = Device.objects.prefetch_related('tenant', 'site', 'rack', 'device_role', 'device_type__manufacturer')
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
@@ -1252,8 +1233,7 @@ class ConsolePortBulkEditView(BulkEditView):
     form = forms.ConsolePortBulkEditForm
 
 
-class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_consoleport'
+class ConsolePortBulkDeleteView(BulkDeleteView):
     queryset = ConsolePort.objects.all()
     filterset = filters.ConsolePortFilterSet
     table = tables.ConsolePortTable
@@ -1315,8 +1295,7 @@ class ConsoleServerPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnec
     form = forms.ConsoleServerPortBulkDisconnectForm
 
 
-class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_consoleserverport'
+class ConsoleServerPortBulkDeleteView(BulkDeleteView):
     queryset = ConsoleServerPort.objects.all()
     filterset = filters.ConsoleServerPortFilterSet
     table = tables.ConsoleServerPortTable
@@ -1366,8 +1345,7 @@ class PowerPortBulkEditView(BulkEditView):
     form = forms.PowerPortBulkEditForm
 
 
-class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_powerport'
+class PowerPortBulkDeleteView(BulkDeleteView):
     queryset = PowerPort.objects.all()
     filterset = filters.PowerPortFilterSet
     table = tables.PowerPortTable
@@ -1429,8 +1407,7 @@ class PowerOutletBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView)
     form = forms.PowerOutletBulkDisconnectForm
 
 
-class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_poweroutlet'
+class PowerOutletBulkDeleteView(BulkDeleteView):
     queryset = PowerOutlet.objects.all()
     filterset = filters.PowerOutletFilterSet
     table = tables.PowerOutletTable
@@ -1529,8 +1506,7 @@ class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
     form = forms.InterfaceBulkDisconnectForm
 
 
-class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_interface'
+class InterfaceBulkDeleteView(BulkDeleteView):
     queryset = Interface.objects.all()
     filterset = filters.InterfaceFilterSet
     table = tables.InterfaceTable
@@ -1592,8 +1568,7 @@ class FrontPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
     form = forms.FrontPortBulkDisconnectForm
 
 
-class FrontPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_frontport'
+class FrontPortBulkDeleteView(BulkDeleteView):
     queryset = FrontPort.objects.all()
     filterset = filters.FrontPortFilterSet
     table = tables.FrontPortTable
@@ -1655,8 +1630,7 @@ class RearPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
     form = forms.RearPortBulkDisconnectForm
 
 
-class RearPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_rearport'
+class RearPortBulkDeleteView(BulkDeleteView):
     queryset = RearPort.objects.all()
     filterset = filters.RearPortFilterSet
     table = tables.RearPortTable
@@ -1783,8 +1757,7 @@ class DeviceBayBulkRenameView(PermissionRequiredMixin, BulkRenameView):
     form = forms.DeviceBayBulkRenameForm
 
 
-class DeviceBayBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_devicebay'
+class DeviceBayBulkDeleteView(BulkDeleteView):
     queryset = DeviceBay.objects.all()
     filterset = filters.DeviceBayFilterSet
     table = tables.DeviceBayTable
@@ -2048,8 +2021,7 @@ class CableBulkEditView(BulkEditView):
     default_return_url = 'dcim:cable_list'
 
 
-class CableBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_cable'
+class CableBulkDeleteView(BulkDeleteView):
     queryset = Cable.objects.prefetch_related('termination_a', 'termination_b')
     filterset = filters.CableFilterSet
     table = tables.CableTable
@@ -2203,8 +2175,7 @@ class InventoryItemBulkEditView(BulkEditView):
     default_return_url = 'dcim:inventoryitem_list'
 
 
-class InventoryItemBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_inventoryitem'
+class InventoryItemBulkDeleteView(BulkDeleteView):
     queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
     table = tables.InventoryItemTable
     template_name = 'dcim/inventoryitem_bulk_delete.html'
@@ -2468,8 +2439,7 @@ class VirtualChassisBulkEditView(BulkEditView):
     default_return_url = 'dcim:virtualchassis_list'
 
 
-class VirtualChassisBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_virtualchassis'
+class VirtualChassisBulkDeleteView(BulkDeleteView):
     queryset = VirtualChassis.objects.all()
     filterset = filters.VirtualChassisFilterSet
     table = tables.VirtualChassisTable
@@ -2535,8 +2505,7 @@ class PowerPanelBulkEditView(BulkEditView):
     default_return_url = 'dcim:powerpanel_list'
 
 
-class PowerPanelBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_powerpanel'
+class PowerPanelBulkDeleteView(BulkDeleteView):
     queryset = PowerPanel.objects.prefetch_related(
         'site', 'rack_group'
     ).annotate(
@@ -2599,8 +2568,7 @@ class PowerFeedBulkEditView(BulkEditView):
     default_return_url = 'dcim:powerfeed_list'
 
 
-class PowerFeedBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_powerfeed'
+class PowerFeedBulkDeleteView(BulkDeleteView):
     queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack')
     filterset = filters.PowerFeedFilterSet
     table = tables.PowerFeedTable
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 3aadbda98..0a3796a28 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -87,8 +87,7 @@ class TagBulkEditView(BulkEditView):
     default_return_url = 'extras:tag_list'
 
 
-class TagBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'extras.delete_tag'
+class TagBulkDeleteView(BulkDeleteView):
     queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
@@ -149,8 +148,7 @@ class ConfigContextDeleteView(ObjectDeleteView):
     default_return_url = 'extras:configcontext_list'
 
 
-class ConfigContextBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'extras.delete_configcontext'
+class ConfigContextBulkDeleteView(BulkDeleteView):
     queryset = ConfigContext.objects.all()
     table = ConfigContextTable
     default_return_url = 'extras:configcontext_list'
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index ba4b310ef..19d38be5d 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -161,8 +161,7 @@ class VRFBulkEditView(BulkEditView):
     default_return_url = 'ipam:vrf_list'
 
 
-class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_vrf'
+class VRFBulkDeleteView(BulkDeleteView):
     queryset = VRF.objects.prefetch_related('tenant')
     filterset = filters.VRFFilterSet
     table = tables.VRFTable
@@ -262,8 +261,7 @@ class RIRBulkImportView(BulkImportView):
     default_return_url = 'ipam:rir_list'
 
 
-class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_rir'
+class RIRBulkDeleteView(BulkDeleteView):
     queryset = RIR.objects.annotate(aggregate_count=Count('aggregates'))
     filterset = filters.RIRFilterSet
     table = tables.RIRTable
@@ -372,8 +370,7 @@ class AggregateBulkEditView(BulkEditView):
     default_return_url = 'ipam:aggregate_list'
 
 
-class AggregateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_aggregate'
+class AggregateBulkDeleteView(BulkDeleteView):
     queryset = Aggregate.objects.prefetch_related('rir')
     filterset = filters.AggregateFilterSet
     table = tables.AggregateTable
@@ -402,8 +399,7 @@ class RoleBulkImportView(BulkImportView):
     default_return_url = 'ipam:role_list'
 
 
-class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_role'
+class RoleBulkDeleteView(BulkDeleteView):
     queryset = Role.objects.all()
     table = tables.RoleTable
     default_return_url = 'ipam:role_list'
@@ -585,8 +581,7 @@ class PrefixBulkEditView(BulkEditView):
     default_return_url = 'ipam:prefix_list'
 
 
-class PrefixBulkDeleteView(ObjectPermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_prefix'
+class PrefixBulkDeleteView(BulkDeleteView):
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
@@ -751,8 +746,7 @@ class IPAddressBulkEditView(BulkEditView):
     default_return_url = 'ipam:ipaddress_list'
 
 
-class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_ipaddress'
+class IPAddressBulkDeleteView(BulkDeleteView):
     queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant').prefetch_related('interface__device')
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
@@ -784,8 +778,7 @@ class VLANGroupBulkImportView(BulkImportView):
     default_return_url = 'ipam:vlangroup_list'
 
 
-class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_vlangroup'
+class VLANGroupBulkDeleteView(BulkDeleteView):
     queryset = VLANGroup.objects.prefetch_related('site').annotate(vlan_count=Count('vlans'))
     filterset = filters.VLANGroupFilterSet
     table = tables.VLANGroupTable
@@ -908,8 +901,7 @@ class VLANBulkEditView(BulkEditView):
     default_return_url = 'ipam:vlan_list'
 
 
-class VLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_vlan'
+class VLANBulkDeleteView(BulkDeleteView):
     queryset = VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.VLANFilterSet
     table = tables.VLANTable
@@ -975,8 +967,7 @@ class ServiceBulkEditView(BulkEditView):
     default_return_url = 'ipam:service_list'
 
 
-class ServiceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'ipam.delete_service'
+class ServiceBulkDeleteView(BulkDeleteView):
     queryset = Service.objects.prefetch_related('device', 'virtual_machine')
     filterset = filters.ServiceFilterSet
     table = tables.ServiceTable
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index 877133619..dbcf72262 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -48,8 +48,7 @@ class SecretRoleBulkImportView(BulkImportView):
     default_return_url = 'secrets:secretrole_list'
 
 
-class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'secrets.delete_secretrole'
+class SecretRoleBulkDeleteView(BulkDeleteView):
     queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
     table = tables.SecretRoleTable
     default_return_url = 'secrets:secretrole_list'
@@ -243,8 +242,7 @@ class SecretBulkEditView(BulkEditView):
     default_return_url = 'secrets:secret_list'
 
 
-class SecretBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'secrets.delete_secret'
+class SecretBulkDeleteView(BulkDeleteView):
     queryset = Secret.objects.prefetch_related('role', 'device')
     filterset = filters.SecretFilterSet
     table = tables.SecretTable
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index fdfcbd7f5..3de321301 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -42,8 +42,7 @@ class TenantGroupBulkImportView(BulkImportView):
     default_return_url = 'tenancy:tenantgroup_list'
 
 
-class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'tenancy.delete_tenantgroup'
+class TenantGroupBulkDeleteView(BulkDeleteView):
     queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
     table = tables.TenantGroupTable
     default_return_url = 'tenancy:tenantgroup_list'
@@ -113,8 +112,7 @@ class TenantBulkEditView(BulkEditView):
     default_return_url = 'tenancy:tenant_list'
 
 
-class TenantBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'tenancy.delete_tenant'
+class TenantBulkDeleteView(BulkDeleteView):
     queryset = Tenant.objects.prefetch_related('group')
     filterset = filters.TenantFilterSet
     table = tables.TenantTable
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 1c8ceb525..6a1086c94 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -911,7 +911,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class BulkDeleteView(GetReturnURLMixin, View):
+class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Delete objects in bulk.
 
@@ -927,6 +927,9 @@ class BulkDeleteView(GetReturnURLMixin, View):
     form = None
     template_name = 'utilities/obj_bulk_delete.html'
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'delete')
+
     def get(self, request):
         return redirect(self.get_return_url(request))
 
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index e565832d8..898648f90 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -40,8 +40,7 @@ class ClusterTypeBulkImportView(BulkImportView):
     default_return_url = 'virtualization:clustertype_list'
 
 
-class ClusterTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'virtualization.delete_clustertype'
+class ClusterTypeBulkDeleteView(BulkDeleteView):
     queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterTypeTable
     default_return_url = 'virtualization:clustertype_list'
@@ -69,8 +68,7 @@ class ClusterGroupBulkImportView(BulkImportView):
     default_return_url = 'virtualization:clustergroup_list'
 
 
-class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'virtualization.delete_clustergroup'
+class ClusterGroupBulkDeleteView(BulkDeleteView):
     queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterGroupTable
     default_return_url = 'virtualization:clustergroup_list'
@@ -132,8 +130,7 @@ class ClusterBulkEditView(BulkEditView):
     default_return_url = 'virtualization:cluster_list'
 
 
-class ClusterBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'virtualization.delete_cluster'
+class ClusterBulkDeleteView(BulkDeleteView):
     queryset = Cluster.objects.prefetch_related('type', 'group', 'site')
     filterset = filters.ClusterFilterSet
     table = tables.ClusterTable
@@ -285,8 +282,7 @@ class VirtualMachineBulkEditView(BulkEditView):
     default_return_url = 'virtualization:virtualmachine_list'
 
 
-class VirtualMachineBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'virtualization.delete_virtualmachine'
+class VirtualMachineBulkDeleteView(BulkDeleteView):
     queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role')
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
@@ -321,8 +317,7 @@ class InterfaceBulkEditView(BulkEditView):
     form = forms.InterfaceBulkEditForm
 
 
-class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
-    permission_required = 'dcim.delete_interface'
+class InterfaceBulkDeleteView(BulkDeleteView):
     queryset = Interface.objects.all()
     table = tables.InterfaceTable
 

From e61fc1f7090a70e483df7fdcc556263b8aea6e25 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 15:39:07 -0400
Subject: [PATCH 030/505] Introduce ObjectView to enforce object-level
 permissions for individual object views

---
 docs/development/utility-views.md |  4 ++
 netbox/circuits/views.py          | 16 +++----
 netbox/dcim/views.py              | 80 ++++++++++++++++---------------
 netbox/extras/views.py            | 20 ++++----
 netbox/ipam/views.py              | 57 +++++++++++-----------
 netbox/secrets/views.py           |  9 ++--
 netbox/tenancy/views.py           | 10 ++--
 netbox/utilities/views.py         | 12 +++++
 netbox/virtualization/views.py    | 16 +++----
 9 files changed, 118 insertions(+), 106 deletions(-)

diff --git a/docs/development/utility-views.md b/docs/development/utility-views.md
index a6e50f71e..3b9c1053d 100644
--- a/docs/development/utility-views.md
+++ b/docs/development/utility-views.md
@@ -4,6 +4,10 @@ Utility views are reusable views that handle common CRUD tasks, such as listing
 
 ## Individual Views
 
+### ObjectView
+
+Retrieve and display a single object.
+
 ### ObjectListView
 
 Generates a paginated table of objects from a given queryset, which may optionally be filtered.
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index e3260431f..1f5f05230 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -1,18 +1,16 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
 from django.db.models import Count, OuterRef
 from django.shortcuts import get_object_or_404, redirect, render
-from django.views.generic import View
 from django_tables2 import RequestConfig
 
 from extras.models import Graph
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
-    BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
 from .choices import CircuitTerminationSideChoices
@@ -30,12 +28,12 @@ class ProviderListView(ObjectListView):
     table = tables.ProviderTable
 
 
-class ProviderView(PermissionRequiredMixin, View):
-    permission_required = 'circuits.view_provider'
+class ProviderView(ObjectView):
+    queryset = Provider.objects.all()
 
     def get(self, request, slug):
 
-        provider = get_object_or_404(Provider, slug=slug)
+        provider = get_object_or_404(self.queryset, slug=slug)
         circuits = Circuit.objects.filter(
             provider=provider
         ).prefetch_related(
@@ -135,12 +133,12 @@ class CircuitListView(ObjectListView):
     table = tables.CircuitTable
 
 
-class CircuitView(PermissionRequiredMixin, View):
-    permission_required = 'circuits.view_circuit'
+class CircuitView(ObjectView):
+    queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant__group')
 
     def get(self, request, pk):
 
-        circuit = get_object_or_404(Circuit.objects.prefetch_related('provider', 'type', 'tenant__group'), pk=pk)
+        circuit = get_object_or_404(self.queryset, pk=pk)
         termination_a = CircuitTermination.objects.prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 5559d577c..fb60b6b31 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -26,7 +26,7 @@ from utilities.paginator import EnhancedPaginator
 from utilities.utils import csv_format
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, GetReturnURLMixin,
-    ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView, ObjectPermissionRequiredMixin,
+    ObjectView, ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView, ObjectPermissionRequiredMixin,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
@@ -185,8 +185,7 @@ class SiteListView(ObjectListView):
     table = tables.SiteTable
 
 
-class SiteView(ObjectPermissionRequiredMixin, View):
-    permission_required = 'dcim.view_site'
+class SiteView(ObjectView):
     queryset = Site.objects.prefetch_related('region', 'tenant__group')
 
     def get(self, request, slug):
@@ -362,12 +361,12 @@ class RackElevationListView(PermissionRequiredMixin, View):
         })
 
 
-class RackView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_rack'
+class RackView(ObjectView):
+    queryset = Rack.objects.prefetch_related('site__region', 'tenant__group', 'group', 'role')
 
     def get(self, request, pk):
 
-        rack = get_object_or_404(Rack.objects.prefetch_related('site__region', 'tenant__group', 'group', 'role'), pk=pk)
+        rack = get_object_or_404(self.queryset, pk=pk)
 
         nonracked_devices = Device.objects.filter(
             rack=rack,
@@ -440,12 +439,12 @@ class RackReservationListView(ObjectListView):
     action_buttons = ('export',)
 
 
-class RackReservationView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_rackreservation'
+class RackReservationView(ObjectView):
+    queryset = RackReservation.objects.prefetch_related('rack')
 
     def get(self, request, pk):
 
-        rackreservation = get_object_or_404(RackReservation.objects.prefetch_related('rack'), pk=pk)
+        rackreservation = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/rackreservation.html', {
             'rackreservation': rackreservation,
@@ -546,12 +545,12 @@ class DeviceTypeListView(ObjectListView):
     table = tables.DeviceTypeTable
 
 
-class DeviceTypeView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_devicetype'
+class DeviceTypeView(ObjectView):
+    queryset = DeviceType.objects.prefetch_related('manufacturer')
 
     def get(self, request, pk):
 
-        devicetype = get_object_or_404(DeviceType, pk=pk)
+        devicetype = get_object_or_404(self.queryset, pk=pk)
 
         # Component tables
         consoleport_table = tables.ConsolePortTemplateTable(
@@ -990,14 +989,14 @@ class DeviceListView(ObjectListView):
     template_name = 'dcim/device_list.html'
 
 
-class DeviceView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_device'
+class DeviceView(ObjectView):
+    queryset = Device.objects.prefetch_related(
+        'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform'
+    )
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device.objects.prefetch_related(
-            'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform'
-        ), pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
 
         # VirtualChassis members
         if device.virtual_chassis is not None:
@@ -1068,12 +1067,12 @@ class DeviceView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceInventoryView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_device'
+class DeviceInventoryView(ObjectView):
+    queryset = Device.objects.all()
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
         inventory_items = InventoryItem.objects.filter(
             device=device, parent=None
         ).prefetch_related(
@@ -1087,12 +1086,13 @@ class DeviceInventoryView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceStatusView(PermissionRequiredMixin, View):
+class DeviceStatusView(ObjectView):
     permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    queryset = Device.objects.all()
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/device_status.html', {
             'device': device,
@@ -1102,10 +1102,11 @@ class DeviceStatusView(PermissionRequiredMixin, View):
 
 class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
     permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    queryset = Device.objects.all()
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
         interfaces = device.vc_interfaces.exclude(type__in=NONCONNECTABLE_IFACE_TYPES).prefetch_related(
             '_connected_interface__device'
         )
@@ -1119,10 +1120,11 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
 
 class DeviceConfigView(PermissionRequiredMixin, View):
     permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    queryset = Device.objects.all()
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/device_config.html', {
             'device': device,
@@ -1426,12 +1428,12 @@ class InterfaceListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class InterfaceView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_interface'
+class InterfaceView(ObjectView):
+    queryset = Interface.objects.all()
 
     def get(self, request, pk):
 
-        interface = get_object_or_404(Interface, pk=pk)
+        interface = get_object_or_404(self.queryset, pk=pk)
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
@@ -1878,12 +1880,12 @@ class CableListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class CableView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_cable'
+class CableView(ObjectView):
+    queryset = Cable.objects.all()
 
     def get(self, request, pk):
 
-        cable = get_object_or_404(Cable, pk=pk)
+        cable = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/cable.html', {
             'cable': cable,
@@ -2194,11 +2196,11 @@ class VirtualChassisListView(ObjectListView):
     action_buttons = ('export',)
 
 
-class VirtualChassisView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_virtualchassis'
+class VirtualChassisView(ObjectView):
+    queryset = VirtualChassis.objects.prefetch_related('members')
 
     def get(self, request, pk):
-        virtualchassis = get_object_or_404(VirtualChassis.objects.prefetch_related('members'), pk=pk)
+        virtualchassis = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/virtualchassis.html', {
             'virtualchassis': virtualchassis,
@@ -2461,12 +2463,12 @@ class PowerPanelListView(ObjectListView):
     table = tables.PowerPanelTable
 
 
-class PowerPanelView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_powerpanel'
+class PowerPanelView(ObjectView):
+    queryset = PowerPanel.objects.prefetch_related('site', 'rack_group')
 
     def get(self, request, pk):
 
-        powerpanel = get_object_or_404(PowerPanel.objects.prefetch_related('site', 'rack_group'), pk=pk)
+        powerpanel = get_object_or_404(self.queryset, pk=pk)
         powerfeed_table = tables.PowerFeedTable(
             data=PowerFeed.objects.filter(power_panel=powerpanel).prefetch_related('rack'),
             orderable=False
@@ -2529,12 +2531,12 @@ class PowerFeedListView(ObjectListView):
     table = tables.PowerFeedTable
 
 
-class PowerFeedView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.view_powerfeed'
+class PowerFeedView(ObjectView):
+    queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack')
 
     def get(self, request, pk):
 
-        powerfeed = get_object_or_404(PowerFeed.objects.prefetch_related('power_panel', 'rack'), pk=pk)
+        powerfeed = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'dcim/powerfeed.html', {
             'powerfeed': powerfeed,
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 0a3796a28..78db8f24a 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -13,7 +13,7 @@ from django_tables2 import RequestConfig
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import shallow_compare_dict
-from utilities.views import BulkDeleteView, BulkEditView, ObjectDeleteView, ObjectEditView, ObjectListView
+from utilities.views import BulkDeleteView, BulkEditView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView
 from . import filters, forms
 from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem
 from .reports import get_report, get_reports
@@ -37,12 +37,12 @@ class TagListView(ObjectListView):
     action_buttons = ()
 
 
-class TagView(PermissionRequiredMixin, View):
-    permission_required = 'extras.view_tag'
+class TagView(ObjectView):
+    queryset = Tag.objects.all()
 
     def get(self, request, slug):
 
-        tag = get_object_or_404(Tag, slug=slug)
+        tag = get_object_or_404(self.queryset, slug=slug)
         tagged_items = TaggedItem.objects.filter(
             tag=tag
         ).prefetch_related(
@@ -109,11 +109,11 @@ class ConfigContextListView(ObjectListView):
     action_buttons = ('add',)
 
 
-class ConfigContextView(PermissionRequiredMixin, View):
-    permission_required = 'extras.view_configcontext'
+class ConfigContextView(ObjectView):
+    queryset = ConfigContext.objects.all()
 
     def get(self, request, pk):
-        configcontext = get_object_or_404(ConfigContext, pk=pk)
+        configcontext = get_object_or_404(self.queryset, pk=pk)
 
         # Determine user's preferred output format
         if request.GET.get('format') in ['json', 'yaml']:
@@ -195,12 +195,12 @@ class ObjectChangeListView(ObjectListView):
     action_buttons = ('export',)
 
 
-class ObjectChangeView(PermissionRequiredMixin, View):
-    permission_required = 'extras.view_objectchange'
+class ObjectChangeView(ObjectView):
+    queryset = ObjectChange.objects.all()
 
     def get(self, request, pk):
 
-        objectchange = get_object_or_404(ObjectChange, pk=pk)
+        objectchange = get_object_or_404(self.queryset, pk=pk)
 
         related_changes = ObjectChange.objects.filter(request_id=objectchange.request_id).exclude(pk=objectchange.pk)
         related_changes_table = ObjectChangeTable(
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 19d38be5d..706f819cc 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -10,8 +10,8 @@ from django_tables2 import RequestConfig
 from dcim.models import Device, Interface
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
-    BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
-    ObjectPermissionRequiredMixin,
+    BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView,
+    ObjectListView,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
@@ -120,12 +120,12 @@ class VRFListView(ObjectListView):
     table = tables.VRFTable
 
 
-class VRFView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_vrf'
+class VRFView(ObjectView):
+    queryset = VRF.objects.all()
 
     def get(self, request, pk):
 
-        vrf = get_object_or_404(VRF.objects.all(), pk=pk)
+        vrf = get_object_or_404(self.queryset, pk=pk)
         prefix_count = Prefix.objects.filter(vrf=vrf).count()
 
         return render(request, 'ipam/vrf.html', {
@@ -298,12 +298,12 @@ class AggregateListView(ObjectListView):
         }
 
 
-class AggregateView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_aggregate'
+class AggregateView(ObjectView):
+    queryset = Aggregate.objects.all()
 
     def get(self, request, pk):
 
-        aggregate = get_object_or_404(Aggregate, pk=pk)
+        aggregate = get_object_or_404(self.queryset, pk=pk)
 
         # Find all child prefixes contained by this aggregate
         child_prefixes = Prefix.objects.filter(
@@ -422,8 +422,7 @@ class PrefixListView(ObjectListView):
         return self.queryset.annotate_depth(limit=limit)
 
 
-class PrefixView(ObjectPermissionRequiredMixin, View):
-    permission_required = 'ipam.view_prefix'
+class PrefixView(ObjectView):
     queryset = Prefix.objects.prefetch_related('vrf', 'site__region', 'tenant__group', 'vlan__group', 'role')
 
     def get(self, request, pk):
@@ -465,12 +464,12 @@ class PrefixView(ObjectPermissionRequiredMixin, View):
         })
 
 
-class PrefixPrefixesView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_prefix'
+class PrefixPrefixesView(ObjectView):
+    queryset = Prefix.objects.all()
 
     def get(self, request, pk):
 
-        prefix = get_object_or_404(Prefix.objects.all(), pk=pk)
+        prefix = get_object_or_404(self.queryset, pk=pk)
 
         # Child prefixes table
         child_prefixes = prefix.get_child_prefixes().prefetch_related(
@@ -509,12 +508,12 @@ class PrefixPrefixesView(PermissionRequiredMixin, View):
         })
 
 
-class PrefixIPAddressesView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_prefix'
+class PrefixIPAddressesView(ObjectView):
+    queryset = Prefix.objects.all()
 
     def get(self, request, pk):
 
-        prefix = get_object_or_404(Prefix.objects.all(), pk=pk)
+        prefix = get_object_or_404(self.queryset, pk=pk)
 
         # Find all IPAddresses belonging to this Prefix
         ipaddresses = prefix.get_child_ips().prefetch_related(
@@ -601,12 +600,12 @@ class IPAddressListView(ObjectListView):
     table = tables.IPAddressDetailTable
 
 
-class IPAddressView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_ipaddress'
+class IPAddressView(ObjectView):
+    queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant')
 
     def get(self, request, pk):
 
-        ipaddress = get_object_or_404(IPAddress.objects.prefetch_related('vrf__tenant', 'tenant'), pk=pk)
+        ipaddress = get_object_or_404(self.queryset, pk=pk)
 
         # Parent prefixes table
         parent_prefixes = Prefix.objects.filter(
@@ -833,14 +832,12 @@ class VLANListView(ObjectListView):
     table = tables.VLANDetailTable
 
 
-class VLANView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_vlan'
+class VLANView(ObjectView):
+    queryset = VLAN.objects.prefetch_related('site__region', 'tenant__group', 'role')
 
     def get(self, request, pk):
 
-        vlan = get_object_or_404(VLAN.objects.prefetch_related(
-            'site__region', 'tenant__group', 'role'
-        ), pk=pk)
+        vlan = get_object_or_404(self.queryset, pk=pk)
         prefixes = Prefix.objects.filter(vlan=vlan).prefetch_related('vrf', 'site', 'role')
         prefix_table = tables.PrefixTable(list(prefixes), orderable=False)
         prefix_table.exclude = ('vlan',)
@@ -851,12 +848,12 @@ class VLANView(PermissionRequiredMixin, View):
         })
 
 
-class VLANMembersView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_vlan'
+class VLANMembersView(ObjectView):
+    queryset = VLAN.objects.all()
 
     def get(self, request, pk):
 
-        vlan = get_object_or_404(VLAN.objects.all(), pk=pk)
+        vlan = get_object_or_404(self.queryset, pk=pk)
         members = vlan.get_members().prefetch_related('device', 'virtual_machine')
 
         members_table = tables.VLANMemberTable(members)
@@ -920,12 +917,12 @@ class ServiceListView(ObjectListView):
     action_buttons = ('export',)
 
 
-class ServiceView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_service'
+class ServiceView(ObjectView):
+    queryset = Service.objects.all()
 
     def get(self, request, pk):
 
-        service = get_object_or_404(Service, pk=pk)
+        service = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'ipam/service.html', {
             'service': service,
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index dbcf72262..a2e627a7c 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -9,7 +9,8 @@ from django.urls import reverse
 from django.views.generic import View
 
 from utilities.views import (
-    BulkDeleteView, BulkEditView, BulkImportView, GetReturnURLMixin, ObjectDeleteView, ObjectEditView, ObjectListView,
+    BulkDeleteView, BulkEditView, BulkImportView, GetReturnURLMixin, ObjectView, ObjectDeleteView, ObjectEditView,
+    ObjectListView,
 )
 from . import filters, forms, tables
 from .decorators import userkey_required
@@ -66,12 +67,12 @@ class SecretListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class SecretView(PermissionRequiredMixin, View):
-    permission_required = 'secrets.view_secret'
+class SecretView(ObjectView):
+    queryset = Secret.objects.all()
 
     def get(self, request, pk):
 
-        secret = get_object_or_404(Secret, pk=pk)
+        secret = get_object_or_404(self.queryset, pk=pk)
 
         return render(request, 'secrets/secret.html', {
             'secret': secret,
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 3de321301..823df9933 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -1,13 +1,11 @@
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, render
-from django.views.generic import View
 
 from circuits.models import Circuit
 from dcim.models import Site, Rack, Device, RackReservation
 from ipam.models import IPAddress, Prefix, VLAN, VRF
 from utilities.views import (
-    BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from virtualization.models import VirtualMachine, Cluster
 from . import filters, forms, tables
@@ -59,12 +57,12 @@ class TenantListView(ObjectListView):
     table = tables.TenantTable
 
 
-class TenantView(PermissionRequiredMixin, View):
-    permission_required = 'tenancy.view_tenant'
+class TenantView(ObjectView):
+    queryset = Tenant.objects.prefetch_related('group')
 
     def get(self, request, slug):
 
-        tenant = get_object_or_404(Tenant, slug=slug)
+        tenant = get_object_or_404(self.queryset, slug=slug)
         stats = {
             'site_count': Site.objects.filter(tenant=tenant).count(),
             'rack_count': Rack.objects.filter(tenant=tenant).count(),
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 6a1086c94..bd612b4df 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -118,6 +118,18 @@ class GetReturnURLMixin(object):
 # Generic views
 #
 
+class ObjectView(ObjectPermissionRequiredMixin, View):
+    """
+    Retrieve a single object for display.
+
+    :param queryset: The base queryset for retrieving the object.
+    """
+    queryset = None
+
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'view')
+
+
 class ObjectListView(ObjectPermissionRequiredMixin, View):
     """
     List a series of objects.
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 898648f90..53fcf9697 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -11,8 +11,8 @@ from dcim.tables import DeviceTable
 from extras.views import ObjectConfigContextView
 from ipam.models import Service
 from utilities.views import (
-    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, ObjectDeleteView,
-    ObjectEditView, ObjectListView,
+    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, ObjectView,
+    ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
@@ -85,12 +85,12 @@ class ClusterListView(ObjectListView):
     filterset_form = forms.ClusterFilterForm
 
 
-class ClusterView(PermissionRequiredMixin, View):
-    permission_required = 'virtualization.view_cluster'
+class ClusterView(ObjectView):
+    queryset = Cluster.objects.all()
 
     def get(self, request, pk):
 
-        cluster = get_object_or_404(Cluster, pk=pk)
+        cluster = get_object_or_404(self.queryset, pk=pk)
         devices = Device.objects.filter(cluster=cluster).prefetch_related(
             'site', 'rack', 'tenant', 'device_type__manufacturer'
         )
@@ -233,12 +233,12 @@ class VirtualMachineListView(ObjectListView):
     template_name = 'virtualization/virtualmachine_list.html'
 
 
-class VirtualMachineView(PermissionRequiredMixin, View):
-    permission_required = 'virtualization.view_virtualmachine'
+class VirtualMachineView(ObjectView):
+    queryset = VirtualMachine.objects.prefetch_related('tenant__group')
 
     def get(self, request, pk):
 
-        virtualmachine = get_object_or_404(VirtualMachine.objects.prefetch_related('tenant__group'), pk=pk)
+        virtualmachine = get_object_or_404(self.queryset, pk=pk)
         interfaces = Interface.objects.filter(virtual_machine=virtualmachine)
         services = Service.objects.filter(virtual_machine=virtualmachine)
 

From 91362b0f821bad2a0634eb6e582dbcbbe12d0745 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 15:53:50 -0400
Subject: [PATCH 031/505] Transition BulkCreateView to use
 ObjectPermissionRequiredMixin

---
 netbox/ipam/views.py      |  2 +-
 netbox/utilities/views.py | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 706f819cc..476943b13 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -721,7 +721,7 @@ class IPAddressDeleteView(ObjectDeleteView):
     default_return_url = 'ipam:ipaddress_list'
 
 
-class IPAddressBulkCreateView(PermissionRequiredMixin, BulkCreateView):
+class IPAddressBulkCreateView(BulkCreateView):
     permission_required = 'ipam.add_ipaddress'
     form = forms.IPAddressBulkCreateForm
     model_form = forms.IPAddressBulkAddForm
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index bd612b4df..ba1c18acc 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -468,20 +468,25 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class BulkCreateView(GetReturnURLMixin, View):
+class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Create new objects in bulk.
 
-    form: Form class which provides the `pattern` field
-    model_form: The ModelForm used to create individual objects
-    pattern_target: Name of the field to be evaluated as a pattern (if any)
-    template_name: The name of the template
+    :param queryset: Base queryset for the objects being created
+    :param form: Form class which provides the `pattern` field
+    :param model_form: The ModelForm used to create individual objects
+    :param pattern_target: Name of the field to be evaluated as a pattern (if any)
+    :param template_name: The name of the template
     """
+    queryset = None
     form = None
     model_form = None
     pattern_target = ''
     template_name = None
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'add')
+
     def get(self, request):
         # Set initial values for visible form fields from query args
         initial = {}
@@ -501,7 +506,7 @@ class BulkCreateView(GetReturnURLMixin, View):
 
     def post(self, request):
         logger = logging.getLogger('netbox.views.BulkCreateView')
-        model = self.model_form._meta.model
+        model = self.queryset.model
         form = self.form(request.POST)
         model_form = self.model_form(request.POST)
 
@@ -534,6 +539,10 @@ class BulkCreateView(GetReturnURLMixin, View):
                             # Raise an IntegrityError to break the for loop and abort the transaction.
                             raise IntegrityError()
 
+                    # Enforce object-level permissions
+                    if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs):
+                        raise ObjectDoesNotExist
+
                     # If we make it to this point, validation has succeeded on all new objects.
                     msg = "Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
                     logger.info(msg)
@@ -546,6 +555,11 @@ class BulkCreateView(GetReturnURLMixin, View):
             except IntegrityError:
                 pass
 
+            except ObjectDoesNotExist:
+                msg = "Object creation failed due to object-level permissions violation"
+                logger.debug(msg)
+                form.add_error(None, msg)
+
         else:
             logger.debug("Form validation failed")
 

From af8e1a647273bd991907884d2e1a738fea49bfaa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 16:00:18 -0400
Subject: [PATCH 032/505] Strip 'param' indicators from docstrings

---
 netbox/utilities/views.py | 62 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index ba1c18acc..cc0c7596d 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -122,7 +122,7 @@ class ObjectView(ObjectPermissionRequiredMixin, View):
     """
     Retrieve a single object for display.
 
-    :param queryset: The base queryset for retrieving the object.
+    queryset: The base queryset for retrieving the object.
     """
     queryset = None
 
@@ -134,11 +134,11 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
     """
     List a series of objects.
 
-    :param queryset: The queryset of objects to display
-    :param filter: A django-filter FilterSet that is applied to the queryset
-    :param filter_form: The form used to render filter options
-    :param table: The django-tables2 Table used to render the objects list
-    :param template_name: The name of the template
+    queryset: The queryset of objects to display
+    filter: A django-filter FilterSet that is applied to the queryset
+    filter_form: The form used to render filter options
+    table: The django-tables2 Table used to render the objects list
+    template_name: The name of the template
     """
     queryset = None
     filterset = None
@@ -294,9 +294,9 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Create or edit a single object.
 
-    :param queryset: The base queryset for the object being modified
-    :param model_form: The form used to create or edit the object
-    :param template_name: The name of the template
+    queryset: The base queryset for the object being modified
+    model_form: The form used to create or edit the object
+    template_name: The name of the template
     """
     queryset = None
     model_form = None
@@ -405,8 +405,8 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Delete a single object.
 
-    :param queryset: The base queryset for the object being deleted
-    :param template_name: The name of the template
+    queryset: The base queryset for the object being deleted
+    template_name: The name of the template
     """
     queryset = None
     template_name = 'utilities/obj_delete.html'
@@ -472,11 +472,11 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Create new objects in bulk.
 
-    :param queryset: Base queryset for the objects being created
-    :param form: Form class which provides the `pattern` field
-    :param model_form: The ModelForm used to create individual objects
-    :param pattern_target: Name of the field to be evaluated as a pattern (if any)
-    :param template_name: The name of the template
+    queryset: Base queryset for the objects being created
+    form: Form class which provides the `pattern` field
+    model_form: The ModelForm used to create individual objects
+    pattern_target: Name of the field to be evaluated as a pattern (if any)
+    template_name: The name of the template
     """
     queryset = None
     form = None
@@ -682,11 +682,11 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Import objects in bulk (CSV format).
 
-    :param queryset: Base queryset for the model
-    :param model_form: The form used to create each imported object
-    :param table: The django-tables2 Table used to render the list of imported objects
-    :param template_name: The name of the template
-    :param widget_attrs: A dict of attributes to apply to the import widget (e.g. to require a session key)
+    queryset: Base queryset for the model
+    model_form: The form used to create each imported object
+    table: The django-tables2 Table used to render the list of imported objects
+    template_name: The name of the template
+    widget_attrs: A dict of attributes to apply to the import widget (e.g. to require a session key)
     """
     queryset = None
     model_form = None
@@ -785,11 +785,11 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Edit objects in bulk.
 
-    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
-    :param filter: FilterSet to apply when deleting by QuerySet
-    :param table: The table used to display devices being edited
-    :param form: The form class used to edit objects in bulk
-    :param template_name: The name of the template
+    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
+    filter: FilterSet to apply when deleting by QuerySet
+    table: The table used to display devices being edited
+    form: The form class used to edit objects in bulk
+    template_name: The name of the template
     """
     queryset = None
     filterset = None
@@ -941,11 +941,11 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Delete objects in bulk.
 
-    :param queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
-    :param filter: FilterSet to apply when deleting by QuerySet
-    :param table: The table used to display devices being deleted
-    :param form: The form class used to delete objects in bulk
-    :param template_name: The name of the template
+    queryset: Custom queryset to use when retrieving objects (e.g. to select related objects)
+    filter: FilterSet to apply when deleting by QuerySet
+    table: The table used to display devices being deleted
+    form: The form class used to delete objects in bulk
+    template_name: The name of the template
     """
     queryset = None
     filterset = None

From 49b780358ed3a1deb59b4319be87fa2741df1344 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 16:11:46 -0400
Subject: [PATCH 033/505] Transition BulkRenameView, BulkDisconnectView to use
 ObjectPermissionRequiredMixin

---
 netbox/dcim/views.py | 68 ++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index fb60b6b31..34a482da8 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -23,6 +23,7 @@ from ipam.models import Prefix, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
+from utilities.permissions import get_permission_for_model
 from utilities.utils import csv_format
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, GetReturnURLMixin,
@@ -41,7 +42,7 @@ from .models import (
 )
 
 
-class BulkRenameView(GetReturnURLMixin, View):
+class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     An extendable view for renaming device components in bulk.
     """
@@ -49,9 +50,10 @@ class BulkRenameView(GetReturnURLMixin, View):
     form = None
     template_name = 'dcim/bulk_rename.html'
 
-    def post(self, request):
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'change')
 
-        model = self.queryset.model
+    def post(self, request):
 
         if '_preview' in request.POST or '_apply' in request.POST:
             form = self.form(request.POST, initial={'pk': request.POST.getlist('pk')})
@@ -76,7 +78,7 @@ class BulkRenameView(GetReturnURLMixin, View):
                         obj.save()
                     messages.success(request, "Renamed {} {}".format(
                         len(selected_objects),
-                        model._meta.verbose_name_plural
+                        self.queryset.model._meta.verbose_name_plural
                     ))
                     return redirect(self.get_return_url(request))
 
@@ -86,7 +88,7 @@ class BulkRenameView(GetReturnURLMixin, View):
 
         return render(request, self.template_name, {
             'form': form,
-            'obj_type_plural': model._meta.verbose_name_plural,
+            'obj_type_plural': self.queryset.model._meta.verbose_name_plural,
             'selected_objects': selected_objects,
             'return_url': self.get_return_url(request),
         })
@@ -96,10 +98,13 @@ class BulkDisconnectView(GetReturnURLMixin, View):
     """
     An extendable view for disconnection console/power/interface components in bulk.
     """
-    model = None
+    queryset = None
     form = None
     template_name = 'dcim/bulk_disconnect.html'
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'change')
+
     def post(self, request):
 
         selected_objects = []
@@ -113,25 +118,25 @@ class BulkDisconnectView(GetReturnURLMixin, View):
                 with transaction.atomic():
 
                     count = 0
-                    for obj in self.model.objects.filter(pk__in=form.cleaned_data['pk']):
+                    for obj in self.queryset.filter(pk__in=form.cleaned_data['pk']):
                         if obj.cable is None:
                             continue
                         obj.cable.delete()
                         count += 1
 
                 messages.success(request, "Disconnected {} {}".format(
-                    count, self.model._meta.verbose_name_plural
+                    count, self.queryset.model._meta.verbose_name_plural
                 ))
 
                 return redirect(return_url)
 
         else:
             form = self.form(initial={'pk': request.POST.getlist('pk')})
-            selected_objects = self.model.objects.filter(pk__in=form.initial['pk'])
+            selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
 
         return render(request, self.template_name, {
             'form': form,
-            'obj_type_plural': self.model._meta.verbose_name_plural,
+            'obj_type_plural': self.queryset.model._meta.verbose_name_plural,
             'selected_objects': selected_objects,
             'return_url': return_url,
         })
@@ -1285,15 +1290,13 @@ class ConsoleServerPortBulkEditView(BulkEditView):
     form = forms.ConsoleServerPortBulkEditForm
 
 
-class ConsoleServerPortBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_consoleserverport'
+class ConsoleServerPortBulkRenameView(BulkRenameView):
     queryset = ConsoleServerPort.objects.all()
     form = forms.ConsoleServerPortBulkRenameForm
 
 
-class ConsoleServerPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_consoleserverport'
-    model = ConsoleServerPort
+class ConsoleServerPortBulkDisconnectView(BulkDisconnectView):
+    queryset = ConsoleServerPort.objects.all()
     form = forms.ConsoleServerPortBulkDisconnectForm
 
 
@@ -1397,15 +1400,13 @@ class PowerOutletBulkEditView(BulkEditView):
     form = forms.PowerOutletBulkEditForm
 
 
-class PowerOutletBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_poweroutlet'
+class PowerOutletBulkRenameView(BulkRenameView):
     queryset = PowerOutlet.objects.all()
     form = forms.PowerOutletBulkRenameForm
 
 
-class PowerOutletBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_poweroutlet'
-    model = PowerOutlet
+class PowerOutletBulkDisconnectView(BulkDisconnectView):
+    queryset = PowerOutlet.objects.all()
     form = forms.PowerOutletBulkDisconnectForm
 
 
@@ -1496,15 +1497,13 @@ class InterfaceBulkEditView(BulkEditView):
     form = forms.InterfaceBulkEditForm
 
 
-class InterfaceBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_interface'
+class InterfaceBulkRenameView(BulkRenameView):
     queryset = Interface.objects.all()
     form = forms.InterfaceBulkRenameForm
 
 
-class InterfaceBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_interface'
-    model = Interface
+class InterfaceBulkDisconnectView(BulkDisconnectView):
+    queryset = Interface.objects.all()
     form = forms.InterfaceBulkDisconnectForm
 
 
@@ -1558,15 +1557,13 @@ class FrontPortBulkEditView(BulkEditView):
     form = forms.FrontPortBulkEditForm
 
 
-class FrontPortBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_frontport'
+class FrontPortBulkRenameView(BulkRenameView):
     queryset = FrontPort.objects.all()
     form = forms.FrontPortBulkRenameForm
 
 
-class FrontPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_frontport'
-    model = FrontPort
+class FrontPortBulkDisconnectView(BulkDisconnectView):
+    queryset = FrontPort.objects.all()
     form = forms.FrontPortBulkDisconnectForm
 
 
@@ -1620,15 +1617,13 @@ class RearPortBulkEditView(BulkEditView):
     form = forms.RearPortBulkEditForm
 
 
-class RearPortBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_rearport'
+class RearPortBulkRenameView(BulkRenameView):
     queryset = RearPort.objects.all()
     form = forms.RearPortBulkRenameForm
 
 
-class RearPortBulkDisconnectView(PermissionRequiredMixin, BulkDisconnectView):
-    permission_required = 'dcim.change_rearport'
-    model = RearPort
+class RearPortBulkDisconnectView(BulkDisconnectView):
+    queryset = RearPort.objects.all()
     form = forms.RearPortBulkDisconnectForm
 
 
@@ -1753,8 +1748,7 @@ class DeviceBayBulkEditView(BulkEditView):
     form = forms.DeviceBayBulkEditForm
 
 
-class DeviceBayBulkRenameView(PermissionRequiredMixin, BulkRenameView):
-    permission_required = 'dcim.change_devicebay'
+class DeviceBayBulkRenameView(BulkRenameView):
     queryset = DeviceBay.objects.all()
     form = forms.DeviceBayBulkRenameForm
 

From f36c797e98eb2345ee6927f3256e6b4ef701d3ed Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 16:28:11 -0400
Subject: [PATCH 034/505] Transition ComponentCreateView to use
 ObjectPermissionRequiredMixin

---
 netbox/dcim/views.py           | 90 ++++++++++++++--------------------
 netbox/utilities/views.py      | 49 ++++++++++++------
 netbox/virtualization/views.py |  5 +-
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 34a482da8..41269d0e0 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -671,9 +671,8 @@ class DeviceTypeBulkDeleteView(BulkDeleteView):
 # Console port templates
 #
 
-class ConsolePortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_consoleporttemplate'
-    model = ConsolePortTemplate
+class ConsolePortTemplateCreateView(ComponentCreateView):
+    queryset = ConsolePortTemplate.objects.all()
     form = forms.ConsolePortTemplateCreateForm
     model_form = forms.ConsolePortTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -703,9 +702,8 @@ class ConsolePortTemplateBulkDeleteView(BulkDeleteView):
 # Console server port templates
 #
 
-class ConsoleServerPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_consoleserverporttemplate'
-    model = ConsoleServerPortTemplate
+class ConsoleServerPortTemplateCreateView(ComponentCreateView):
+    queryset = ConsoleServerPortTemplate.objects.all()
     form = forms.ConsoleServerPortTemplateCreateForm
     model_form = forms.ConsoleServerPortTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -735,9 +733,8 @@ class ConsoleServerPortTemplateBulkDeleteView(BulkDeleteView):
 # Power port templates
 #
 
-class PowerPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_powerporttemplate'
-    model = PowerPortTemplate
+class PowerPortTemplateCreateView(ComponentCreateView):
+    queryset = PowerPortTemplate.objects.all()
     form = forms.PowerPortTemplateCreateForm
     model_form = forms.PowerPortTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -767,9 +764,8 @@ class PowerPortTemplateBulkDeleteView(BulkDeleteView):
 # Power outlet templates
 #
 
-class PowerOutletTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_poweroutlettemplate'
-    model = PowerOutletTemplate
+class PowerOutletTemplateCreateView(ComponentCreateView):
+    queryset = PowerOutletTemplate.objects.all()
     form = forms.PowerOutletTemplateCreateForm
     model_form = forms.PowerOutletTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -799,9 +795,8 @@ class PowerOutletTemplateBulkDeleteView(BulkDeleteView):
 # Interface templates
 #
 
-class InterfaceTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_interfacetemplate'
-    model = InterfaceTemplate
+class InterfaceTemplateCreateView(ComponentCreateView):
+    queryset = InterfaceTemplate.objects.all()
     form = forms.InterfaceTemplateCreateForm
     model_form = forms.InterfaceTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -831,9 +826,8 @@ class InterfaceTemplateBulkDeleteView(BulkDeleteView):
 # Front port templates
 #
 
-class FrontPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_frontporttemplate'
-    model = FrontPortTemplate
+class FrontPortTemplateCreateView(ComponentCreateView):
+    queryset = FrontPortTemplate.objects.all()
     form = forms.FrontPortTemplateCreateForm
     model_form = forms.FrontPortTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -863,9 +857,8 @@ class FrontPortTemplateBulkDeleteView(BulkDeleteView):
 # Rear port templates
 #
 
-class RearPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_rearporttemplate'
-    model = RearPortTemplate
+class RearPortTemplateCreateView(ComponentCreateView):
+    queryset = RearPortTemplate.objects.all()
     form = forms.RearPortTemplateCreateForm
     model_form = forms.RearPortTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -895,9 +888,8 @@ class RearPortTemplateBulkDeleteView(BulkDeleteView):
 # Device bay templates
 #
 
-class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_devicebaytemplate'
-    model = DeviceBayTemplate
+class DeviceBayTemplateCreateView(ComponentCreateView):
+    queryset = DeviceBayTemplate.objects.all()
     form = forms.DeviceBayTemplateCreateForm
     model_form = forms.DeviceBayTemplateForm
     template_name = 'dcim/device_component_add.html'
@@ -913,7 +905,6 @@ class DeviceBayTemplateDeleteView(ObjectDeleteView):
 
 
 # class DeviceBayTemplateBulkEditView(BulkEditView):
-#     permission_required = 'dcim.change_devicebaytemplate'
 #     queryset = DeviceBayTemplate.objects.all()
 #     table = tables.DeviceBayTemplateTable
 #     form = forms.DeviceBayTemplateBulkEditForm
@@ -1105,7 +1096,7 @@ class DeviceStatusView(ObjectView):
         })
 
 
-class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
+class DeviceLLDPNeighborsView(ObjectView):
     permission_required = ('dcim.view_device', 'dcim.napalm_read')
     queryset = Device.objects.all()
 
@@ -1123,7 +1114,7 @@ class DeviceLLDPNeighborsView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceConfigView(PermissionRequiredMixin, View):
+class DeviceConfigView(ObjectView):
     permission_required = ('dcim.view_device', 'dcim.napalm_read')
     queryset = Device.objects.all()
 
@@ -1209,9 +1200,8 @@ class ConsolePortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_consoleport'
-    model = ConsolePort
+class ConsolePortCreateView(ComponentCreateView):
+    queryset = ConsolePort.objects.all()
     form = forms.ConsolePortCreateForm
     model_form = forms.ConsolePortForm
     template_name = 'dcim/device_component_add.html'
@@ -1259,9 +1249,8 @@ class ConsoleServerPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_consoleserverport'
-    model = ConsoleServerPort
+class ConsoleServerPortCreateView(ComponentCreateView):
+    queryset = ConsoleServerPort.objects.all()
     form = forms.ConsoleServerPortCreateForm
     model_form = forms.ConsoleServerPortForm
     template_name = 'dcim/device_component_add.html'
@@ -1319,9 +1308,8 @@ class PowerPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_powerport'
-    model = PowerPort
+class PowerPortCreateView(ComponentCreateView):
+    queryset = PowerPort.objects.all()
     form = forms.PowerPortCreateForm
     model_form = forms.PowerPortForm
     template_name = 'dcim/device_component_add.html'
@@ -1369,9 +1357,8 @@ class PowerOutletListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_poweroutlet'
-    model = PowerOutlet
+class PowerOutletCreateView(ComponentCreateView):
+    queryset = PowerOutlet.objects.all()
     form = forms.PowerOutletCreateForm
     model_form = forms.PowerOutletForm
     template_name = 'dcim/device_component_add.html'
@@ -1465,9 +1452,8 @@ class InterfaceView(ObjectView):
         })
 
 
-class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_interface'
-    model = Interface
+class InterfaceCreateView(ComponentCreateView):
+    queryset = Interface.objects.all()
     form = forms.InterfaceCreateForm
     model_form = forms.InterfaceForm
     template_name = 'dcim/device_component_add.html'
@@ -1526,9 +1512,8 @@ class FrontPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_frontport'
-    model = FrontPort
+class FrontPortCreateView(ComponentCreateView):
+    queryset = FrontPort.objects.all()
     form = forms.FrontPortCreateForm
     model_form = forms.FrontPortForm
     template_name = 'dcim/device_component_add.html'
@@ -1586,9 +1571,8 @@ class RearPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_rearport'
-    model = RearPort
+class RearPortCreateView(ComponentCreateView):
+    queryset = RearPort.objects.all()
     form = forms.RearPortCreateForm
     model_form = forms.RearPortForm
     template_name = 'dcim/device_component_add.html'
@@ -1648,9 +1632,8 @@ class DeviceBayListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class DeviceBayCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_devicebay'
-    model = DeviceBay
+class DeviceBayCreateView(ComponentCreateView):
+    queryset = DeviceBay.objects.all()
     form = forms.DeviceBayCreateForm
     model_form = forms.DeviceBayForm
     template_name = 'dcim/device_component_add.html'
@@ -2144,9 +2127,8 @@ class InventoryItemEditView(ObjectEditView):
     model_form = forms.InventoryItemForm
 
 
-class InventoryItemCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_inventoryitem'
-    model = InventoryItem
+class InventoryItemCreateView(ComponentCreateView):
+    queryset = InventoryItem.objects.all()
     form = forms.InventoryItemCreateForm
     model_form = forms.InventoryItemForm
     template_name = 'dcim/device_component_add.html'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index cc0c7596d..c008b0501 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1033,28 +1033,32 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 #
 
 # TODO: Replace with BulkCreateView
-class ComponentCreateView(GetReturnURLMixin, View):
+class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Add one or more components (e.g. interfaces, console ports, etc.) to a Device or VirtualMachine.
     """
-    model = None
+    queryset = None
     form = None
     model_form = None
     template_name = None
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'add')
+
     def get(self, request):
 
         form = self.form(initial=request.GET)
 
         return render(request, self.template_name, {
-            'component_type': self.model._meta.verbose_name,
+            'component_type': self.queryset.model._meta.verbose_name,
             'form': form,
             'return_url': self.get_return_url(request),
         })
 
     def post(self, request):
-
+        logger = logging.getLogger('netbox.views.ComponentCreateView')
         form = self.form(request.POST, initial=request.GET)
+
         if form.is_valid():
 
             new_components = []
@@ -1080,20 +1084,35 @@ class ComponentCreateView(GetReturnURLMixin, View):
 
             if not form.errors:
 
-                # Create the new components
-                for component_form in new_components:
-                    component_form.save()
+                try:
 
-                messages.success(request, "Added {} {}".format(
-                    len(new_components), self.model._meta.verbose_name_plural
-                ))
-                if '_addanother' in request.POST:
-                    return redirect(request.get_full_path())
-                else:
-                    return redirect(self.get_return_url(request))
+                    with transaction.atomic():
+
+                        # Create the new components
+                        new_objs = []
+                        for component_form in new_components:
+                            obj = component_form.save()
+                            new_objs.append(obj)
+
+                        # Enforce object-level permissions
+                        if self.queryset.filter(pk__in=[obj.pk for obj in new_objs]).count() != len(new_objs):
+                            raise ObjectDoesNotExist
+
+                    messages.success(request, "Added {} {}".format(
+                        len(new_components), self.queryset.model._meta.verbose_name_plural
+                    ))
+                    if '_addanother' in request.POST:
+                        return redirect(request.get_full_path())
+                    else:
+                        return redirect(self.get_return_url(request))
+
+                except ObjectDoesNotExist:
+                    msg = "Component creation failed due to object-level permissions violation"
+                    logger.debug(msg)
+                    form.add_error(None, msg)
 
         return render(request, self.template_name, {
-            'component_type': self.model._meta.verbose_name,
+            'component_type': self.queryset.model._meta.verbose_name,
             'form': form,
             'return_url': self.get_return_url(request),
         })
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 53fcf9697..f7cf523d9 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -293,9 +293,8 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 # VM interfaces
 #
 
-class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
-    permission_required = 'dcim.add_interface'
-    model = Interface
+class InterfaceCreateView(ComponentCreateView):
+    queryset = Interface.objects.all()
     form = forms.InterfaceCreateForm
     model_form = forms.InterfaceForm
     template_name = 'virtualization/virtualmachine_component_add.html'

From e7fde2795f9fdd4c223f397c7e4c8448f855e83b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 21 May 2020 16:34:15 -0400
Subject: [PATCH 035/505] Fix BulkDisconnectView

---
 netbox/dcim/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 41269d0e0..29d5498c6 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -94,7 +94,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class BulkDisconnectView(GetReturnURLMixin, View):
+class BulkDisconnectView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     An extendable view for disconnection console/power/interface components in bulk.
     """

From 7e64d3e6536191e920cf998591bf6494f1a0d982 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 09:23:00 -0400
Subject: [PATCH 036/505] Transition BulkComponentCreateView to use
 ObjectPermissionRequiredMixin

---
 netbox/dcim/views.py           | 40 ++++++++++++++--------------------
 netbox/utilities/views.py      | 15 ++++++++++---
 netbox/virtualization/views.py |  5 ++---
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 29d5498c6..0f5ea01a9 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1747,96 +1747,88 @@ class DeviceBayBulkDeleteView(BulkDeleteView):
 # Bulk Device component creation
 #
 
-class DeviceBulkAddConsolePortView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_consoleport'
+class DeviceBulkAddConsolePortView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.ConsolePortBulkCreateForm
-    model = ConsolePort
+    queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddConsoleServerPortView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_consoleserverport'
+class DeviceBulkAddConsoleServerPortView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.ConsoleServerPortBulkCreateForm
-    model = ConsoleServerPort
+    queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddPowerPortView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_powerport'
+class DeviceBulkAddPowerPortView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.PowerPortBulkCreateForm
-    model = PowerPort
+    queryset = PowerPort.objects.all()
     model_form = forms.PowerPortForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddPowerOutletView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_poweroutlet'
+class DeviceBulkAddPowerOutletView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.PowerOutletBulkCreateForm
-    model = PowerOutlet
+    queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddInterfaceView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_interface'
+class DeviceBulkAddInterfaceView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.InterfaceBulkCreateForm
-    model = Interface
+    queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-# class DeviceBulkAddFrontPortView(PermissionRequiredMixin, BulkComponentCreateView):
-#     permission_required = 'dcim.add_frontport'
+# class DeviceBulkAddFrontPortView(BulkComponentCreateView):
 #     parent_model = Device
 #     parent_field = 'device'
 #     form = forms.FrontPortBulkCreateForm
-#     model = FrontPort
+#     queryset = FrontPort.objects.all()
 #     model_form = forms.FrontPortForm
 #     filterset = filters.DeviceFilterSet
 #     table = tables.DeviceTable
 #     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddRearPortView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_rearport'
+class DeviceBulkAddRearPortView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.RearPortBulkCreateForm
-    model = RearPort
+    queryset = RearPort.objects.all()
     model_form = forms.RearPortForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     default_return_url = 'dcim:device_list'
 
 
-class DeviceBulkAddDeviceBayView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_devicebay'
+class DeviceBulkAddDeviceBayView(BulkComponentCreateView):
     parent_model = Device
     parent_field = 'device'
     form = forms.DeviceBayBulkCreateForm
-    model = DeviceBay
+    queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayForm
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index c008b0501..87f63678a 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1118,14 +1118,14 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
         })
 
 
-class BulkComponentCreateView(GetReturnURLMixin, View):
+class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Add one or more components (e.g. interfaces, console ports, etc.) to a set of Devices or VirtualMachines.
     """
     parent_model = None
     parent_field = None
     form = None
-    model = None
+    queryset = None
     model_form = None
     filterset = None
     table = None
@@ -1134,7 +1134,7 @@ class BulkComponentCreateView(GetReturnURLMixin, View):
     def post(self, request):
         logger = logging.getLogger('netbox.views.BulkComponentCreateView')
         parent_model_name = self.parent_model._meta.verbose_name_plural
-        model_name = self.model._meta.verbose_name_plural
+        model_name = self.queryset.model._meta.verbose_name_plural
 
         # Are we editing *all* objects in the queryset or just a selected subset?
         if request.POST.get('_all') and self.filterset is not None:
@@ -1179,9 +1179,18 @@ class BulkComponentCreateView(GetReturnURLMixin, View):
                                         for e in errors:
                                             form.add_error(field, '{} {}: {}'.format(obj, name, ', '.join(e)))
 
+                        # Enforce object-level permissions
+                        if self.queryset.filter(pk__in=[obj.pk for obj in new_components]).count() != len(new_components):
+                            raise ObjectDoesNotExist
+
                 except IntegrityError:
                     pass
 
+                except ObjectDoesNotExist:
+                    msg = "Component creation failed due to object-level permissions violation"
+                    logger.debug(msg)
+                    form.add_error(None, msg)
+
                 if not form.errors:
                     msg = "Added {} {} to {} {}.".format(
                         len(new_components),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index f7cf523d9..e6d4f4946 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -325,12 +325,11 @@ class InterfaceBulkDeleteView(BulkDeleteView):
 # Bulk Device component creation
 #
 
-class VirtualMachineBulkAddInterfaceView(PermissionRequiredMixin, BulkComponentCreateView):
-    permission_required = 'dcim.add_interface'
+class VirtualMachineBulkAddInterfaceView(BulkComponentCreateView):
     parent_model = VirtualMachine
     parent_field = 'virtual_machine'
     form = forms.InterfaceBulkCreateForm
-    model = Interface
+    queryset = Interface.objects.all()
     model_form = forms.InterfaceForm
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable

From 71d4b5c5df03bdc4479207670f763686e597cb3d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 09:45:29 -0400
Subject: [PATCH 037/505] Enforce object-level permissions for circuit
 termination swap view

---
 netbox/circuits/urls.py  |  3 +-
 netbox/circuits/views.py | 71 +++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py
index 1a7fa283b..1c0f0715b 100644
--- a/netbox/circuits/urls.py
+++ b/netbox/circuits/urls.py
@@ -37,10 +37,9 @@ urlpatterns = [
     path('circuits/<int:pk>/edit/', views.CircuitEditView.as_view(), name='circuit_edit'),
     path('circuits/<int:pk>/delete/', views.CircuitDeleteView.as_view(), name='circuit_delete'),
     path('circuits/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='circuit_changelog', kwargs={'model': Circuit}),
-    path('circuits/<int:pk>/terminations/swap/', views.circuit_terminations_swap, name='circuit_terminations_swap'),
+    path('circuits/<int:pk>/terminations/swap/', views.CircuitSwapTerminations.as_view(), name='circuit_terminations_swap'),
 
     # Circuit terminations
-
     path('circuits/<int:circuit>/terminations/add/', views.CircuitTerminationEditView.as_view(), name='circuittermination_add'),
     path('circuit-terminations/<int:pk>/edit/', views.CircuitTerminationEditView.as_view(), name='circuittermination_edit'),
     path('circuit-terminations/<int:pk>/delete/', views.CircuitTerminationDeleteView.as_view(), name='circuittermination_delete'),
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 1f5f05230..bb4d787c8 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -1,6 +1,5 @@
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.decorators import permission_required
 from django.db import transaction
 from django.db.models import Count, OuterRef
 from django.shortcuts import get_object_or_404, redirect, render
@@ -191,25 +190,47 @@ class CircuitBulkDeleteView(BulkDeleteView):
     default_return_url = 'circuits:circuit_list'
 
 
-@permission_required('circuits.change_circuittermination')
-def circuit_terminations_swap(request, pk):
+class CircuitSwapTerminations(ObjectEditView):
+    """
+    Swap the A and Z terminations of a circuit.
+    """
+    queryset = Circuit.objects.all()
 
-    circuit = get_object_or_404(Circuit, pk=pk)
-    termination_a = CircuitTermination.objects.filter(
-        circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
-    ).first()
-    termination_z = CircuitTermination.objects.filter(
-        circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_Z
-    ).first()
-    if not termination_a and not termination_z:
-        messages.error(request, "No terminations have been defined for circuit {}.".format(circuit))
-        return redirect('circuits:circuit', pk=circuit.pk)
+    def get(self, request, pk):
+        circuit = get_object_or_404(self.queryset, pk=pk)
+        form = ConfirmationForm()
 
-    if request.method == 'POST':
+        # Circuit must have at least one termination to swap
+        if not circuit.termination_a and not circuit.termination_z:
+            messages.error(request, "No terminations have been defined for circuit {}.".format(circuit))
+            return redirect('circuits:circuit', pk=circuit.pk)
+
+        return render(request, 'circuits/circuit_terminations_swap.html', {
+            'circuit': circuit,
+            'termination_a': circuit.termination_a,
+            'termination_z': circuit.termination_z,
+            'form': form,
+            'panel_class': 'default',
+            'button_class': 'primary',
+            'return_url': circuit.get_absolute_url(),
+        })
+
+    def post(self, request, pk):
+        circuit = get_object_or_404(self.queryset, pk=pk)
         form = ConfirmationForm(request.POST)
+
         if form.is_valid():
+
+            termination_a = CircuitTermination.objects.filter(
+                circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
+            ).first()
+            termination_z = CircuitTermination.objects.filter(
+                circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_Z
+            ).first()
+
             if termination_a and termination_z:
                 # Use a placeholder to avoid an IntegrityError on the (circuit, term_side) unique constraint
+                print('swapping')
                 with transaction.atomic():
                     termination_a.term_side = '_'
                     termination_a.save()
@@ -223,21 +244,19 @@ def circuit_terminations_swap(request, pk):
             else:
                 termination_z.term_side = 'A'
                 termination_z.save()
+
             messages.success(request, "Swapped terminations for circuit {}.".format(circuit))
             return redirect('circuits:circuit', pk=circuit.pk)
 
-    else:
-        form = ConfirmationForm()
-
-    return render(request, 'circuits/circuit_terminations_swap.html', {
-        'circuit': circuit,
-        'termination_a': termination_a,
-        'termination_z': termination_z,
-        'form': form,
-        'panel_class': 'default',
-        'button_class': 'primary',
-        'return_url': circuit.get_absolute_url(),
-    })
+        return render(request, 'circuits/circuit_terminations_swap.html', {
+            'circuit': circuit,
+            'termination_a': circuit.termination_a,
+            'termination_z': circuit.termination_z,
+            'form': form,
+            'panel_class': 'default',
+            'button_class': 'primary',
+            'return_url': circuit.get_absolute_url(),
+        })
 
 
 #

From ab60a5d73d1519df25182e89e56a9ef45e94b687 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 09:51:57 -0400
Subject: [PATCH 038/505] Enforce object-level permissions for
 IPAddressAssignView, VLANGroupVLANsView

---
 netbox/ipam/views.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 476943b13..14c6a6864 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -1,6 +1,5 @@
 import netaddr
 from django.conf import settings
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Count, Q
 from django.db.models.expressions import RawSQL
 from django.shortcuts import get_object_or_404, redirect, render
@@ -11,7 +10,7 @@ from dcim.models import Device, Interface
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView,
-    ObjectListView,
+    ObjectListView, ObjectPermissionRequiredMixin,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
@@ -672,11 +671,11 @@ class IPAddressEditView(ObjectEditView):
         return obj
 
 
-class IPAddressAssignView(PermissionRequiredMixin, View):
+class IPAddressAssignView(ObjectPermissionRequiredMixin, View):
     """
     Search for IPAddresses to be assigned to an Interface.
     """
-    permission_required = 'ipam.change_ipaddress'
+    queryset = IPAddress.objects.all()
 
     def dispatch(self, request, *args, **kwargs):
 
@@ -687,7 +686,6 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
         return super().dispatch(request, *args, **kwargs)
 
     def get(self, request):
-
         form = forms.IPAddressAssignForm()
 
         return render(request, 'ipam/ipaddress_assign.html', {
@@ -696,13 +694,12 @@ class IPAddressAssignView(PermissionRequiredMixin, View):
         })
 
     def post(self, request):
-
         form = forms.IPAddressAssignForm(request.POST)
         table = None
 
         if form.is_valid():
 
-            addresses = IPAddress.objects.prefetch_related(
+            addresses = self.queryset.prefetch_related(
                 'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
             )
             # Limit to 100 results
@@ -784,12 +781,11 @@ class VLANGroupBulkDeleteView(BulkDeleteView):
     default_return_url = 'ipam:vlangroup_list'
 
 
-class VLANGroupVLANsView(PermissionRequiredMixin, View):
-    permission_required = 'ipam.view_vlangroup'
+class VLANGroupVLANsView(ObjectView):
+    queryset = VLANGroup.objects.all()
 
     def get(self, request, pk):
-
-        vlan_group = get_object_or_404(VLANGroup.objects.all(), pk=pk)
+        vlan_group = get_object_or_404(self.queryset, pk=pk)
 
         vlans = VLAN.objects.filter(group_id=pk)
         vlans = add_available_vlans(vlan_group, vlans)

From bae050e68952525d02d518024ceba992f8d86e5a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 11:24:49 -0400
Subject: [PATCH 039/505] Replace legacy add/edit secret views with
 SecretEditView

---
 netbox/secrets/decorators.py              |  24 ----
 netbox/secrets/urls.py                    |   4 +-
 netbox/secrets/views.py                   | 135 ++++++++--------------
 netbox/templates/secrets/secret_edit.html |  14 +--
 4 files changed, 58 insertions(+), 119 deletions(-)
 delete mode 100644 netbox/secrets/decorators.py

diff --git a/netbox/secrets/decorators.py b/netbox/secrets/decorators.py
deleted file mode 100644
index e2f44ac90..000000000
--- a/netbox/secrets/decorators.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from django.contrib import messages
-from django.shortcuts import redirect
-
-from .models import UserKey
-
-
-def userkey_required():
-    """
-    Decorator for views which require that the user has an active UserKey (typically for encryption/decryption of
-    Secrets).
-    """
-    def _decorator(view):
-        def wrapped_view(request, *args, **kwargs):
-            try:
-                uk = UserKey.objects.get(user=request.user)
-            except UserKey.DoesNotExist:
-                messages.warning(request, "This operation requires an active user key, but you don't have one.")
-                return redirect('user:userkey')
-            if not uk.is_active():
-                messages.warning(request, "This operation is not available. Your user key has not been activated.")
-                return redirect('user:userkey')
-            return view(request, *args, **kwargs)
-        return wrapped_view
-    return _decorator
diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py
index ac75a7ed4..84c2da398 100644
--- a/netbox/secrets/urls.py
+++ b/netbox/secrets/urls.py
@@ -17,12 +17,12 @@ urlpatterns = [
 
     # Secrets
     path('secrets/', views.SecretListView.as_view(), name='secret_list'),
-    path('secrets/add/', views.secret_add, name='secret_add'),
+    path('secrets/add/', views.SecretEditView.as_view(), name='secret_add'),
     path('secrets/import/', views.SecretBulkImportView.as_view(), name='secret_import'),
     path('secrets/edit/', views.SecretBulkEditView.as_view(), name='secret_bulk_edit'),
     path('secrets/delete/', views.SecretBulkDeleteView.as_view(), name='secret_bulk_delete'),
     path('secrets/<int:pk>/', views.SecretView.as_view(), name='secret'),
-    path('secrets/<int:pk>/edit/', views.secret_edit, name='secret_edit'),
+    path('secrets/<int:pk>/edit/', views.SecretEditView.as_view(), name='secret_edit'),
     path('secrets/<int:pk>/delete/', views.SecretDeleteView.as_view(), name='secret_delete'),
     path('secrets/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='secret_changelog', kwargs={'model': Secret}),
 
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index a2e627a7c..a5aabaecd 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -1,20 +1,17 @@
 import base64
+import logging
 
 from django.contrib import messages
-from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
-from django.urls import reverse
-from django.views.generic import View
+from django.utils.html import escape
+from django.utils.safestring import mark_safe
 
 from utilities.views import (
-    BulkDeleteView, BulkEditView, BulkImportView, GetReturnURLMixin, ObjectView, ObjectDeleteView, ObjectEditView,
-    ObjectListView,
+    BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
-from .decorators import userkey_required
-from .models import SecretRole, Secret, SessionKey
+from .models import SecretRole, Secret, SessionKey, UserKey
 
 
 def get_session_key(request):
@@ -79,107 +76,73 @@ class SecretView(ObjectView):
         })
 
 
-@permission_required('secrets.add_secret')
-@userkey_required()
-def secret_add(request):
+class SecretEditView(ObjectEditView):
+    queryset = Secret.objects.all()
+    model_form = forms.SecretForm
+    template_name = 'secrets/secret_edit.html'
 
-    secret = Secret()
-    session_key = get_session_key(request)
+    def dispatch(self, request, *args, **kwargs):
+
+        # Check that the user has a valid UserKey
+        try:
+            uk = UserKey.objects.get(user=request.user)
+        except UserKey.DoesNotExist:
+            messages.warning(request, "This operation requires an active user key, but you don't have one.")
+            return redirect('user:userkey')
+        if not uk.is_active():
+            messages.warning(request, "This operation is not available. Your user key has not been activated.")
+            return redirect('user:userkey')
+
+        return super().dispatch(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        logger = logging.getLogger('netbox.views.ObjectEditView')
+        session_key = get_session_key(request)
+        secret = self.get_object(kwargs)
+        form = self.model_form(request.POST, instance=secret)
 
-    if request.method == 'POST':
-        form = forms.SecretForm(request.POST, instance=secret)
         if form.is_valid():
+            logger.debug("Form validation was successful")
 
-            # We need a valid session key in order to create a Secret
-            if session_key is None:
+            # We must have a session key in order to create a secret or update the plaintext of an existing secret
+            if (form.cleaned_data['plaintext'] or secret.pk is None) and session_key is None:
+                logger.debug("Unable to proceed: No session key was provided with the request")
                 form.add_error(None, "No session key was provided with the request. Unable to encrypt secret data.")
 
-            # Create and encrypt the new Secret
             else:
                 master_key = None
                 try:
                     sk = SessionKey.objects.get(userkey__user=request.user)
                     master_key = sk.get_master_key(session_key)
                 except SessionKey.DoesNotExist:
+                    logger.debug("Unable to proceed: User has no session key assigned")
                     form.add_error(None, "No session key found for this user.")
 
                 if master_key is not None:
+                    logger.debug("Successfully resolved master key for encryption")
                     secret = form.save(commit=False)
-                    secret.plaintext = str(form.cleaned_data['plaintext'])
+                    if form.cleaned_data['plaintext']:
+                        secret.plaintext = str(form.cleaned_data['plaintext'])
                     secret.encrypt(master_key)
                     secret.save()
                     form.save_m2m()
 
-                    messages.success(request, "Added new secret: {}.".format(secret))
-                    if '_addanother' in request.POST:
-                        return redirect('secrets:secret_add')
-                    else:
-                        return redirect('secrets:secret', pk=secret.pk)
+                    msg = '{} secret'.format('Created' if not form.instance.pk else 'Modified')
+                    logger.info(f"{msg} {secret} (PK: {secret.pk})")
+                    msg = '{} <a href="{}">{}</a>'.format(msg, secret.get_absolute_url(), escape(secret))
+                    messages.success(request, mark_safe(msg))
 
-    else:
-        initial_data = {
-            'device': request.GET.get('device'),
-        }
-        form = forms.SecretForm(initial=initial_data)
+                    return redirect(self.get_return_url(request, secret))
 
-    return render(request, 'secrets/secret_edit.html', {
-        'secret': secret,
-        'form': form,
-        'return_url': GetReturnURLMixin().get_return_url(request, secret)
-    })
+        else:
+            logger.debug("Form validation failed")
 
-
-@permission_required('secrets.change_secret')
-@userkey_required()
-def secret_edit(request, pk):
-
-    secret = get_object_or_404(Secret, pk=pk)
-    session_key = get_session_key(request)
-
-    if request.method == 'POST':
-        form = forms.SecretForm(request.POST, instance=secret)
-        if form.is_valid():
-
-            # Re-encrypt the Secret if a plaintext and session key have been provided.
-            if form.cleaned_data['plaintext'] and session_key is not None:
-
-                # Retrieve the master key using the provided session key
-                master_key = None
-                try:
-                    sk = SessionKey.objects.get(userkey__user=request.user)
-                    master_key = sk.get_master_key(session_key)
-                except SessionKey.DoesNotExist:
-                    form.add_error(None, "No session key found for this user.")
-
-                # Create and encrypt the new Secret
-                if master_key is not None:
-                    secret = form.save(commit=False)
-                    secret.plaintext = form.cleaned_data['plaintext']
-                    secret.encrypt(master_key)
-                    secret.save()
-                    messages.success(request, "Modified secret {}.".format(secret))
-                    return redirect('secrets:secret', pk=secret.pk)
-                else:
-                    form.add_error(None, "Invalid session key. Unable to encrypt secret data.")
-
-            # We can't save the plaintext without a session key.
-            elif form.cleaned_data['plaintext']:
-                form.add_error(None, "No session key was provided with the request. Unable to encrypt secret data.")
-
-            # If no new plaintext was specified, a session key is not needed.
-            else:
-                secret = form.save()
-                messages.success(request, "Modified secret {}.".format(secret))
-                return redirect('secrets:secret', pk=secret.pk)
-
-    else:
-        form = forms.SecretForm(instance=secret)
-
-    return render(request, 'secrets/secret_edit.html', {
-        'secret': secret,
-        'form': form,
-        'return_url': reverse('secrets:secret', kwargs={'pk': secret.pk}),
-    })
+        return render(request, self.template_name, {
+            'obj': secret,
+            'obj_type': self.queryset.model._meta.verbose_name,
+            'form': form,
+            'return_url': self.get_return_url(request, secret),
+        })
 
 
 class SecretDeleteView(ObjectDeleteView):
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html
index cb3935521..6893e2d14 100644
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -9,7 +9,7 @@
     {{ form.private_key }}
     <div class="row">
         <div class="col-md-6 col-md-offset-3">
-            <h3>{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}</h3>
+            <h3>{% block title %}{% if obj.pk %}Editing {{ obj }}{% else %}Add a Secret{% endif %}{% endblock %}</h3>
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
@@ -30,17 +30,17 @@
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>Secret Data</strong></div>
                 <div class="panel-body">
-                    {% if secret.pk and secret|decryptable_by:request.user %}
+                    {% if obj.pk and obj|decryptable_by:request.user %}
                         <div class="form-group">
                             <label class="col-md-3 control-label required">Current Plaintext</label>
                             <div class="col-md-7">
-                                <p class="form-control-static" id="secret_{{ secret.pk }}">********</p>
+                                <p class="form-control-static" id="secret_{{ obj.pk }}">********</p>
                             </div>
                             <div class="col-md-2 text-right">
-                                <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
+                                <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ obj.pk }}">
                                     <i class="fa fa-lock"></i> Unlock
                                 </button>
-                                <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
+                                <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ obj.pk }}">
                                     <i class="fa fa-unlock-alt"></i> Lock
                                 </button>
                             </div>
@@ -69,9 +69,9 @@
     <div class="row">
         <div class="form-group">
             <div class="col-md-12 text-center">
-                {% if secret.pk %}
+                {% if obj.pk %}
                     <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                    <a href="{% url 'secrets:secret' pk=secret.pk %}" class="btn btn-default">Cancel</a>
+                    <a href="{% url 'secrets:secret' pk=obj.pk %}" class="btn btn-default">Cancel</a>
                 {% else %}
                     <button type="submit" name="_create" class="btn btn-primary">Create</button>
                     <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>

From 5282ae2250adebf1c1cdb7e3581bc492025ff4d2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 11:30:46 -0400
Subject: [PATCH 040/505] Enforce object-level permissions for cluster
 add/remove devices views

---
 netbox/virtualization/views.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index e6d4f4946..20cd5e9b1 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -4,7 +4,6 @@ from django.db import transaction
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.views.generic import View
 
 from dcim.models import Device, Interface
 from dcim.tables import DeviceTable
@@ -137,14 +136,13 @@ class ClusterBulkDeleteView(BulkDeleteView):
     default_return_url = 'virtualization:cluster_list'
 
 
-class ClusterAddDevicesView(PermissionRequiredMixin, View):
-    permission_required = 'virtualization.change_cluster'
+class ClusterAddDevicesView(ObjectEditView):
+    queryset = Cluster.objects.all()
     form = forms.ClusterAddDevicesForm
     template_name = 'virtualization/cluster_add_devices.html'
 
     def get(self, request, pk):
-
-        cluster = get_object_or_404(Cluster, pk=pk)
+        cluster = get_object_or_404(self.queryset, pk=pk)
         form = self.form(cluster, initial=request.GET)
 
         return render(request, self.template_name, {
@@ -154,8 +152,7 @@ class ClusterAddDevicesView(PermissionRequiredMixin, View):
         })
 
     def post(self, request, pk):
-
-        cluster = get_object_or_404(Cluster, pk=pk)
+        cluster = get_object_or_404(self.queryset, pk=pk)
         form = self.form(cluster, request.POST)
 
         if form.is_valid():
@@ -180,14 +177,14 @@ class ClusterAddDevicesView(PermissionRequiredMixin, View):
         })
 
 
-class ClusterRemoveDevicesView(PermissionRequiredMixin, View):
-    permission_required = 'virtualization.change_cluster'
+class ClusterRemoveDevicesView(ObjectEditView):
+    queryset = Cluster.objects.all()
     form = forms.ClusterRemoveDevicesForm
     template_name = 'utilities/obj_bulk_remove.html'
 
     def post(self, request, pk):
 
-        cluster = get_object_or_404(Cluster, pk=pk)
+        cluster = get_object_or_404(self.queryset, pk=pk)
 
         if '_confirm' in request.POST:
             form = self.form(request.POST)

From 781334b6156df6f55590f2c92ce7253a41fc4281 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 11:51:04 -0400
Subject: [PATCH 041/505] Enforce object-level permissions for
 RackElevationListView

---
 netbox/dcim/views.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0f5ea01a9..d7e0a336a 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -329,16 +329,15 @@ class RackListView(ObjectListView):
     table = tables.RackDetailTable
 
 
-class RackElevationListView(PermissionRequiredMixin, View):
+class RackElevationListView(ObjectListView):
     """
     Display a set of rack elevations side-by-side.
     """
-    permission_required = 'dcim.view_rack'
+    queryset = Rack.objects.prefetch_related('role')
 
     def get(self, request):
 
-        racks = Rack.objects.prefetch_related('role')
-        racks = filters.RackFilterSet(request.GET, racks).qs
+        racks = filters.RackFilterSet(request.GET, self.queryset).qs
         total_count = racks.count()
 
         # Pagination

From eb9147a5752e7288005a18e195b9ec0c8a2933d6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 11:52:19 -0400
Subject: [PATCH 042/505] Enforce object-level permissions for DeviceBay
 population views

---
 netbox/dcim/views.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d7e0a336a..733571369 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1647,12 +1647,11 @@ class DeviceBayDeleteView(ObjectDeleteView):
     queryset = DeviceBay.objects.all()
 
 
-class DeviceBayPopulateView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_devicebay'
+class DeviceBayPopulateView(ObjectEditView):
+    queryset = DeviceBay.objects.all()
 
     def get(self, request, pk):
-
-        device_bay = get_object_or_404(DeviceBay, pk=pk)
+        device_bay = get_object_or_404(self.queryset, pk=pk)
         form = forms.PopulateDeviceBayForm(device_bay)
 
         return render(request, 'dcim/devicebay_populate.html', {
@@ -1662,8 +1661,7 @@ class DeviceBayPopulateView(PermissionRequiredMixin, View):
         })
 
     def post(self, request, pk):
-
-        device_bay = get_object_or_404(DeviceBay, pk=pk)
+        device_bay = get_object_or_404(self.queryset, pk=pk)
         form = forms.PopulateDeviceBayForm(device_bay, request.POST)
 
         if form.is_valid():
@@ -1681,12 +1679,12 @@ class DeviceBayPopulateView(PermissionRequiredMixin, View):
         })
 
 
-class DeviceBayDepopulateView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.change_devicebay'
+class DeviceBayDepopulateView(ObjectEditView):
+    queryset = DeviceBay.objects.all()
 
     def get(self, request, pk):
 
-        device_bay = get_object_or_404(DeviceBay, pk=pk)
+        device_bay = get_object_or_404(self.queryset, pk=pk)
         form = ConfirmationForm()
 
         return render(request, 'dcim/devicebay_depopulate.html', {
@@ -1697,7 +1695,7 @@ class DeviceBayDepopulateView(PermissionRequiredMixin, View):
 
     def post(self, request, pk):
 
-        device_bay = get_object_or_404(DeviceBay, pk=pk)
+        device_bay = get_object_or_404(self.queryset, pk=pk)
         form = ConfirmationForm(request.POST)
 
         if form.is_valid():

From 1bce148be24216374f35fe486057b767a789465e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 11:55:56 -0400
Subject: [PATCH 043/505] Enforce object-level permissions for
 ObjectConfigContextView

---
 netbox/dcim/views.py           | 5 ++---
 netbox/extras/views.py         | 7 +++----
 netbox/virtualization/views.py | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 733571369..f55d9fd96 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1127,9 +1127,8 @@ class DeviceConfigView(ObjectView):
         })
 
 
-class DeviceConfigContextView(PermissionRequiredMixin, ObjectConfigContextView):
-    permission_required = 'dcim.view_device'
-    object_class = Device
+class DeviceConfigContextView(ObjectConfigContextView):
+    queryset = Device.objects.all()
     base_template = 'dcim/device.html'
 
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 78db8f24a..77e5cb0e0 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -154,15 +154,14 @@ class ConfigContextBulkDeleteView(BulkDeleteView):
     default_return_url = 'extras:configcontext_list'
 
 
-class ObjectConfigContextView(View):
-    object_class = None
+class ObjectConfigContextView(ObjectView):
     base_template = None
 
     def get(self, request, pk):
 
-        obj = get_object_or_404(self.object_class, pk=pk)
+        obj = get_object_or_404(self.queryset, pk=pk)
         source_contexts = ConfigContext.objects.get_for_object(obj)
-        model_name = self.object_class._meta.model_name
+        model_name = self.queryset.model._meta.model_name
 
         # Determine user's preferred output format
         if request.GET.get('format') in ['json', 'yaml']:
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 20cd5e9b1..79a807c21 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -1,5 +1,4 @@
 from django.contrib import messages
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import transaction
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
@@ -246,9 +245,8 @@ class VirtualMachineView(ObjectView):
         })
 
 
-class VirtualMachineConfigContextView(PermissionRequiredMixin, ObjectConfigContextView):
-    permission_required = 'virtualization.view_virtualmachine'
-    object_class = VirtualMachine
+class VirtualMachineConfigContextView(ObjectConfigContextView):
+    queryset = VirtualMachine.objects.all()
     base_template = 'virtualization/virtualmachine.html'
 
 

From 581dc4e0703adc996737bb0e2092623ff386c729 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 12:05:34 -0400
Subject: [PATCH 044/505] Enforce object-level permissions for CableTraceView

---
 netbox/dcim/views.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index f55d9fd96..3c0010859 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1857,15 +1857,21 @@ class CableView(ObjectView):
         })
 
 
-class CableTraceView(PermissionRequiredMixin, View):
+class CableTraceView(ObjectPermissionRequiredMixin, View):
     """
     Trace a cable path beginning from the given termination.
     """
     permission_required = 'dcim.view_cable'
 
-    def get(self, request, model, pk):
+    def dispatch(self, request, *args, **kwargs):
+        model = kwargs.pop('model')
+        self.queryset = model.objects.all()
 
-        obj = get_object_or_404(model, pk=pk)
+        return super().dispatch(request, *args, **kwargs)
+
+    def get(self, request, pk):
+
+        obj = get_object_or_404(self.queryset, pk=pk)
         path, split_ends = obj.trace()
         total_length = sum(
             [entry[1]._abs_length for entry in path if entry[1] and entry[1]._abs_length]

From 3ef4287d57b95462ff63f2cfb0eb8d0fcf4b8c8a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 12:41:20 -0400
Subject: [PATCH 045/505] Add additional_permissions to
 ObjectPermissionRequiredMixin

---
 netbox/dcim/views.py      | 12 +++++-------
 netbox/ipam/views.py      |  4 +---
 netbox/utilities/views.py | 16 ++++++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 3c0010859..2dfe0f207 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1082,7 +1082,7 @@ class DeviceInventoryView(ObjectView):
 
 
 class DeviceStatusView(ObjectView):
-    permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    additional_permissions = ['dcim.napalm_read']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1096,7 +1096,7 @@ class DeviceStatusView(ObjectView):
 
 
 class DeviceLLDPNeighborsView(ObjectView):
-    permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    additional_permissions = ['dcim.napalm_read']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1114,7 +1114,7 @@ class DeviceLLDPNeighborsView(ObjectView):
 
 
 class DeviceConfigView(ObjectView):
-    permission_required = ('dcim.view_device', 'dcim.napalm_read')
+    additional_permissions = ['dcim.napalm_read']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1857,11 +1857,11 @@ class CableView(ObjectView):
         })
 
 
-class CableTraceView(ObjectPermissionRequiredMixin, View):
+class CableTraceView(ObjectView):
     """
     Trace a cable path beginning from the given termination.
     """
-    permission_required = 'dcim.view_cable'
+    additional_permissions = ['dcim.view_cable']
 
     def dispatch(self, request, *args, **kwargs):
         model = kwargs.pop('model')
@@ -2006,7 +2006,6 @@ class CableBulkDeleteView(BulkDeleteView):
 #
 
 class ConsoleConnectionsListView(ObjectListView):
-    permission_required = ('dcim.view_consoleport', 'dcim.view_consoleserverport')
     queryset = ConsolePort.objects.prefetch_related(
         'device', 'connected_endpoint__device'
     ).filter(
@@ -2038,7 +2037,6 @@ class ConsoleConnectionsListView(ObjectListView):
 
 
 class PowerConnectionsListView(ObjectListView):
-    permission_required = ('dcim.view_powerport', 'dcim.view_poweroutlet')
     queryset = PowerPort.objects.prefetch_related(
         'device', '_connected_poweroutlet__device'
     ).filter(
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 14c6a6864..d3b604be6 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -671,7 +671,7 @@ class IPAddressEditView(ObjectEditView):
         return obj
 
 
-class IPAddressAssignView(ObjectPermissionRequiredMixin, View):
+class IPAddressAssignView(ObjectView):
     """
     Search for IPAddresses to be assigned to an Interface.
     """
@@ -719,7 +719,6 @@ class IPAddressDeleteView(ObjectDeleteView):
 
 
 class IPAddressBulkCreateView(BulkCreateView):
-    permission_required = 'ipam.add_ipaddress'
     form = forms.IPAddressBulkCreateForm
     model_form = forms.IPAddressBulkAddForm
     pattern_target = 'address'
@@ -761,7 +760,6 @@ class VLANGroupListView(ObjectListView):
 
 
 class VLANGroupEditView(ObjectEditView):
-    permission_required = 'ipam.add_vlangroup'
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupForm
     default_return_url = 'ipam:vlangroup_list'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 87f63678a..b586342e1 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -43,18 +43,24 @@ class ObjectPermissionRequiredMixin(AccessMixin):
     Similar to Django's built-in PermissionRequiredMixin, but extended to check for both model-level and object-level
     permission assignments. If the user has only object-level permissions assigned, the view's queryset is filtered
     to return only those objects on which the user is permitted to perform the specified action.
+
+    additional_permissions: An optional iterable of statically declared permissions to evaluate in addition to those
+                            derived from the object type
     """
-    permission_required = None
+    additional_permissions = list()
 
     def get_required_permission(self):
-        return self.permission_required
+        """
+        Return the specific permission necessary to perform the requested action on an object.
+        """
+        raise NotImplementedError(f"{self.__class__.__name__} must implement get_required_permission()")
 
     def has_permission(self):
         user = self.request.user
         permission_required = self.get_required_permission()
 
-        # First, check that the user is granted the required permission at either the model or object level.
-        if not user.has_perm(permission_required):
+        # First, check that the user is granted the required permission(s) at either the model or object level.
+        if not user.has_perms((permission_required, *self.additional_permissions)):
             return False
 
         # Superusers implicitly have all permissions
@@ -148,8 +154,6 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
     action_buttons = ('add', 'import', 'export')
 
     def get_required_permission(self):
-        if getattr(self, 'permission_required') is not None:
-            return self.permission_required
         return get_permission_for_model(self.queryset.model, 'view')
 
     def queryset_to_yaml(self):

From ae7445ee8e6651bd0d99521ab6e21c014840ffab Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 14:53:52 -0400
Subject: [PATCH 046/505] Test object permissions for individual/list model
 views

---
 netbox/utilities/testing/testcases.py | 294 ++++++++++++++++++++------
 netbox/utilities/views.py             |   1 +
 2 files changed, 233 insertions(+), 62 deletions(-)

diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index de8b93232..f6b5cdfd4 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -1,3 +1,4 @@
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import Permission, User
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms.models import model_to_dict
@@ -5,7 +6,8 @@ from django.test import Client, TestCase as _TestCase, override_settings
 from django.urls import reverse, NoReverseMatch
 from rest_framework.test import APIClient
 
-from users.models import Token
+from users.models import ObjectPermission, Token
+from utilities.permissions import get_permission_for_model
 from .utils import disable_warnings, post_data
 
 
@@ -150,19 +152,41 @@ class ViewTestCases:
         Retrieve a single instance.
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_get_object(self):
+        def test_get_object_without_permission(self):
             instance = self.model.objects.first()
 
-            # Attempt to make the request without required permissions
+            # Try GET without permission
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
 
-            # Assign the required permission and submit again
-            self.add_permissions(
-                '{}.view_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_get_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Add model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'view'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_get_object_with_object_permission(self):
+            instance1, instance2 = self.model.objects.all()[:2]
+
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk': instance1.pk},
+                can_view=True
             )
-            response = self.client.get(instance.get_absolute_url())
-            self.assertHttpStatus(response, 200)
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try GET to permitted object
+            self.assertHttpStatus(self.client.get(instance1.get_absolute_url()), 200)
+
+            # Try GET to non-permitted object
+            self.assertHttpStatus(self.client.get(instance2.get_absolute_url()), 404)
 
     class CreateObjectViewTestCase(ModelViewTestCase):
         """
@@ -171,33 +195,74 @@ class ViewTestCases:
         form_data = {}
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_create_object(self):
+        def test_create_object_without_permission(self):
 
             # Try GET without permission
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('add')), 403)
 
-            # Try GET with permission
-            self.add_permissions(
-                '{}.add_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.get(path=self._get_url('add'))
-            self.assertHttpStatus(response, 200)
+            # Try POST without permission
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.form_data),
+            }
+            response = self.client.post(**request)
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(response, 403)
 
-            # Try POST with permission
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_create_object_with_model_permission(self):
+            initial_count = self.model.objects.count()
+
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'add'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertEqual(initial_count + 1, self.model.objects.count())
+            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_create_object_with_object_permission(self):
+            initial_count = self.model.objects.count()
+            next_pk = self.model.objects.order_by('pk').last().pk + 1
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk__gt': next_pk},
+                can_add=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try GET with object-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
+
+            # Try to create permitted object
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertEqual(initial_count + 1, self.model.objects.count())
+            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+
+            # Try to create a non-permitted object
             initial_count = self.model.objects.count()
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.form_data),
-                'follow': False,  # Do not follow 302 redirects
             }
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 302)
-
-            # Validate object creation
-            self.assertEqual(initial_count + 1, self.model.objects.count())
-            instance = self.model.objects.order_by('-pk').first()
-            self.assertInstanceEqual(instance, self.form_data)
+            self.assertHttpStatus(self.client.post(**request), 200)
+            self.assertEqual(initial_count, self.model.objects.count())  # Check that no object was created
 
     class EditObjectViewTestCase(ModelViewTestCase):
         """
@@ -206,80 +271,167 @@ class ViewTestCases:
         form_data = {}
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_edit_object(self):
+        def test_edit_object_without_permission(self):
             instance = self.model.objects.first()
 
             # Try GET without permission
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('edit', instance)), 403)
 
-            # Try GET with permission
-            self.add_permissions(
-                '{}.change_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.get(path=self._get_url('edit', instance))
-            self.assertHttpStatus(response, 200)
-
-            # Try POST with permission
+            # Try POST without permission
             request = {
                 'path': self._get_url('edit', instance),
                 'data': post_data(self.form_data),
-                'follow': False,  # Do not follow 302 redirects
             }
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 302)
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(**request), 403)
 
-            # Validate object modifications
-            instance = self.model.objects.get(pk=instance.pk)
-            self.assertInstanceEqual(instance, self.form_data)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_edit_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'change'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('edit', instance),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_edit_object_with_object_permission(self):
+            instance1, instance2 = self.model.objects.all()[:2]
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk': instance1.pk},
+                can_change=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try GET with a permitted object
+            self.assertHttpStatus(self.client.get(self._get_url('edit', instance1)), 200)
+
+            # Try GET with a non-permitted object
+            self.assertHttpStatus(self.client.get(self._get_url('edit', instance2)), 404)
+
+            # Try to edit a permitted object
+            request = {
+                'path': self._get_url('edit', instance1),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertInstanceEqual(self.model.objects.get(pk=instance1.pk), self.form_data)
+
+            # Try to edit a non-permitted object
+            request = {
+                'path': self._get_url('edit', instance2),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 404)
 
     class DeleteObjectViewTestCase(ModelViewTestCase):
         """
         Delete a single instance.
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_delete_object(self):
+        def test_delete_object_without_permission(self):
             instance = self.model.objects.first()
 
-            # Try GET without permissions
+            # Try GET without permission
             with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(self._get_url('delete', instance)), 403)
-
-            # Try GET with permission
-            self.add_permissions(
-                '{}.delete_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.get(path=self._get_url('delete', instance))
-            self.assertHttpStatus(response, 200)
+                self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
 
+            # Try POST without permission
             request = {
                 'path': self._get_url('delete', instance),
-                'data': {'confirm': True},
-                'follow': False,  # Do not follow 302 redirects
+                'data': post_data({'confirm': True}),
             }
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 302)
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(**request), 403)
 
-            # Validate object deletion
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_delete_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'delete'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('delete', instance),
+                'data': post_data({'confirm': True}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
             with self.assertRaises(ObjectDoesNotExist):
                 self.model.objects.get(pk=instance.pk)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_delete_object_with_object_permission(self):
+            instance1, instance2 = self.model.objects.all()[:2]
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk': instance1.pk},
+                can_delete=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try GET with a permitted object
+            self.assertHttpStatus(self.client.get(self._get_url('delete', instance1)), 200)
+
+            # Try GET with a non-permitted object
+            self.assertHttpStatus(self.client.get(self._get_url('delete', instance2)), 404)
+
+            # Try to delete a permitted object
+            request = {
+                'path': self._get_url('delete', instance1),
+                'data': post_data({'confirm': True}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            with self.assertRaises(ObjectDoesNotExist):
+                self.model.objects.get(pk=instance1.pk)
+
+            # Try to delete a non-permitted object
+            request = {
+                'path': self._get_url('delete', instance2),
+                'data': post_data({'confirm': True}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 404)
+            self.assertTrue(self.model.objects.filter(pk=instance2.pk).exists())
+
     class ListObjectsViewTestCase(ModelViewTestCase):
         """
         Retrieve multiple instances.
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_list_objects(self):
-            # Attempt to make the request without required permissions
+        def test_list_objects_without_permission(self):
+
+            # Try GET without permission
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(self._get_url('list')), 403)
 
-            # Assign the required permission and submit again
-            self.add_permissions(
-                '{}.view_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.get(self._get_url('list'))
-            self.assertHttpStatus(response, 200)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects_with_model_permission(self):
+
+            # Add model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'view'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
 
             # Built-in CSV export
             if hasattr(self.model, 'csv_headers'):
@@ -287,6 +439,24 @@ class ViewTestCases:
                 self.assertHttpStatus(response, 200)
                 self.assertEqual(response.get('Content-Type'), 'text/csv')
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects_with_object_permission(self):
+            instance1, instance2 = self.model.objects.all()[:2]
+
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk': instance1.pk},
+                can_view=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try GET with object-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
+
+            # TODO: Verify that only the permitted object is returned
+
     class BulkCreateObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances using a single form. Expects the creation of three new instances by default.
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index b586342e1..5bba3fbe9 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -347,6 +347,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
     def post(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.views.ObjectEditView')
+        obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
         form = self.model_form(
             data=request.POST,
             files=request.FILES,

From 5273b9d0ee2384a70141f39b2fd0ba1243c046d4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 14:57:35 -0400
Subject: [PATCH 047/505] Rename ImportObjectsViewTestCase

---
 netbox/utilities/testing/testcases.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index f6b5cdfd4..1da5e28ac 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -488,7 +488,7 @@ class ViewTestCases:
             for instance in self.model.objects.order_by('-pk')[:self.bulk_create_count]:
                 self.assertInstanceEqual(instance, self.bulk_create_data)
 
-    class ImportObjectsViewTestCase(ModelViewTestCase):
+    class BulkImportObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances from imported data.
         """
@@ -598,7 +598,7 @@ class ViewTestCases:
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
         ListObjectsViewTestCase,
-        ImportObjectsViewTestCase,
+        BulkImportObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):
@@ -611,7 +611,7 @@ class ViewTestCases:
         CreateObjectViewTestCase,
         EditObjectViewTestCase,
         ListObjectsViewTestCase,
-        ImportObjectsViewTestCase,
+        BulkImportObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):
         """
@@ -636,7 +636,7 @@ class ViewTestCases:
         DeleteObjectViewTestCase,
         ListObjectsViewTestCase,
         BulkCreateObjectsViewTestCase,
-        ImportObjectsViewTestCase,
+        BulkImportObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):

From 77a49fa40e3c8bee8007acbcdbd464f685992114 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 16:04:43 -0400
Subject: [PATCH 048/505] Extend bulk import/edit/delete view tests to support
 object-level permissions

---
 netbox/utilities/testing/testcases.py | 214 ++++++++++++++++++--------
 1 file changed, 152 insertions(+), 62 deletions(-)

diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 1da5e28ac..ca9df4ac8 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -232,12 +232,11 @@ class ViewTestCases:
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_create_object_with_object_permission(self):
             initial_count = self.model.objects.count()
-            next_pk = self.model.objects.order_by('pk').last().pk + 1
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 model=ContentType.objects.get_for_model(self.model),
-                attrs={'pk__gt': next_pk},
+                attrs={'pk__gt': 0},  # Dummy permission to allow all
                 can_add=True
             )
             obj_perm.save()
@@ -255,6 +254,10 @@ class ViewTestCases:
             self.assertEqual(initial_count + 1, self.model.objects.count())
             self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
+            # Nullify ObjectPermission to disallow new object creation
+            obj_perm.attrs = {'pk': 0}
+            obj_perm.save()
+
             # Try to create a non-permitted object
             initial_count = self.model.objects.count()
             request = {
@@ -470,7 +473,6 @@ class ViewTestCases:
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.bulk_create_data),
-                'follow': False,  # Do not follow 302 redirects
             }
 
             # Attempt to make the request without required permissions
@@ -494,35 +496,63 @@ class ViewTestCases:
         """
         csv_data = ()
 
+        def _get_csv_data(self):
+            return '\n'.join(self.csv_data)
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_import_objects(self):
+        def test_bulk_import_objects_without_permission(self):
+            data = {
+                'csv': self._get_csv_data(),
+            }
 
             # Test GET without permission
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(self._get_url('import')), 403)
 
-            # Test GET with permission
-            self.add_permissions(
-                '{}.view_{}'.format(self.model._meta.app_label, self.model._meta.model_name),
-                '{}.add_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.get(self._get_url('import'))
-            self.assertHttpStatus(response, 200)
+            # Try POST without permission
+            response = self.client.post(self._get_url('import'), data)
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(response, 403)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_import_objects_with_model_permission(self):
+            initial_count = self.model.objects.count()
+            data = {
+                'csv': self._get_csv_data(),
+            }
+
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'add'))
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
 
             # Test POST with permission
-            initial_count = self.model.objects.count()
-            request = {
-                'path': self._get_url('import'),
-                'data': {
-                    'csv': '\n'.join(self.csv_data)
-                }
-            }
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 200)
-
-            # Validate import of new objects
+            self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
             self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_import_objects_with_object_permission(self):
+            initial_count = self.model.objects.count()
+            data = {
+                'csv': self._get_csv_data(),
+            }
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk__gt': 0},  # Dummy permission to allow all
+                can_add=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Test import with object-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
+            self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
+
+            # TODO: Test importing non-permitted objects
+
     class BulkEditObjectsViewTestCase(ModelViewTestCase):
         """
         Edit multiple instances.
@@ -530,68 +560,128 @@ class ViewTestCases:
         bulk_edit_data = {}
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_edit_objects(self):
-            # Bulk edit the first three objects only
+        def test_bulk_edit_objects_without_permission(self):
             pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
 
-            request = {
-                'path': self._get_url('bulk_edit'),
-                'data': {
-                    'pk': pk_list,
-                    '_apply': True,  # Form button
-                },
-                'follow': False,  # Do not follow 302 redirects
+            # Test GET without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.get(self._get_url('bulk_edit')), 403)
+
+            # Try POST without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_edit_objects_with_model_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
             }
 
             # Append the form data to the request
-            request['data'].update(post_data(self.bulk_edit_data))
+            data.update(post_data(self.bulk_edit_data))
 
-            # Attempt to make the request without required permissions
-            with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(**request), 403)
-
-            # Assign the required permission and submit again
-            self.add_permissions(
-                '{}.change_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 302)
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'change'))
 
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
             for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_edit_objects_with_object_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
+
+            # Append the form data to the request
+            data.update(post_data(self.bulk_edit_data))
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk__in': list(pk_list)},
+                can_change=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
+            for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
+                self.assertInstanceEqual(instance, self.bulk_edit_data)
+
+            # TODO: Test editing non-permitted objects
+
     class BulkDeleteObjectsViewTestCase(ModelViewTestCase):
         """
         Delete multiple instances.
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_delete_objects(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)
-
-            request = {
-                'path': self._get_url('bulk_delete'),
-                'data': {
-                    'pk': pk_list,
-                    'confirm': True,
-                    '_confirm': True,  # Form button
-                },
-                'follow': False,  # Do not follow 302 redirects
+        def test_bulk_delete_objects_without_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                'confirm': True,
+                '_confirm': True,  # Form button
             }
 
-            # Attempt to make the request without required permissions
+            # Test GET without permission
             with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(**request), 403)
+                self.assertHttpStatus(self.client.get(self._get_url('bulk_delete')), 403)
 
-            # Assign the required permission and submit again
-            self.add_permissions(
-                '{}.delete_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
-            )
-            response = self.client.post(**request)
-            self.assertHttpStatus(response, 302)
+            # Try POST without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 403)
 
-            # Check that all objects were deleted
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_delete_objects_with_model_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)
+            data = {
+                'pk': pk_list,
+                'confirm': True,
+                '_confirm': True,  # Form button
+            }
+
+            # Assign model-level permission
+            self.add_permissions(get_permission_for_model(self.model, 'delete'))
+
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
             self.assertEqual(self.model.objects.count(), 0)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_delete_objects_with_object_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)
+            data = {
+                'pk': pk_list,
+                'confirm': True,
+                '_confirm': True,  # Form button
+            }
+
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                attrs={'pk__in': list(pk_list)},
+                can_delete=True
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
+            # Try POST with object-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
+            self.assertEqual(self.model.objects.count(), 0)
+
+            # TODO: Test deleting non-permitted objects
+
     class PrimaryObjectViewTestCase(
         GetObjectViewTestCase,
         CreateObjectViewTestCase,

From 635fefcb5c5bad6a224e62b2a6a47b3bf2561415 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 22 May 2020 16:33:56 -0400
Subject: [PATCH 049/505] Update exempted tests

---
 netbox/dcim/tests/test_views.py           | 20 +++++++++++++++-----
 netbox/extras/tests/test_views.py         | 20 +++++++++++++++-----
 netbox/ipam/tests/test_views.py           |  4 +++-
 netbox/secrets/tests/test_views.py        |  8 ++++++--
 netbox/utilities/testing/testcases.py     |  2 +-
 netbox/virtualization/tests/test_views.py |  8 ++++++--
 6 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 65f37c1d5..ef8bd3d5f 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -794,7 +794,9 @@ class DeviceBayTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas
     model = DeviceBayTemplate
 
     # Disable inapplicable views
-    test_bulk_edit_objects = None
+    test_bulk_edit_objects_without_permission = None
+    test_bulk_edit_objects_with_model_permission = None
+    test_bulk_edit_objects_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
@@ -1439,7 +1441,9 @@ class CableTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Cable
 
     # TODO: Creation URL needs termination context
-    test_create_object = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
@@ -1513,11 +1517,17 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VirtualChassis
 
     # Disable inapplicable tests
-    test_import_objects = None
+    test_bulk_import_objects_without_permission = None
+    test_bulk_import_objects_with_model_permission = None
+    test_bulk_import_objects_with_object_permission = None
 
     # TODO: Requires special form handling
-    test_create_object = None
-    test_edit_object = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
+    test_edit_object_without_permission = None
+    test_edit_object_with_model_permission = None
+    test_edit_object_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index 370055b26..f52054cc1 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -14,8 +14,12 @@ class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Tag
 
     # Disable inapplicable tests
-    test_create_object = None
-    test_import_objects = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
+    test_bulk_import_objects_without_permission = None
+    test_bulk_import_objects_with_model_permission = None
+    test_bulk_import_objects_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
@@ -42,11 +46,17 @@ class ConfigContextTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = ConfigContext
 
     # Disable inapplicable tests
-    test_import_objects = None
+    test_bulk_import_objects_without_permission = None
+    test_bulk_import_objects_with_model_permission = None
+    test_bulk_import_objects_with_object_permission = None
 
     # TODO: Resolve model discrepancies when creating/editing ConfigContexts
-    test_create_object = None
-    test_edit_object = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
+    test_edit_object_without_permission = None
+    test_edit_object_with_model_permission = None
+    test_edit_object_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index 8867a6b43..bbd252473 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -337,7 +337,9 @@ class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Service
 
     # TODO: Resolve URL for Service creation
-    test_create_object = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index 96439a10d..7796be63d 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -40,10 +40,14 @@ class SecretTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Secret
 
     # Disable inapplicable tests
-    test_create_object = None
+    test_create_object_without_permission = None
+    test_create_object_with_model_permission = None
+    test_create_object_with_object_permission = None
 
     # TODO: Check permissions enforcement on secrets.views.secret_edit
-    test_edit_object = None
+    test_edit_object_without_permission = None
+    test_edit_object_with_model_permission = None
+    test_edit_object_with_object_permission = None
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index ca9df4ac8..475cdb09f 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -351,7 +351,7 @@ class ViewTestCases:
 
             # Try GET without permission
             with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
+                self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 403)
 
             # Try POST without permission
             request = {
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index e7bb19285..006db34d6 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -192,8 +192,12 @@ class InterfaceTestCase(
     model = Interface
 
     # Disable inapplicable tests
-    test_list_objects = None
-    test_import_objects = None
+    test_list_objects_without_permission = None
+    test_list_objects_with_model_permission = None
+    test_list_objects_with_object_permission = None
+    test_bulk_import_objects_without_permission = None
+    test_bulk_import_objects_with_model_permission = None
+    test_bulk_import_objects_with_object_permission = None
 
     def _get_base_url(self):
         # Interface belongs to the DCIM app, so we have to override the base URL

From 5dddf6846b22ef7d085981c23c560a8c3b9f1b6d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 10:48:56 -0400
Subject: [PATCH 050/505] Disable built-in model permissions

---
 netbox/netbox/settings.py                     |   2 +-
 .../users/migrations/0007_objectpermission.py |   8 +-
 netbox/users/models.py                        |  17 +-
 netbox/utilities/auth_backends.py             |  84 +++---
 netbox/utilities/testing/testcases.py         | 250 +++++++++---------
 netbox/utilities/views.py                     |  26 +-
 6 files changed, 197 insertions(+), 190 deletions(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 266f1afd7..f4ee6fff2 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -339,7 +339,7 @@ TEMPLATES = [
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
     'utilities.auth_backends.ObjectPermissionBackend',
-    REMOTE_AUTH_BACKEND,
+    # REMOTE_AUTH_BACKEND,
 ]
 
 # Internationalization
diff --git a/netbox/users/migrations/0007_objectpermission.py b/netbox/users/migrations/0007_objectpermission.py
index d805c3379..1fadcc9a5 100644
--- a/netbox/users/migrations/0007_objectpermission.py
+++ b/netbox/users/migrations/0007_objectpermission.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.6 on 2020-05-08 20:18
+# Generated by Django 3.0.6 on 2020-05-27 14:17
 
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
@@ -9,9 +9,9 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('auth', '0011_update_proxy_permissions'),
         ('contenttypes', '0002_remove_content_type_name'),
+        ('auth', '0011_update_proxy_permissions'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('users', '0006_create_userconfigs'),
     ]
 
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
             name='ObjectPermission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('attrs', django.contrib.postgres.fields.jsonb.JSONField()),
+                ('attrs', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('can_view', models.BooleanField(default=False)),
                 ('can_add', models.BooleanField(default=False)),
                 ('can_change', models.BooleanField(default=False)),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 70e7254e6..b9ab6cbb5 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -240,6 +240,8 @@ class ObjectPermission(models.Model):
         on_delete=models.CASCADE
     )
     attrs = JSONField(
+        blank=True,
+        null=True,
         verbose_name='Attributes'
     )
     can_view = models.BooleanField(
@@ -264,10 +266,11 @@ class ObjectPermission(models.Model):
 
         # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
         # returns anything; we just want to make sure the specified attributes are valid.
-        model = self.model.model_class()
-        try:
-            model.objects.filter(**self.attrs).exists()
-        except FieldError as e:
-            raise ValidationError({
-                'attrs': f'Invalid attributes for {model}: {e}'
-            })
+        if self.attrs:
+            model = self.model.model_class()
+            try:
+                model.objects.filter(**self.attrs).exists()
+            except FieldError as e:
+                raise ValidationError({
+                    'attrs': f'Invalid attributes for {model}: {e}'
+                })
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index e540a04e0..8cf8b621c 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -12,43 +12,53 @@ class ObjectPermissionBackend(ModelBackend):
 
     def get_object_permissions(self, user_obj):
         """
-        Return all model-level permissions granted to the user by an ObjectPermission.
+        Return all permissions granted to the user by an ObjectPermission.
         """
         if not hasattr(user_obj, '_object_perm_cache'):
 
-            # Cache all assigned ObjectPermissions on the User instance
-            perms = set()
-            for obj_perm in ObjectPermission.objects.filter(
+            # Retrieve all assigned ObjectPermissions
+            object_permissions = ObjectPermission.objects.filter(
                 Q(users=user_obj) |
                 Q(groups__user=user_obj)
-            ).prefetch_related('model'):
+            ).prefetch_related('model')
+
+            # Create a dictionary mapping permissions to their attributes
+            perms = dict()
+            for obj_perm in object_permissions:
                 for action in ['view', 'add', 'change', 'delete']:
                     if getattr(obj_perm, f"can_{action}"):
-                        perms.add(f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}")
+                        perm_name = f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}"
+                        if perm_name in perms:
+                            perms[perm_name].append(obj_perm.attrs)
+                        else:
+                            perms[perm_name] = [obj_perm.attrs]
+
+            # Cache resolved permissions on the User instance
             setattr(user_obj, '_object_perm_cache', perms)
 
         return user_obj._object_perm_cache
 
-    def get_all_permissions(self, user_obj, obj=None):
-
-        # Handle inactive/anonymous users
-        if not user_obj.is_active or user_obj.is_anonymous:
-            return set()
-
-        # Cache model-level permissions on the User instance
-        if not hasattr(user_obj, '_perm_cache'):
-            user_obj._perm_cache = {
-                *self.get_user_permissions(user_obj, obj=obj),
-                *self.get_group_permissions(user_obj, obj=obj),
-                *self.get_object_permissions(user_obj)
-            }
-
-        return user_obj._perm_cache
+    # def get_all_permissions(self, user_obj, obj=None):
+    #
+    #     # Handle inactive/anonymous users
+    #     if not user_obj.is_active or user_obj.is_anonymous:
+    #         return set()
+    #
+    #     # Cache object permissions on the User instance
+    #     if not hasattr(user_obj, '_perm_cache'):
+    #         user_obj._perm_cache = self.get_object_permissions(user_obj)
+    #
+    #     return user_obj._perm_cache
 
     def has_perm(self, user_obj, perm, obj=None):
+        # print(f'has_perm({perm})')
         app_label, codename = perm.split('.')
         action, model_name = codename.split('_')
 
+        # Superusers implicitly have all permissions
+        if user_obj.is_active and user_obj.is_superuser:
+            return True
+
         # If this is a view permission, check whether the model has been exempted from enforcement
         if action == 'view':
             if (
@@ -60,29 +70,29 @@ class ObjectPermissionBackend(ModelBackend):
             ):
                 return True
 
-        # If no object is specified, evaluate model-level permissions. The presence of a permission in this set tells
-        # us that the user has permission for *some* objects, but not necessarily a specific object.
+        # Handle inactive/anonymous users
+        if not user_obj.is_active or user_obj.is_anonymous:
+            return False
+
+        # If no applicable ObjectPermissions have been created for this user/permission, deny permission
+        if perm not in self.get_object_permissions(user_obj):
+            return False
+
+        # If no object has been specified, grant permission. (The presence of a permission in this set tells
+        # us that the user has permission for *some* objects, but not necessarily a specific object.)
         if obj is None:
-            return perm in self.get_all_permissions(user_obj)
+            return True
 
         # Sanity check: Ensure that the requested permission applies to the specified object
         model = obj._meta.model
         if model._meta.label_lower != '.'.join((app_label, model_name)):
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
-        # If the user has been granted model-level permission for the object, return True
-        model_perms = {
-            *self.get_user_permissions(user_obj),
-            *self.get_group_permissions(user_obj),
-        }
-        if perm in model_perms:
-            return True
-
-        # Gather all ObjectPermissions pertinent to the requested permission. If none are found, the User has no
-        # applicable permissions.
-        attrs = ObjectPermission.objects.get_attr_constraints(user_obj, perm)
-        if not attrs:
-            return False
+        # Compile a query filter that matches all instances of the specified model
+        obj_perm_attrs = self.get_object_permissions(user_obj)[perm]
+        attrs = Q()
+        for perm_attrs in obj_perm_attrs:
+            attrs |= Q(**perm_attrs.attrs)
 
         # Permission to perform the requested action on the object depends on whether the specified object matches
         # the specified attributes. Note that this check is made against the *database* record representing the object,
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 6f878986b..3d0ad1ef3 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -159,15 +159,15 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_get_object_with_model_permission(self):
-            instance = self.model.objects.first()
-
-            # Add model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'view'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_get_object_with_model_permission(self):
+        #     instance = self.model.objects.first()
+        #
+        #     # Add model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'view'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_with_object_permission(self):
@@ -217,24 +217,24 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_create_object_with_model_permission(self):
-            initial_count = self.model.objects.count()
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'add'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
-
-            # Try POST with model-level permission
-            request = {
-                'path': self._get_url('add'),
-                'data': post_data(self.form_data),
-            }
-            self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertEqual(initial_count + 1, self.model.objects.count())
-            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_create_object_with_model_permission(self):
+        #     initial_count = self.model.objects.count()
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'add'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
+        #
+        #     # Try POST with model-level permission
+        #     request = {
+        #         'path': self._get_url('add'),
+        #         'data': post_data(self.form_data),
+        #     }
+        #     self.assertHttpStatus(self.client.post(**request), 302)
+        #     self.assertEqual(initial_count + 1, self.model.objects.count())
+        #     self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_create_object_with_object_permission(self):
@@ -296,23 +296,23 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_edit_object_with_model_permission(self):
-            instance = self.model.objects.first()
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'change'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
-
-            # Try POST with model-level permission
-            request = {
-                'path': self._get_url('edit', instance),
-                'data': post_data(self.form_data),
-            }
-            self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_edit_object_with_model_permission(self):
+        #     instance = self.model.objects.first()
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'change'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
+        #
+        #     # Try POST with model-level permission
+        #     request = {
+        #         'path': self._get_url('edit', instance),
+        #         'data': post_data(self.form_data),
+        #     }
+        #     self.assertHttpStatus(self.client.post(**request), 302)
+        #     self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_edit_object_with_object_permission(self):
@@ -368,24 +368,24 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_delete_object_with_model_permission(self):
-            instance = self.model.objects.first()
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'delete'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
-
-            # Try POST with model-level permission
-            request = {
-                'path': self._get_url('delete', instance),
-                'data': post_data({'confirm': True}),
-            }
-            self.assertHttpStatus(self.client.post(**request), 302)
-            with self.assertRaises(ObjectDoesNotExist):
-                self.model.objects.get(pk=instance.pk)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_delete_object_with_model_permission(self):
+        #     instance = self.model.objects.first()
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'delete'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
+        #
+        #     # Try POST with model-level permission
+        #     request = {
+        #         'path': self._get_url('delete', instance),
+        #         'data': post_data({'confirm': True}),
+        #     }
+        #     self.assertHttpStatus(self.client.post(**request), 302)
+        #     with self.assertRaises(ObjectDoesNotExist):
+        #         self.model.objects.get(pk=instance.pk)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_delete_object_with_object_permission(self):
@@ -434,20 +434,20 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(self._get_url('list')), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_list_objects_with_model_permission(self):
-
-            # Add model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'view'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
-
-            # Built-in CSV export
-            if hasattr(self.model, 'csv_headers'):
-                response = self.client.get('{}?export'.format(self._get_url('list')))
-                self.assertHttpStatus(response, 200)
-                self.assertEqual(response.get('Content-Type'), 'text/csv')
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_list_objects_with_model_permission(self):
+        #
+        #     # Add model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'view'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
+        #
+        #     # Built-in CSV export
+        #     if hasattr(self.model, 'csv_headers'):
+        #         response = self.client.get('{}?export'.format(self._get_url('list')))
+        #         self.assertHttpStatus(response, 200)
+        #         self.assertEqual(response.get('Content-Type'), 'text/csv')
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_with_object_permission(self):
@@ -528,22 +528,22 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_import_objects_with_model_permission(self):
-            initial_count = self.model.objects.count()
-            data = {
-                'csv': self._get_csv_data(),
-            }
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'add'))
-
-            # Try GET with model-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
-
-            # Test POST with permission
-            self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
-            self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_bulk_import_objects_with_model_permission(self):
+        #     initial_count = self.model.objects.count()
+        #     data = {
+        #         'csv': self._get_csv_data(),
+        #     }
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'add'))
+        #
+        #     # Try GET with model-level permission
+        #     self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
+        #
+        #     # Test POST with permission
+        #     self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
+        #     self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_import_objects_with_object_permission(self):
@@ -589,24 +589,24 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_edit_objects_with_model_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
-            data = {
-                'pk': pk_list,
-                '_apply': True,  # Form button
-            }
-
-            # Append the form data to the request
-            data.update(post_data(self.bulk_edit_data))
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'change'))
-
-            # Try POST with model-level permission
-            self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
-            for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
-                self.assertInstanceEqual(instance, self.bulk_edit_data)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_bulk_edit_objects_with_model_permission(self):
+        #     pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+        #     data = {
+        #         'pk': pk_list,
+        #         '_apply': True,  # Form button
+        #     }
+        #
+        #     # Append the form data to the request
+        #     data.update(post_data(self.bulk_edit_data))
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'change'))
+        #
+        #     # Try POST with model-level permission
+        #     self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
+        #     for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
+        #         self.assertInstanceEqual(instance, self.bulk_edit_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_edit_objects_with_object_permission(self):
@@ -656,21 +656,21 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_delete_objects_with_model_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)
-            data = {
-                'pk': pk_list,
-                'confirm': True,
-                '_confirm': True,  # Form button
-            }
-
-            # Assign model-level permission
-            self.add_permissions(get_permission_for_model(self.model, 'delete'))
-
-            # Try POST with model-level permission
-            self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
-            self.assertEqual(self.model.objects.count(), 0)
+        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        # def test_bulk_delete_objects_with_model_permission(self):
+        #     pk_list = self.model.objects.values_list('pk', flat=True)
+        #     data = {
+        #         'pk': pk_list,
+        #         'confirm': True,
+        #         '_confirm': True,  # Form button
+        #     }
+        #
+        #     # Assign model-level permission
+        #     self.add_permissions(get_permission_for_model(self.model, 'delete'))
+        #
+        #     # Try POST with model-level permission
+        #     self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
+        #     self.assertEqual(self.model.objects.count(), 0)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_delete_objects_with_object_permission(self):
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index cbedecd4d..6e93c2369 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -8,7 +8,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.mixins import AccessMixin
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured, ObjectDoesNotExist, ValidationError
 from django.db import transaction, IntegrityError
-from django.db.models import ManyToManyField, ProtectedError
+from django.db.models import ManyToManyField, ProtectedError, Q
 from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
 from django.http import HttpResponse, HttpResponseServerError
 from django.shortcuts import get_object_or_404, redirect, render
@@ -65,22 +65,16 @@ class ObjectPermissionRequiredMixin(AccessMixin):
         if not user.has_perms((permission_required, *self.additional_permissions)):
             return False
 
-        # Superusers implicitly have all permissions
-        if user.is_superuser:
-            return True
-
-        # Determine whether the permission is model-level or object-level. Model-level permissions grant the
-        # specified action to *all* objects, so no further action is needed.
-        if permission_required in {*user._user_perm_cache, *user._group_perm_cache}:
-            return True
-
-        # If the permission is granted only at the object level, filter the view's queryset to return only objects
-        # on which the user is permitted to perform the specified action.
-        attrs = ObjectPermission.objects.get_attr_constraints(user, permission_required)
-        if attrs:
-            # Update the view's QuerySet to filter only the permitted objects
+        # Update the view's QuerySet to filter only the permitted objects
+        if user.is_authenticated:
+            obj_perm_attrs = user._object_perm_cache[permission_required]
+            attrs = Q()
+            for perm_attrs in obj_perm_attrs:
+                if perm_attrs:
+                    attrs |= Q(**perm_attrs)
             self.queryset = self.queryset.filter(attrs)
-            return True
+
+        return True
 
     def dispatch(self, request, *args, **kwargs):
 

From 4cee506710fd9862542044bbac5fd8198482b104 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 10:52:59 -0400
Subject: [PATCH 051/505] Rebase RemoteUserBackend on BaseBackend

---
 netbox/netbox/settings.py         | 2 +-
 netbox/utilities/auth_backends.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index f4ee6fff2..266f1afd7 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -339,7 +339,7 @@ TEMPLATES = [
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
     'utilities.auth_backends.ObjectPermissionBackend',
-    # REMOTE_AUTH_BACKEND,
+    REMOTE_AUTH_BACKEND,
 ]
 
 # Internationalization
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 8cf8b621c..3d5ec1830 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -1,7 +1,7 @@
 import logging
 
 from django.conf import settings
-from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as RemoteUserBackend_
+from django.contrib.auth.backends import BaseBackend, ModelBackend
 from django.contrib.auth.models import Group, Permission
 from django.db.models import Q
 
@@ -100,7 +100,7 @@ class ObjectPermissionBackend(ModelBackend):
         return model.objects.filter(attrs, pk=obj.pk).exists()
 
 
-class RemoteUserBackend(RemoteUserBackend_):
+class RemoteUserBackend(BaseBackend):
     """
     Custom implementation of Django's RemoteUserBackend which provides configuration hooks for basic customization.
     """

From a6a88a0d2ead5f011bce4ce2a0f73dc0e0d50244 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 11:30:36 -0400
Subject: [PATCH 052/505] Delete extraneous test case

---
 netbox/users/tests/test_permissions.py | 62 --------------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 netbox/users/tests/test_permissions.py

diff --git a/netbox/users/tests/test_permissions.py b/netbox/users/tests/test_permissions.py
deleted file mode 100644
index 487543bd3..000000000
--- a/netbox/users/tests/test_permissions.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import User
-from django.test import TestCase, override_settings
-
-from dcim.models import Site
-from tenancy.models import Tenant
-from users.models import ObjectPermission
-
-
-class ObjectPermissionTest(TestCase):
-
-    def setUp(self):
-
-        self.user = User.objects.create_user(username='testuser')
-
-    @classmethod
-    def setUpTestData(cls):
-
-        tenant = Tenant.objects.create(name='Tenant 1', slug='tenant-1')
-        Site.objects.bulk_create((
-            Site(name='Site 1', slug='site-1'),
-            Site(name='Site 2', slug='site-2', tenant=tenant),
-            Site(name='Site 3', slug='site-3'),
-        ))
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_permission_view_object(self):
-
-        # Sanity check to ensure the user has no model-level permission
-        self.assertFalse(self.user.has_perm('dcim.view_site'))
-
-        # The permission check for a specific object should fail.
-        sites = Site.objects.all()
-        self.assertFalse(self.user.has_perm('dcim.view_site', sites[0]))
-
-        # Create and assign a new ObjectPermission specifying the first site by name.
-        ct = ContentType.objects.get_for_model(sites[0])
-        object_perm = ObjectPermission(
-            model=ct,
-            attrs={'name': 'Site 1'},
-            can_view=True
-        )
-        object_perm.save()
-        object_perm.users.add(self.user)
-
-        # The test user should have permission to view only the first site.
-        self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
-        self.assertFalse(self.user.has_perm('dcim.view_site', sites[1]))
-
-        # Create a second ObjectPermission matching sites by assigned tenant.
-        object_perm = ObjectPermission(
-            model=ct,
-            attrs={'tenant__name': 'Tenant 1'},
-            can_view=True
-        )
-        object_perm.save()
-        object_perm.users.add(self.user)
-
-        # The user should now able to view the first two sites, but not the third.
-        self.assertTrue(self.user.has_perm('dcim.view_site', sites[0]))
-        self.assertTrue(self.user.has_perm('dcim.view_site', sites[1]))
-        self.assertFalse(self.user.has_perm('dcim.view_site', sites[2]))

From fb7446487e7e54db8a8feac14f4e69c506fd22e7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 11:31:07 -0400
Subject: [PATCH 053/505] Fix up permissions evaluation

---
 netbox/utilities/api.py           | 11 +++++------
 netbox/utilities/auth_backends.py | 14 +-------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 745f812ff..2d7ae2385 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -340,12 +340,11 @@ class ModelViewSet(_ModelViewSet):
         permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
 
         # Enforce object-level permissions
-        if permission_required not in {*request.user._user_perm_cache, *request.user._group_perm_cache}:
-            attrs = ObjectPermission.objects.get_attr_constraints(request.user, permission_required)
-            if attrs:
-                # Update the view's QuerySet to filter only the permitted objects
-                self.queryset = self.queryset.filter(attrs)
-                return True
+        attrs = ObjectPermission.objects.get_attr_constraints(request.user, permission_required)
+        if attrs:
+            # Update the view's QuerySet to filter only the permitted objects
+            self.queryset = self.queryset.filter(attrs)
+            return True
 
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 3d5ec1830..bcf2fa119 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -38,18 +38,6 @@ class ObjectPermissionBackend(ModelBackend):
 
         return user_obj._object_perm_cache
 
-    # def get_all_permissions(self, user_obj, obj=None):
-    #
-    #     # Handle inactive/anonymous users
-    #     if not user_obj.is_active or user_obj.is_anonymous:
-    #         return set()
-    #
-    #     # Cache object permissions on the User instance
-    #     if not hasattr(user_obj, '_perm_cache'):
-    #         user_obj._perm_cache = self.get_object_permissions(user_obj)
-    #
-    #     return user_obj._perm_cache
-
     def has_perm(self, user_obj, perm, obj=None):
         # print(f'has_perm({perm})')
         app_label, codename = perm.split('.')
@@ -92,7 +80,7 @@ class ObjectPermissionBackend(ModelBackend):
         obj_perm_attrs = self.get_object_permissions(user_obj)[perm]
         attrs = Q()
         for perm_attrs in obj_perm_attrs:
-            attrs |= Q(**perm_attrs.attrs)
+            attrs |= Q(**perm_attrs)
 
         # Permission to perform the requested action on the object depends on whether the specified object matches
         # the specified attributes. Note that this check is made against the *database* record representing the object,

From ce46512c74f6e27cd73213bcd85310c5e437d390 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 16:53:30 -0400
Subject: [PATCH 054/505] Fix permission assignment in tests

---
 netbox/extras/tests/test_customfields.py | 18 ++++--------
 netbox/netbox/settings.py                |  2 +-
 netbox/utilities/auth_backends.py        |  8 ++++--
 netbox/utilities/testing/testcases.py    | 35 ++++++++++++++++++------
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py
index c94d8cd3f..4df06e12f 100644
--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -1,7 +1,6 @@
 from datetime import date
 
 from django.contrib.contenttypes.models import ContentType
-from django.test import Client, TestCase
 from django.urls import reverse
 from rest_framework import status
 
@@ -9,7 +8,7 @@ from dcim.forms import SiteCSVForm
 from dcim.models import Site
 from extras.choices import *
 from extras.models import CustomField, CustomFieldValue, CustomFieldChoice
-from utilities.testing import APITestCase, create_test_user
+from utilities.testing import APITestCase, TestCase
 from virtualization.models import VirtualMachine
 
 
@@ -470,17 +469,10 @@ class CustomFieldChoiceAPITest(APITestCase):
 
 
 class CustomFieldImportTest(TestCase):
-
-    def setUp(self):
-
-        user = create_test_user(
-            permissions=[
-                'dcim.view_site',
-                'dcim.add_site',
-            ]
-        )
-        self.client = Client()
-        self.client.force_login(user)
+    user_permissions = (
+        'dcim.view_site',
+        'dcim.add_site',
+    )
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 266f1afd7..3b345638b 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -338,8 +338,8 @@ TEMPLATES = [
 
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
-    'utilities.auth_backends.ObjectPermissionBackend',
     REMOTE_AUTH_BACKEND,
+    'utilities.auth_backends.ObjectPermissionBackend',
 ]
 
 # Internationalization
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index bcf2fa119..41d7033af 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -1,7 +1,7 @@
 import logging
 
 from django.conf import settings
-from django.contrib.auth.backends import BaseBackend, ModelBackend
+from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
 from django.contrib.auth.models import Group, Permission
 from django.db.models import Q
 
@@ -88,7 +88,7 @@ class ObjectPermissionBackend(ModelBackend):
         return model.objects.filter(attrs, pk=obj.pk).exists()
 
 
-class RemoteUserBackend(BaseBackend):
+class RemoteUserBackend(_RemoteUserBackend):
     """
     Custom implementation of Django's RemoteUserBackend which provides configuration hooks for basic customization.
     """
@@ -124,7 +124,11 @@ class RemoteUserBackend(BaseBackend):
                     "<app>.<action>_<model>. (Example: dcim.add_site)"
                 )
         if permissions_list:
+            # TODO: Create an ObjectPermission
             user.user_permissions.add(*permissions_list)
             logger.debug(f"Assigned permissions to remotely-authenticated user {user}: {permissions_list}")
 
         return user
+
+    def has_perm(self, user_obj, perm, obj=None):
+        return False
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 3d0ad1ef3..8346f5d04 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -33,18 +33,31 @@ class TestCase(_TestCase):
         Assign a set of permissions to the test user. Accepts permission names in the form <app>.<action>_<model>.
         """
         for name in names:
-            app, codename = name.split('.')
-            perm = Permission.objects.get(content_type__app_label=app, codename=codename)
-            self.user.user_permissions.add(perm)
+            app_label, codename = name.split('.')
+            action, model_name = codename.split('_')
+
+            kwargs = {
+                'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                f'can_{action}': True
+            }
+            obj_perm = ObjectPermission(**kwargs)
+            obj_perm.save()
+            obj_perm.users.add(self.user)
 
     def remove_permissions(self, *names):
         """
         Remove a set of permissions from the test user, if assigned.
         """
         for name in names:
-            app, codename = name.split('.')
-            perm = Permission.objects.get(content_type__app_label=app, codename=codename)
-            self.user.user_permissions.remove(perm)
+            app_label, codename = name.split('.')
+            action, model_name = codename.split('_')
+
+            kwargs = {
+                'user': self.user,
+                'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                f'can_{action}': True
+            }
+            ObjectPermission.objects.filter(**kwargs).delete()
 
     #
     # Convenience methods
@@ -493,10 +506,14 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-            # Assign the required permission and submit again
-            self.add_permissions(
-                '{}.add_{}'.format(self.model._meta.app_label, self.model._meta.model_name)
+            # Assign object-level permission
+            obj_perm = ObjectPermission(
+                model=ContentType.objects.get_for_model(self.model),
+                can_add=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
 

From a261d10bfd0440a68b68f811eebddc07641f6d1b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 27 May 2020 17:10:45 -0400
Subject: [PATCH 055/505] Fix permissions assignment for SecretTest

---
 netbox/secrets/tests/test_api.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/netbox/secrets/tests/test_api.py b/netbox/secrets/tests/test_api.py
index 339c370d8..c21ac9d72 100644
--- a/netbox/secrets/tests/test_api.py
+++ b/netbox/secrets/tests/test_api.py
@@ -122,18 +122,15 @@ class SecretRoleTest(APITestCase):
 
 
 class SecretTest(APITestCase):
+    user_permissions = (
+        'secrets.add_secret',
+        'secrets.change_secret',
+        'secrets.delete_secret',
+        'secrets.view_secret',
+    )
 
     def setUp(self):
-
-        # Create a non-superuser test user
-        self.user = create_test_user('testuser', permissions=(
-            'secrets.add_secret',
-            'secrets.change_secret',
-            'secrets.delete_secret',
-            'secrets.view_secret',
-        ))
-        self.token = Token.objects.create(user=self.user)
-        self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
+        super().setUp()
 
         userkey = UserKey(user=self.user, public_key=PUBLIC_KEY)
         userkey.save()

From 814aff78b580a14c13df4e2ee58df3c7e7495576 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 09:39:27 -0400
Subject: [PATCH 056/505] Update ObjectPermission evaluation to support null
 attrs

---
 netbox/utilities/api.py           | 15 ++++++++-------
 netbox/utilities/auth_backends.py |  7 ++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 2d7ae2385..41002dd20 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied
 from django.db import transaction
-from django.db.models import ManyToManyField, ProtectedError
+from django.db.models import ManyToManyField, ProtectedError, Q
 from django.urls import reverse
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import BasePermission
@@ -339,12 +339,13 @@ class ModelViewSet(_ModelViewSet):
         }
         permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
 
-        # Enforce object-level permissions
-        attrs = ObjectPermission.objects.get_attr_constraints(request.user, permission_required)
-        if attrs:
-            # Update the view's QuerySet to filter only the permitted objects
-            self.queryset = self.queryset.filter(attrs)
-            return True
+        # Update the view's QuerySet to filter only the permitted objects
+        obj_perm_attrs = request.user._object_perm_cache[permission_required]
+        attrs = Q()
+        for perm_attrs in obj_perm_attrs:
+            if perm_attrs:
+                attrs |= Q(**perm_attrs)
+        self.queryset = self.queryset.filter(attrs)
 
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 41d7033af..6d34678be 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -80,7 +80,12 @@ class ObjectPermissionBackend(ModelBackend):
         obj_perm_attrs = self.get_object_permissions(user_obj)[perm]
         attrs = Q()
         for perm_attrs in obj_perm_attrs:
-            attrs |= Q(**perm_attrs)
+            if perm_attrs:
+                attrs |= Q(**perm_attrs)
+            else:
+                # Found ObjectPermission with null attrs; allow model-level access
+                attrs = Q()
+                break
 
         # Permission to perform the requested action on the object depends on whether the specified object matches
         # the specified attributes. Note that this check is made against the *database* record representing the object,

From 00ce3588d3f9e8b74e2564879256b5952ebfdcec Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 09:51:02 -0400
Subject: [PATCH 057/505] Fix secrets API tests

---
 netbox/secrets/models.py         |  1 -
 netbox/secrets/tests/test_api.py | 42 ++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 830e91096..61d8adb6b 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from Crypto.Cipher import AES
 from Crypto.PublicKey import RSA
diff --git a/netbox/secrets/tests/test_api.py b/netbox/secrets/tests/test_api.py
index c21ac9d72..8d716a465 100644
--- a/netbox/secrets/tests/test_api.py
+++ b/netbox/secrets/tests/test_api.py
@@ -5,8 +5,7 @@ from rest_framework import status
 
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
 from secrets.models import Secret, SecretRole, SessionKey, UserKey
-from users.models import Token
-from utilities.testing import APITestCase, create_test_user
+from utilities.testing import APITestCase
 from .constants import PRIVATE_KEY, PUBLIC_KEY
 
 
@@ -122,16 +121,19 @@ class SecretRoleTest(APITestCase):
 
 
 class SecretTest(APITestCase):
-    user_permissions = (
-        'secrets.add_secret',
-        'secrets.change_secret',
-        'secrets.delete_secret',
-        'secrets.view_secret',
-    )
 
     def setUp(self):
         super().setUp()
 
+        self.user.is_superuser = False
+        self.user.save()
+        self.add_permissions(
+            'secrets.add_secret',
+            'secrets.change_secret',
+            'secrets.delete_secret',
+            'secrets.view_secret',
+        )
+
         userkey = UserKey(user=self.user, public_key=PUBLIC_KEY)
         userkey.save()
         self.master_key = userkey.get_master_key(PRIVATE_KEY)
@@ -175,24 +177,25 @@ class SecretTest(APITestCase):
         self.secret3.save()
 
     def test_get_secret(self):
-
         url = reverse('secrets-api:secret-detail', kwargs={'pk': self.secret1.pk})
 
-        # Secret plaintext not be decrypted as the user has not been assigned to the role
+        # Secret plaintext should not be decrypted as the user has not been assigned to the role
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertIsNone(response.data['plaintext'])
 
         # The plaintext should be present once the user has been assigned to the role
         self.secretrole1.users.add(self.user)
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['plaintext'], self.plaintexts[0])
 
     def test_list_secrets(self):
-
         url = reverse('secrets-api:secret-list')
 
-        # Secret plaintext not be decrypted as the user has not been assigned to the role
+        # Secret plaintext should not be decrypted as the user has not been assigned to the role
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 3)
         for secret in response.data['results']:
             self.assertIsNone(secret['plaintext'])
@@ -200,12 +203,12 @@ class SecretTest(APITestCase):
         # The plaintext should be present once the user has been assigned to the role
         self.secretrole1.users.add(self.user)
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 3)
         for i, secret in enumerate(response.data['results']):
             self.assertEqual(secret['plaintext'], self.plaintexts[i])
 
     def test_create_secret(self):
-
         data = {
             'device': self.device.pk,
             'role': self.secretrole1.pk,
@@ -213,6 +216,9 @@ class SecretTest(APITestCase):
             'plaintext': 'Secret #4 Plaintext',
         }
 
+        # Assign test user to secret role
+        self.secretrole1.users.add(self.user)
+
         url = reverse('secrets-api:secret-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -225,7 +231,6 @@ class SecretTest(APITestCase):
         self.assertEqual(secret4.plaintext, data['plaintext'])
 
     def test_create_secret_bulk(self):
-
         data = [
             {
                 'device': self.device.pk,
@@ -247,6 +252,9 @@ class SecretTest(APITestCase):
             },
         ]
 
+        # Assign test user to secret role
+        self.secretrole1.users.add(self.user)
+
         url = reverse('secrets-api:secret-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -257,13 +265,15 @@ class SecretTest(APITestCase):
         self.assertEqual(response.data[2]['plaintext'], data[2]['plaintext'])
 
     def test_update_secret(self):
-
         data = {
             'device': self.device.pk,
             'role': self.secretrole2.pk,
             'plaintext': 'NewPlaintext',
         }
 
+        # Assign test user to secret role
+        self.secretrole1.users.add(self.user)
+
         url = reverse('secrets-api:secret-detail', kwargs={'pk': self.secret1.pk})
         response = self.client.put(url, data, format='json', **self.header)
 
@@ -276,6 +286,8 @@ class SecretTest(APITestCase):
         self.assertEqual(secret1.plaintext, data['plaintext'])
 
     def test_delete_secret(self):
+        # Assign test user to secret role
+        self.secretrole1.users.add(self.user)
 
         url = reverse('secrets-api:secret-detail', kwargs={'pk': self.secret1.pk})
         response = self.client.delete(url, **self.header)

From b2ba9d68c9b82e7dd0869a5641e76c251be69ded Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 10:04:19 -0400
Subject: [PATCH 058/505] Fix default permissions assignment under
 RemoteUserBackend

---
 netbox/utilities/auth_backends.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 6d34678be..99e4f559a 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -2,7 +2,8 @@ import logging
 
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
-from django.contrib.auth.models import Group, Permission
+from django.contrib.auth.models import Group
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 
 from users.models import ObjectPermission
@@ -115,22 +116,27 @@ class RemoteUserBackend(_RemoteUserBackend):
             user.groups.add(*group_list)
             logger.debug(f"Assigned groups to remotely-authenticated user {user}: {group_list}")
 
-        # Assign default permissions to the user
+        # Assign default object permissions to the user
         permissions_list = []
         for permission_name in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS:
             try:
                 app_label, codename = permission_name.split('.')
-                permissions_list.append(
-                    Permission.objects.get(content_type__app_label=app_label, codename=codename)
-                )
-            except (ValueError, Permission.DoesNotExist):
+                action, model_name = codename.split('_')
+
+                kwargs = {
+                    'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                    f'can_{action}': True
+                }
+                obj_perm = ObjectPermission(**kwargs)
+                obj_perm.save()
+                obj_perm.users.add(user)
+                permissions_list.append(permission_name)
+            except ValueError:
                 logging.error(
                     "Invalid permission name: '{permission_name}'. Permissions must be in the form "
                     "<app>.<action>_<model>. (Example: dcim.add_site)"
                 )
         if permissions_list:
-            # TODO: Create an ObjectPermission
-            user.user_permissions.add(*permissions_list)
             logger.debug(f"Assigned permissions to remotely-authenticated user {user}: {permissions_list}")
 
         return user

From ca199cdefe9acd8ecfb7b266ccf45566fef6ea84 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 10:27:25 -0400
Subject: [PATCH 059/505] Reduce ObjectPermission creation boilerplate

---
 netbox/netbox/tests/test_authentication.py | 60 ++++++----------------
 netbox/utilities/auth_backends.py          |  8 +--
 netbox/utilities/testing/testcases.py      | 16 ++----
 3 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 39e82df61..74f4c411a 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -201,13 +201,11 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Retrieve permitted object
         response = self.client.get(self.prefixes[0].get_absolute_url())
@@ -225,13 +223,11 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(reverse('ipam:prefix_list'))
@@ -259,14 +255,12 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertEqual(initial_count, Prefix.objects.count())
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_add=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to create a non-permitted object
         request = {
@@ -307,14 +301,12 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_change=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to edit a non-permitted object
         request = {
@@ -351,14 +343,12 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_delete=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Delete permitted object
         request = {
@@ -400,13 +390,11 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertEqual(initial_count, Prefix.objects.count())
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_add=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to create non-permitted objects
         request = {
@@ -449,13 +437,11 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_change=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to edit non-permitted objects
         request = {
@@ -493,14 +479,12 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_delete=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to delete non-permitted object
         request = {
@@ -565,15 +549,11 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Retrieve permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
@@ -594,15 +574,11 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
-            attrs={
-                'site__name': 'Site 1',
-            },
+            attrs={'site__name': 'Site 1'},
             can_view=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(url, **self.header)
@@ -623,13 +599,11 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_add=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to create a non-permitted object
         response = self.client.post(url, data, format='json', **self.header)
@@ -652,13 +626,11 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_change=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to edit a non-permitted object
         data = {'site': self.sites[0].pk}
@@ -687,13 +659,11 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        obj_perm = ObjectPermission(
+        self.user.object_permissions.create(
             model=ContentType.objects.get_for_model(Prefix),
             attrs={'site__name': 'Site 1'},
             can_delete=True
         )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
 
         # Attempt to delete a non-permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 99e4f559a..bb705a6df 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -122,14 +122,10 @@ class RemoteUserBackend(_RemoteUserBackend):
             try:
                 app_label, codename = permission_name.split('.')
                 action, model_name = codename.split('_')
-
-                kwargs = {
+                user.object_permissions.create(**{
                     'model': ContentType.objects.get(app_label=app_label, model=model_name),
                     f'can_{action}': True
-                }
-                obj_perm = ObjectPermission(**kwargs)
-                obj_perm.save()
-                obj_perm.users.add(user)
+                })
                 permissions_list.append(permission_name)
             except ValueError:
                 logging.error(
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 8346f5d04..86f465364 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -1,5 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms.models import model_to_dict
 from django.test import Client, TestCase as _TestCase, override_settings
@@ -7,7 +7,6 @@ from django.urls import reverse, NoReverseMatch
 from rest_framework.test import APIClient
 
 from users.models import ObjectPermission, Token
-from utilities.permissions import get_permission_for_model
 from .utils import disable_warnings, post_data
 
 
@@ -36,13 +35,10 @@ class TestCase(_TestCase):
             app_label, codename = name.split('.')
             action, model_name = codename.split('_')
 
-            kwargs = {
+            self.user.object_permissions.create(**{
                 'model': ContentType.objects.get(app_label=app_label, model=model_name),
                 f'can_{action}': True
-            }
-            obj_perm = ObjectPermission(**kwargs)
-            obj_perm.save()
-            obj_perm.users.add(self.user)
+            })
 
     def remove_permissions(self, *names):
         """
@@ -52,12 +48,10 @@ class TestCase(_TestCase):
             app_label, codename = name.split('.')
             action, model_name = codename.split('_')
 
-            kwargs = {
-                'user': self.user,
+            self.user.object_permissions.filter(**{
                 'model': ContentType.objects.get(app_label=app_label, model=model_name),
                 f'can_{action}': True
-            }
-            ObjectPermission.objects.filter(**kwargs).delete()
+            }).delete()
 
     #
     # Convenience methods

From dc56e49410c00821260cc5870dddd258dd4cd65c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 10:35:59 -0400
Subject: [PATCH 060/505] Introduce resolve_permission() utility function

---
 netbox/users/models.py                |  5 ++---
 netbox/utilities/auth_backends.py     |  7 +++----
 netbox/utilities/permissions.py       | 20 ++++++++++++++++++++
 netbox/utilities/testing/testcases.py | 13 +++++--------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/netbox/users/models.py b/netbox/users/models.py
index b9ab6cbb5..17c5a3a65 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -12,6 +12,7 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
 
+from utilities.permissions import resolve_permission
 from utilities.utils import flatten_dict
 
 
@@ -202,11 +203,9 @@ class ObjectPermissionManager(models.Manager):
         Compile all ObjectPermission attributes applicable to a specific combination of user, model, and action. Returns
         a dictionary that can be passed directly to .filter() on a QuerySet.
         """
-        app_label, codename = perm.split('.')
-        action, model_name = codename.split('_')
+        content_type, action = resolve_permission(perm)
         assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
 
-        content_type = ContentType.objects.get(app_label=app_label, model=model_name)
         qs = self.get_queryset().filter(
             Q(users=user) | Q(groups__user=user),
             model=content_type,
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index bb705a6df..a490115bb 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -7,6 +7,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 
 from users.models import ObjectPermission
+from utilities.permissions import resolve_permission
 
 
 class ObjectPermissionBackend(ModelBackend):
@@ -40,7 +41,6 @@ class ObjectPermissionBackend(ModelBackend):
         return user_obj._object_perm_cache
 
     def has_perm(self, user_obj, perm, obj=None):
-        # print(f'has_perm({perm})')
         app_label, codename = perm.split('.')
         action, model_name = codename.split('_')
 
@@ -120,10 +120,9 @@ class RemoteUserBackend(_RemoteUserBackend):
         permissions_list = []
         for permission_name in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS:
             try:
-                app_label, codename = permission_name.split('.')
-                action, model_name = codename.split('_')
+                content_type, action = resolve_permission(permission_name)
                 user.object_permissions.create(**{
-                    'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                    'model': content_type,
                     f'can_{action}': True
                 })
                 permissions_list.append(permission_name)
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 516d6fe5b..80d564db4 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,3 +1,6 @@
+from django.contrib.contenttypes.models import ContentType
+
+
 def get_permission_for_model(model, action):
     """
     Resolve the named permission for a given model (or instance) and action (e.g. view or add).
@@ -13,3 +16,20 @@ def get_permission_for_model(model, action):
         action,
         model._meta.model_name
     )
+
+
+def resolve_permission(name):
+    """
+    Given a permission name, return the relevant ContentType and action. For example, "dcim.view_site" returns
+    (Site, "view").
+
+    :param name: Permission name in the format <app>.<action>_<model>
+    """
+    app_label, codename = name.split('.')
+    action, model_name = codename.split('_')
+    try:
+        content_type = ContentType.objects.get(app_label=app_label, model=model_name)
+    except ContentType.DoesNotExist:
+        raise ValueError(f"Unknown app/model for {name}")
+
+    return content_type, action
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 86f465364..a505e6e03 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -7,6 +7,7 @@ from django.urls import reverse, NoReverseMatch
 from rest_framework.test import APIClient
 
 from users.models import ObjectPermission, Token
+from utilities.permissions import resolve_permission
 from .utils import disable_warnings, post_data
 
 
@@ -32,11 +33,9 @@ class TestCase(_TestCase):
         Assign a set of permissions to the test user. Accepts permission names in the form <app>.<action>_<model>.
         """
         for name in names:
-            app_label, codename = name.split('.')
-            action, model_name = codename.split('_')
-
+            ct, action = resolve_permission(name)
             self.user.object_permissions.create(**{
-                'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                'model': ct,
                 f'can_{action}': True
             })
 
@@ -45,11 +44,9 @@ class TestCase(_TestCase):
         Remove a set of permissions from the test user, if assigned.
         """
         for name in names:
-            app_label, codename = name.split('.')
-            action, model_name = codename.split('_')
-
+            ct, action = resolve_permission(name)
             self.user.object_permissions.filter(**{
-                'model': ContentType.objects.get(app_label=app_label, model=model_name),
+                'model': ct,
                 f'can_{action}': True
             }).delete()
 

From 5d36d81ae1fbd466a0e4f5331defb5562176a8f6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 11:08:35 -0400
Subject: [PATCH 061/505] Restore model-level permission tests

---
 netbox/users/models.py                    |   1 +
 netbox/utilities/testing/testcases.py     | 306 ++++++++++++----------
 netbox/virtualization/tests/test_views.py |   1 +
 3 files changed, 166 insertions(+), 142 deletions(-)

diff --git a/netbox/users/models.py b/netbox/users/models.py
index 17c5a3a65..721ca2f26 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -17,6 +17,7 @@ from utilities.utils import flatten_dict
 
 
 __all__ = (
+    'ObjectPermission',
     'Token',
     'UserConfig',
 )
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index a505e6e03..e665b2277 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -155,6 +155,13 @@ class ViewTestCases:
         """
         Retrieve a single instance.
         """
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_get_object_anonymous(self):
+            # Make the request as an unauthenticated user
+            self.client.logout()
+            response = self.client.get(self.model.objects.first().get_absolute_url())
+            self.assertHttpStatus(response, 200)
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_without_permission(self):
             instance = self.model.objects.first()
@@ -163,28 +170,29 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_get_object_with_model_permission(self):
-        #     instance = self.model.objects.first()
-        #
-        #     # Add model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'view'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_get_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Add model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_view=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_with_object_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
             # Add object-level permission
-            obj_perm = ObjectPermission(
+            self.user.object_permissions.create(
                 model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk': instance1.pk},
                 can_view=True
             )
-            obj_perm.save()
-            obj_perm.users.add(self.user)
 
             # Try GET to permitted object
             self.assertHttpStatus(self.client.get(instance1.get_absolute_url()), 200)
@@ -192,13 +200,6 @@ class ViewTestCases:
             # Try GET to non-permitted object
             self.assertHttpStatus(self.client.get(instance2.get_absolute_url()), 404)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-        def test_list_objects_anonymous(self):
-            # Make the request as an unauthenticated user
-            self.client.logout()
-            response = self.client.get(self.model.objects.first().get_absolute_url())
-            self.assertHttpStatus(response, 200)
-
     class CreateObjectViewTestCase(ModelViewTestCase):
         """
         Create a single new instance.
@@ -221,24 +222,27 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_create_object_with_model_permission(self):
-        #     initial_count = self.model.objects.count()
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'add'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
-        #
-        #     # Try POST with model-level permission
-        #     request = {
-        #         'path': self._get_url('add'),
-        #         'data': post_data(self.form_data),
-        #     }
-        #     self.assertHttpStatus(self.client.post(**request), 302)
-        #     self.assertEqual(initial_count + 1, self.model.objects.count())
-        #     self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_create_object_with_model_permission(self):
+            initial_count = self.model.objects.count()
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_add=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertEqual(initial_count + 1, self.model.objects.count())
+            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_create_object_with_object_permission(self):
@@ -300,23 +304,26 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_edit_object_with_model_permission(self):
-        #     instance = self.model.objects.first()
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'change'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
-        #
-        #     # Try POST with model-level permission
-        #     request = {
-        #         'path': self._get_url('edit', instance),
-        #         'data': post_data(self.form_data),
-        #     }
-        #     self.assertHttpStatus(self.client.post(**request), 302)
-        #     self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_edit_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_change=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('edit', instance),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_edit_object_with_object_permission(self):
@@ -372,24 +379,27 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_delete_object_with_model_permission(self):
-        #     instance = self.model.objects.first()
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'delete'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
-        #
-        #     # Try POST with model-level permission
-        #     request = {
-        #         'path': self._get_url('delete', instance),
-        #         'data': post_data({'confirm': True}),
-        #     }
-        #     self.assertHttpStatus(self.client.post(**request), 302)
-        #     with self.assertRaises(ObjectDoesNotExist):
-        #         self.model.objects.get(pk=instance.pk)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_delete_object_with_model_permission(self):
+            instance = self.model.objects.first()
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_delete=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
+
+            # Try POST with model-level permission
+            request = {
+                'path': self._get_url('delete', instance),
+                'data': post_data({'confirm': True}),
+            }
+            self.assertHttpStatus(self.client.post(**request), 302)
+            with self.assertRaises(ObjectDoesNotExist):
+                self.model.objects.get(pk=instance.pk)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_delete_object_with_object_permission(self):
@@ -431,6 +441,13 @@ class ViewTestCases:
         """
         Retrieve multiple instances.
         """
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_list_objects_anonymous(self):
+            # Make the request as an unauthenticated user
+            self.client.logout()
+            response = self.client.get(self._get_url('list'))
+            self.assertHttpStatus(response, 200)
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_without_permission(self):
 
@@ -438,20 +455,23 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.get(self._get_url('list')), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_list_objects_with_model_permission(self):
-        #
-        #     # Add model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'view'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
-        #
-        #     # Built-in CSV export
-        #     if hasattr(self.model, 'csv_headers'):
-        #         response = self.client.get('{}?export'.format(self._get_url('list')))
-        #         self.assertHttpStatus(response, 200)
-        #         self.assertEqual(response.get('Content-Type'), 'text/csv')
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects_with_model_permission(self):
+
+            # Add model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_view=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
+
+            # Built-in CSV export
+            if hasattr(self.model, 'csv_headers'):
+                response = self.client.get('{}?export'.format(self._get_url('list')))
+                self.assertHttpStatus(response, 200)
+                self.assertEqual(response.get('Content-Type'), 'text/csv')
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_with_object_permission(self):
@@ -471,13 +491,6 @@ class ViewTestCases:
 
             # TODO: Verify that only the permitted object is returned
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-        def test_list_objects_anonymous(self):
-            # Make the request as an unauthenticated user
-            self.client.logout()
-            response = self.client.get(self._get_url('list'))
-            self.assertHttpStatus(response, 200)
-
     class BulkCreateObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances using a single form. Expects the creation of three new instances by default.
@@ -536,22 +549,25 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_bulk_import_objects_with_model_permission(self):
-        #     initial_count = self.model.objects.count()
-        #     data = {
-        #         'csv': self._get_csv_data(),
-        #     }
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'add'))
-        #
-        #     # Try GET with model-level permission
-        #     self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
-        #
-        #     # Test POST with permission
-        #     self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
-        #     self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_import_objects_with_model_permission(self):
+            initial_count = self.model.objects.count()
+            data = {
+                'csv': self._get_csv_data(),
+            }
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_add=True
+            )
+
+            # Try GET with model-level permission
+            self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
+
+            # Test POST with permission
+            self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
+            self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_import_objects_with_object_permission(self):
@@ -597,24 +613,27 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_bulk_edit_objects_with_model_permission(self):
-        #     pk_list = self.model.objects.values_list('pk', flat=True)[:3]
-        #     data = {
-        #         'pk': pk_list,
-        #         '_apply': True,  # Form button
-        #     }
-        #
-        #     # Append the form data to the request
-        #     data.update(post_data(self.bulk_edit_data))
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'change'))
-        #
-        #     # Try POST with model-level permission
-        #     self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
-        #     for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
-        #         self.assertInstanceEqual(instance, self.bulk_edit_data)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_edit_objects_with_model_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
+
+            # Append the form data to the request
+            data.update(post_data(self.bulk_edit_data))
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_change=True
+            )
+
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
+            for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
+                self.assertInstanceEqual(instance, self.bulk_edit_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_edit_objects_with_object_permission(self):
@@ -664,21 +683,24 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 403)
 
-        # @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        # def test_bulk_delete_objects_with_model_permission(self):
-        #     pk_list = self.model.objects.values_list('pk', flat=True)
-        #     data = {
-        #         'pk': pk_list,
-        #         'confirm': True,
-        #         '_confirm': True,  # Form button
-        #     }
-        #
-        #     # Assign model-level permission
-        #     self.add_permissions(get_permission_for_model(self.model, 'delete'))
-        #
-        #     # Try POST with model-level permission
-        #     self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
-        #     self.assertEqual(self.model.objects.count(), 0)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_delete_objects_with_model_permission(self):
+            pk_list = self.model.objects.values_list('pk', flat=True)
+            data = {
+                'pk': pk_list,
+                'confirm': True,
+                '_confirm': True,  # Form button
+            }
+
+            # Assign model-level permission
+            self.user.object_permissions.create(
+                model=ContentType.objects.get_for_model(self.model),
+                can_delete=True
+            )
+
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
+            self.assertEqual(self.model.objects.count(), 0)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_delete_objects_with_object_permission(self):
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 006db34d6..067606648 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -192,6 +192,7 @@ class InterfaceTestCase(
     model = Interface
 
     # Disable inapplicable tests
+    test_list_objects_anonymous = None
     test_list_objects_without_permission = None
     test_list_objects_with_model_permission = None
     test_list_objects_with_object_permission = None

From 486f1a74abdef2561800c994ede207e7e4f96823 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 12:05:54 -0400
Subject: [PATCH 062/505] Standardize base classes for view test cases

---
 netbox/dcim/tests/test_views.py           | 62 +++++++++++++----------
 netbox/extras/tests/test_views.py         | 40 +++++++--------
 netbox/ipam/tests/test_views.py           | 16 +++---
 netbox/secrets/tests/test_views.py        | 19 +++----
 netbox/virtualization/tests/test_views.py | 16 +++---
 5 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 6e28700c8..cfbb2b95f 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -321,7 +321,16 @@ class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         )
 
 
-class DeviceTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class DeviceTypeTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.CreateObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = DeviceType
 
     @classmethod
@@ -792,14 +801,15 @@ class RearPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase
         }
 
 
-class DeviceBayTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase):
+# TODO: Change base class to DeviceComponentTemplateViewTestCase
+class DeviceBayTemplateTestCase(
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.BulkCreateObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = DeviceBayTemplate
 
-    # Disable inapplicable views
-    test_bulk_edit_objects_without_permission = None
-    test_bulk_edit_objects_with_model_permission = None
-    test_bulk_edit_objects_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
         manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1')
@@ -1439,14 +1449,18 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
         )
 
 
-class CableTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class CableTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkImportObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = Cable
 
-    # TODO: Creation URL needs termination context
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
@@ -1515,22 +1529,16 @@ class CableTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class VirtualChassisTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = VirtualChassis
 
-    # Disable inapplicable tests
-    test_bulk_import_objects_without_permission = None
-    test_bulk_import_objects_with_model_permission = None
-    test_bulk_import_objects_with_object_permission = None
-
-    # TODO: Requires special form handling
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-    test_edit_object_without_permission = None
-    test_edit_object_with_model_permission = None
-    test_edit_object_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index f52054cc1..6d41886fc 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -10,17 +10,17 @@ from extras.models import ConfigContext, ObjectChange, Tag
 from utilities.testing import ViewTestCases, TestCase
 
 
-class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class TagTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = Tag
 
-    # Disable inapplicable tests
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-    test_bulk_import_objects_without_permission = None
-    test_bulk_import_objects_with_model_permission = None
-    test_bulk_import_objects_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
@@ -42,22 +42,16 @@ class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-class ConfigContextTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class ConfigContextTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = ConfigContext
 
-    # Disable inapplicable tests
-    test_bulk_import_objects_without_permission = None
-    test_bulk_import_objects_with_model_permission = None
-    test_bulk_import_objects_with_object_permission = None
-
-    # TODO: Resolve model discrepancies when creating/editing ConfigContexts
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-    test_edit_object_without_permission = None
-    test_edit_object_with_model_permission = None
-    test_edit_object_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index bbd252473..794284dba 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -333,14 +333,18 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-class ServiceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Update base class to PrimaryObjectViewTestCase
+class ServiceTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkImportObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = Service
 
-    # TODO: Resolve URL for Service creation
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index 7796be63d..577ba4ef4 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -36,19 +36,16 @@ class SecretRoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
         )
 
 
-class SecretTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+# TODO: Change base class to PrimaryObjectViewTestCase
+class SecretTestCase(
+    ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = Secret
 
-    # Disable inapplicable tests
-    test_create_object_without_permission = None
-    test_create_object_with_model_permission = None
-    test_create_object_with_object_permission = None
-
-    # TODO: Check permissions enforcement on secrets.views.secret_edit
-    test_edit_object_without_permission = None
-    test_edit_object_with_model_permission = None
-    test_edit_object_with_object_permission = None
-
     @classmethod
     def setUpTestData(cls):
 
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 067606648..9fde12186 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -185,21 +185,17 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
+# TODO: Update base class to DeviceComponentViewTestCase
 class InterfaceTestCase(
     ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.DeviceComponentViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.BulkCreateObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
     model = Interface
 
-    # Disable inapplicable tests
-    test_list_objects_anonymous = None
-    test_list_objects_without_permission = None
-    test_list_objects_with_model_permission = None
-    test_list_objects_with_object_permission = None
-    test_bulk_import_objects_without_permission = None
-    test_bulk_import_objects_with_model_permission = None
-    test_bulk_import_objects_with_object_permission = None
-
     def _get_base_url(self):
         # Interface belongs to the DCIM app, so we have to override the base URL
         return 'virtualization:interface_{}'

From 73b7eb0c7fab5d304da88e04e3fb95c0b5819621 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 13:25:12 -0400
Subject: [PATCH 063/505] Skip queryset filtering for superusers

---
 netbox/utilities/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 6e93c2369..e73a55dc7 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -66,7 +66,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
             return False
 
         # Update the view's QuerySet to filter only the permitted objects
-        if user.is_authenticated:
+        if user.is_authenticated and not user.is_superuser:
             obj_perm_attrs = user._object_perm_cache[permission_required]
             attrs = Q()
             for perm_attrs in obj_perm_attrs:

From a8ed04c4d20b352b713ca191de9d1ba62f20a7af Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 13:25:37 -0400
Subject: [PATCH 064/505] Expose assigned ObjectPermissions on User instance

---
 netbox/utilities/auth_backends.py | 49 ++++++++++++++++---------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index a490115bb..ecb3ea652 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -3,7 +3,6 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
 from django.contrib.auth.models import Group
-from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 
 from users.models import ObjectPermission
@@ -12,33 +11,35 @@ from utilities.permissions import resolve_permission
 
 class ObjectPermissionBackend(ModelBackend):
 
+    def get_all_permissions(self, user_obj, obj=None):
+        if not user_obj.is_active or user_obj.is_anonymous:
+            return set()
+        if not hasattr(user_obj, '_object_perm_cache'):
+            user_obj._object_perm_cache = self.get_object_permissions(user_obj)
+        return user_obj._object_perm_cache
+
     def get_object_permissions(self, user_obj):
         """
         Return all permissions granted to the user by an ObjectPermission.
         """
-        if not hasattr(user_obj, '_object_perm_cache'):
+        # Retrieve all assigned ObjectPermissions
+        object_permissions = ObjectPermission.objects.filter(
+            Q(users=user_obj) |
+            Q(groups__user=user_obj)
+        ).prefetch_related('model')
 
-            # Retrieve all assigned ObjectPermissions
-            object_permissions = ObjectPermission.objects.filter(
-                Q(users=user_obj) |
-                Q(groups__user=user_obj)
-            ).prefetch_related('model')
+        # Create a dictionary mapping permissions to their attributes
+        perms = dict()
+        for obj_perm in object_permissions:
+            for action in ['view', 'add', 'change', 'delete']:
+                if getattr(obj_perm, f"can_{action}"):
+                    perm_name = f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}"
+                    if perm_name in perms:
+                        perms[perm_name].append(obj_perm.attrs)
+                    else:
+                        perms[perm_name] = [obj_perm.attrs]
 
-            # Create a dictionary mapping permissions to their attributes
-            perms = dict()
-            for obj_perm in object_permissions:
-                for action in ['view', 'add', 'change', 'delete']:
-                    if getattr(obj_perm, f"can_{action}"):
-                        perm_name = f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}"
-                        if perm_name in perms:
-                            perms[perm_name].append(obj_perm.attrs)
-                        else:
-                            perms[perm_name] = [obj_perm.attrs]
-
-            # Cache resolved permissions on the User instance
-            setattr(user_obj, '_object_perm_cache', perms)
-
-        return user_obj._object_perm_cache
+        return perms
 
     def has_perm(self, user_obj, perm, obj=None):
         app_label, codename = perm.split('.')
@@ -64,7 +65,7 @@ class ObjectPermissionBackend(ModelBackend):
             return False
 
         # If no applicable ObjectPermissions have been created for this user/permission, deny permission
-        if perm not in self.get_object_permissions(user_obj):
+        if perm not in self.get_all_permissions(user_obj):
             return False
 
         # If no object has been specified, grant permission. (The presence of a permission in this set tells
@@ -78,7 +79,7 @@ class ObjectPermissionBackend(ModelBackend):
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
         # Compile a query filter that matches all instances of the specified model
-        obj_perm_attrs = self.get_object_permissions(user_obj)[perm]
+        obj_perm_attrs = self.get_all_permissions(user_obj)[perm]
         attrs = Q()
         for perm_attrs in obj_perm_attrs:
             if perm_attrs:

From f8e29ea66a3415050e988643b9601b2d741cd09b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 13:47:52 -0400
Subject: [PATCH 065/505] Remove ObjectPermissionManager

---
 netbox/users/models.py | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/netbox/users/models.py b/netbox/users/models.py
index 721ca2f26..cf2ee3953 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -197,29 +197,6 @@ class Token(models.Model):
         return True
 
 
-class ObjectPermissionManager(models.Manager):
-
-    def get_attr_constraints(self, user, perm):
-        """
-        Compile all ObjectPermission attributes applicable to a specific combination of user, model, and action. Returns
-        a dictionary that can be passed directly to .filter() on a QuerySet.
-        """
-        content_type, action = resolve_permission(perm)
-        assert action in ['view', 'add', 'change', 'delete'], f"Invalid action: {action}"
-
-        qs = self.get_queryset().filter(
-            Q(users=user) | Q(groups__user=user),
-            model=content_type,
-            **{f'can_{action}': True}
-        )
-
-        attrs = Q()
-        for perm in qs:
-            attrs |= Q(**perm.attrs)
-
-        return attrs
-
-
 class ObjectPermission(models.Model):
     """
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
@@ -257,8 +234,6 @@ class ObjectPermission(models.Model):
         default=False
     )
 
-    objects = ObjectPermissionManager()
-
     class Meta:
         unique_together = ('model', 'attrs')
 

From 65bd3fbddb5769b07335bb00ffc8e44cfb33cf27 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 14:03:08 -0400
Subject: [PATCH 066/505] Remove built-in permission assignment from admin UI

---
 netbox/users/admin.py | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index fcaeb4ef0..8ea33514a 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -1,14 +1,26 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
 
 from .models import ObjectPermission, Token, UserConfig
 
-# Unregister the built-in UserAdmin so that we can use our custom admin view below
+# Unregister the built-in GroupAdmin and UserAdmin classes so that we can use our custom admin classes below
+admin.site.unregister(Group)
 admin.site.unregister(User)
 
 
+@admin.register(Group)
+class GroupAdmin(admin.ModelAdmin):
+    fields = ('name',)
+    list_display = ('name', 'user_count')
+    ordering = ('name',)
+    search_fields = ('name',)
+
+    def user_count(self, obj):
+        return obj.user_set.count()
+
+
 class UserConfigInline(admin.TabularInline):
     model = UserConfig
     readonly_fields = ('data',)
@@ -21,6 +33,14 @@ class UserAdmin(UserAdmin_):
     list_display = [
         'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active'
     ]
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        ('Personal info', {'fields': ('first_name', 'last_name', 'email')}),
+        ('Permissions', {
+            'fields': ('is_active', 'is_staff', 'is_superuser'),
+        }),
+        ('Important dates', {'fields': ('last_login', 'date_joined')}),
+    )
     inlines = (UserConfigInline,)
 
 

From bdfc0364d520e93fd38c51a412d805eff01c3a89 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 14:20:18 -0400
Subject: [PATCH 067/505] Fix up ObjectPermission content type assignment

---
 netbox/users/admin.py                         | 29 +++++++++++++++++++
 .../users/migrations/0007_objectpermission.py |  2 +-
 netbox/users/models.py                        |  5 ++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 8ea33514a..e13904eea 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -3,8 +3,14 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group, User
 
+from extras.admin import order_content_types
 from .models import ObjectPermission, Token, UserConfig
 
+
+#
+# Users & groups
+#
+
 # Unregister the built-in GroupAdmin and UserAdmin classes so that we can use our custom admin classes below
 admin.site.unregister(Group)
 admin.site.unregister(User)
@@ -44,6 +50,10 @@ class UserAdmin(UserAdmin_):
     inlines = (UserConfigInline,)
 
 
+#
+# REST API tokens
+#
+
 class TokenAdminForm(forms.ModelForm):
     key = forms.CharField(
         required=False,
@@ -65,8 +75,27 @@ class TokenAdmin(admin.ModelAdmin):
     ]
 
 
+#
+# Permissions
+#
+
+class ObjectPermissionForm(forms.ModelForm):
+
+    class Meta:
+        model = ObjectPermission
+        exclude = []
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Format ContentType choices
+        order_content_types(self.fields['model'])
+        self.fields['model'].choices.insert(0, ('', '---------'))
+
+
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
+    form = ObjectPermissionForm
     list_display = [
         'model', 'can_view', 'can_add', 'can_change', 'can_delete'
     ]
diff --git a/netbox/users/migrations/0007_objectpermission.py b/netbox/users/migrations/0007_objectpermission.py
index 1fadcc9a5..da176dd5d 100644
--- a/netbox/users/migrations/0007_objectpermission.py
+++ b/netbox/users/migrations/0007_objectpermission.py
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
                 ('can_change', models.BooleanField(default=False)),
                 ('can_delete', models.BooleanField(default=False)),
                 ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
-                ('model', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+                ('model', models.ForeignKey(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
             options={
diff --git a/netbox/users/models.py b/netbox/users/models.py
index cf2ee3953..6de7bf01a 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -214,6 +214,11 @@ class ObjectPermission(models.Model):
     )
     model = models.ForeignKey(
         to=ContentType,
+        limit_choices_to={
+            'app_label__in': [
+                'circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization',
+            ],
+        },
         on_delete=models.CASCADE
     )
     attrs = JSONField(

From f65b2278f0a64ea0bf747d00b532a7aa5cb45812 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 28 May 2020 15:04:46 -0400
Subject: [PATCH 068/505] Enable many-to-many model assignment for
 ObjectPermissions

---
 netbox/netbox/tests/test_authentication.py    | 78 ++++++++++------
 netbox/users/admin.py                         |  4 +-
 .../users/migrations/0007_objectpermission.py |  8 +-
 netbox/users/models.py                        |  8 +-
 netbox/utilities/auth_backends.py             | 25 ++---
 netbox/utilities/testing/testcases.py         | 93 ++++++++++---------
 6 files changed, 122 insertions(+), 94 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 74f4c411a..ad900bdc0 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -201,11 +201,13 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve permitted object
         response = self.client.get(self.prefixes[0].get_absolute_url())
@@ -223,11 +225,13 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(reverse('ipam:prefix_list'))
@@ -255,12 +259,14 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertEqual(initial_count, Prefix.objects.count())
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_add=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create a non-permitted object
         request = {
@@ -301,12 +307,14 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_change=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit a non-permitted object
         request = {
@@ -343,12 +351,14 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_delete=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Delete permitted object
         request = {
@@ -390,11 +400,13 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertEqual(initial_count, Prefix.objects.count())
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_add=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create non-permitted objects
         request = {
@@ -437,11 +449,13 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_change=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit non-permitted objects
         request = {
@@ -479,12 +493,14 @@ class ObjectPermissionViewTestCase(TestCase):
         self.assertHttpStatus(response, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True,
             can_delete=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to delete non-permitted object
         request = {
@@ -549,11 +565,13 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
@@ -574,11 +592,13 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_view=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(url, **self.header)
@@ -599,11 +619,13 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_add=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create a non-permitted object
         response = self.client.post(url, data, format='json', **self.header)
@@ -626,11 +648,13 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_change=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit a non-permitted object
         data = {'site': self.sites[0].pk}
@@ -659,11 +683,13 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         self.assertEqual(response.status_code, 403)
 
         # Assign object permission
-        self.user.object_permissions.create(
-            model=ContentType.objects.get_for_model(Prefix),
+        obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
             can_delete=True
         )
+        obj_perm.save()
+        obj_perm.users.add(self.user)
+        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to delete a non-permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index e13904eea..89aa3f49a 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -89,8 +89,8 @@ class ObjectPermissionForm(forms.ModelForm):
         super().__init__(*args, **kwargs)
 
         # Format ContentType choices
-        order_content_types(self.fields['model'])
-        self.fields['model'].choices.insert(0, ('', '---------'))
+        order_content_types(self.fields['content_types'])
+        self.fields['content_types'].choices.insert(0, ('', '---------'))
 
 
 @admin.register(ObjectPermission)
diff --git a/netbox/users/migrations/0007_objectpermission.py b/netbox/users/migrations/0007_objectpermission.py
index da176dd5d..2052ffbb2 100644
--- a/netbox/users/migrations/0007_objectpermission.py
+++ b/netbox/users/migrations/0007_objectpermission.py
@@ -1,9 +1,8 @@
-# Generated by Django 3.0.6 on 2020-05-27 14:17
+# Generated by Django 3.0.6 on 2020-05-28 18:24
 
 from django.conf import settings
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -25,12 +24,9 @@ class Migration(migrations.Migration):
                 ('can_add', models.BooleanField(default=False)),
                 ('can_change', models.BooleanField(default=False)),
                 ('can_delete', models.BooleanField(default=False)),
+                ('content_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
                 ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
-                ('model', models.ForeignKey(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-                'unique_together': {('model', 'attrs')},
-            },
         ),
     ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 6de7bf01a..bddae2ff7 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -212,14 +212,14 @@ class ObjectPermission(models.Model):
         blank=True,
         related_name='object_permissions'
     )
-    model = models.ForeignKey(
+    content_types = models.ManyToManyField(
         to=ContentType,
         limit_choices_to={
             'app_label__in': [
                 'circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization',
             ],
         },
-        on_delete=models.CASCADE
+        related_name='object_permissions'
     )
     attrs = JSONField(
         blank=True,
@@ -239,8 +239,8 @@ class ObjectPermission(models.Model):
         default=False
     )
 
-    class Meta:
-        unique_together = ('model', 'attrs')
+    def __str__(self):
+        return "Object permission"
 
     def clean(self):
 
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index ecb3ea652..36796194e 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -26,18 +26,19 @@ class ObjectPermissionBackend(ModelBackend):
         object_permissions = ObjectPermission.objects.filter(
             Q(users=user_obj) |
             Q(groups__user=user_obj)
-        ).prefetch_related('model')
+        ).prefetch_related('content_types')
 
         # Create a dictionary mapping permissions to their attributes
         perms = dict()
         for obj_perm in object_permissions:
-            for action in ['view', 'add', 'change', 'delete']:
-                if getattr(obj_perm, f"can_{action}"):
-                    perm_name = f"{obj_perm.model.app_label}.{action}_{obj_perm.model.model}"
-                    if perm_name in perms:
-                        perms[perm_name].append(obj_perm.attrs)
-                    else:
-                        perms[perm_name] = [obj_perm.attrs]
+            for content_type in obj_perm.content_types.all():
+                for action in ['view', 'add', 'change', 'delete']:
+                    if getattr(obj_perm, f"can_{action}"):
+                        perm_name = f"{content_type.app_label}.{action}_{content_type.model}"
+                        if perm_name in perms:
+                            perms[perm_name].append(obj_perm.attrs)
+                        else:
+                            perms[perm_name] = [obj_perm.attrs]
 
         return perms
 
@@ -122,10 +123,10 @@ class RemoteUserBackend(_RemoteUserBackend):
         for permission_name in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS:
             try:
                 content_type, action = resolve_permission(permission_name)
-                user.object_permissions.create(**{
-                    'model': content_type,
-                    f'can_{action}': True
-                })
+                obj_perm = ObjectPermission(**{f'can_{action}': True})
+                obj_perm.save()
+                obj_perm.users.add(user)
+                obj_perm.content_types.add(content_type)
                 permissions_list.append(permission_name)
             except ValueError:
                 logging.error(
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index e665b2277..cde394422 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -34,21 +34,10 @@ class TestCase(_TestCase):
         """
         for name in names:
             ct, action = resolve_permission(name)
-            self.user.object_permissions.create(**{
-                'model': ct,
-                f'can_{action}': True
-            })
-
-    def remove_permissions(self, *names):
-        """
-        Remove a set of permissions from the test user, if assigned.
-        """
-        for name in names:
-            ct, action = resolve_permission(name)
-            self.user.object_permissions.filter(**{
-                'model': ct,
-                f'can_{action}': True
-            }).delete()
+            obj_perm = ObjectPermission(**{f'can_{action}': True})
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ct)
 
     #
     # Convenience methods
@@ -175,10 +164,12 @@ class ViewTestCases:
             instance = self.model.objects.first()
 
             # Add model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_view=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
@@ -188,11 +179,13 @@ class ViewTestCases:
             instance1, instance2 = self.model.objects.all()[:2]
 
             # Add object-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 attrs={'pk': instance1.pk},
                 can_view=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET to permitted object
             self.assertHttpStatus(self.client.get(instance1.get_absolute_url()), 200)
@@ -227,10 +220,12 @@ class ViewTestCases:
             initial_count = self.model.objects.count()
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_add=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -250,12 +245,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk__gt': 0},  # Dummy permission to allow all
                 can_add=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with object-level permission
             self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -309,10 +304,12 @@ class ViewTestCases:
             instance = self.model.objects.first()
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_change=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
@@ -331,12 +328,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk': instance1.pk},
                 can_change=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with a permitted object
             self.assertHttpStatus(self.client.get(self._get_url('edit', instance1)), 200)
@@ -384,10 +381,12 @@ class ViewTestCases:
             instance = self.model.objects.first()
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_delete=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
@@ -407,12 +406,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk': instance1.pk},
                 can_delete=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with a permitted object
             self.assertHttpStatus(self.client.get(self._get_url('delete', instance1)), 200)
@@ -459,10 +458,12 @@ class ViewTestCases:
         def test_list_objects_with_model_permission(self):
 
             # Add model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_view=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
@@ -479,12 +480,12 @@ class ViewTestCases:
 
             # Add object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk': instance1.pk},
                 can_view=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with object-level permission
             self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
@@ -511,12 +512,10 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(**request), 403)
 
             # Assign object-level permission
-            obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
-                can_add=True
-            )
+            obj_perm = ObjectPermission(can_add=True)
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
@@ -557,10 +556,12 @@ class ViewTestCases:
             }
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_add=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
@@ -578,12 +579,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk__gt': 0},  # Dummy permission to allow all
                 can_add=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Test import with object-level permission
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
@@ -625,10 +626,12 @@ class ViewTestCases:
             data.update(post_data(self.bulk_edit_data))
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_change=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
@@ -648,12 +651,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk__in': list(pk_list)},
                 can_change=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
@@ -693,10 +696,12 @@ class ViewTestCases:
             }
 
             # Assign model-level permission
-            self.user.object_permissions.create(
-                model=ContentType.objects.get_for_model(self.model),
+            obj_perm = ObjectPermission(
                 can_delete=True
             )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
@@ -713,12 +718,12 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                model=ContentType.objects.get_for_model(self.model),
                 attrs={'pk__in': list(pk_list)},
                 can_delete=True
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
+            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with object-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)

From 90828cedae230d75b2bec4cb568db27161207aa4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 10:31:34 -0400
Subject: [PATCH 069/505] Introduce proxy models for User and Group to organize
 admin UI

---
 netbox/users/admin.py                         |  8 ++--
 .../users/migrations/0007_objectpermission.py | 32 --------------
 .../users/migrations/0007_proxy_group_user.py | 44 +++++++++++++++++++
 netbox/users/models.py                        | 36 +++++++++++++--
 4 files changed, 81 insertions(+), 39 deletions(-)
 delete mode 100644 netbox/users/migrations/0007_objectpermission.py
 create mode 100644 netbox/users/migrations/0007_proxy_group_user.py

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 89aa3f49a..9482efd5c 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -1,10 +1,10 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import Group as StockGroup, User as StockUser
 
 from extras.admin import order_content_types
-from .models import ObjectPermission, Token, UserConfig
+from .models import Group, User, ObjectPermission, Token, UserConfig
 
 
 #
@@ -12,8 +12,8 @@ from .models import ObjectPermission, Token, UserConfig
 #
 
 # Unregister the built-in GroupAdmin and UserAdmin classes so that we can use our custom admin classes below
-admin.site.unregister(Group)
-admin.site.unregister(User)
+admin.site.unregister(StockGroup)
+admin.site.unregister(StockUser)
 
 
 @admin.register(Group)
diff --git a/netbox/users/migrations/0007_objectpermission.py b/netbox/users/migrations/0007_objectpermission.py
deleted file mode 100644
index 2052ffbb2..000000000
--- a/netbox/users/migrations/0007_objectpermission.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by Django 3.0.6 on 2020-05-28 18:24
-
-from django.conf import settings
-import django.contrib.postgres.fields.jsonb
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('auth', '0011_update_proxy_permissions'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('users', '0006_create_userconfigs'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ObjectPermission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('attrs', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
-                ('can_view', models.BooleanField(default=False)),
-                ('can_add', models.BooleanField(default=False)),
-                ('can_change', models.BooleanField(default=False)),
-                ('can_delete', models.BooleanField(default=False)),
-                ('content_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
-                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
-                ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]
diff --git a/netbox/users/migrations/0007_proxy_group_user.py b/netbox/users/migrations/0007_proxy_group_user.py
new file mode 100644
index 000000000..4a72eedd2
--- /dev/null
+++ b/netbox/users/migrations/0007_proxy_group_user.py
@@ -0,0 +1,44 @@
+# Generated by Django 3.0.6 on 2020-05-29 14:30
+
+import django.contrib.auth.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0011_update_proxy_permissions'),
+        ('users', '0006_create_userconfigs'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Group',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('auth.group',),
+            managers=[
+                ('objects', django.contrib.auth.models.GroupManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index bddae2ff7..d2a4a152a 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -1,18 +1,16 @@
 import binascii
 import os
 
-from django.contrib.auth.models import Group, User
+from django.contrib.auth.models import Group as Group_, User as User_
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import JSONField
 from django.core.exceptions import FieldError, ValidationError
 from django.core.validators import MinLengthValidator
 from django.db import models
-from django.db.models import Q
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
 
-from utilities.permissions import resolve_permission
 from utilities.utils import flatten_dict
 
 
@@ -23,6 +21,30 @@ __all__ = (
 )
 
 
+#
+# Proxy models for admin
+#
+
+class Group(Group_):
+    """
+    Proxy contrib.auth.models.Group for the admin UI
+    """
+    class Meta:
+        proxy = True
+
+
+class User(User_):
+    """
+    Proxy contrib.auth.models.User for the admin UI
+    """
+    class Meta:
+        proxy = True
+
+
+#
+# User preferences
+#
+
 class UserConfig(models.Model):
     """
     This model stores arbitrary user-specific preferences in a JSON data structure.
@@ -143,6 +165,10 @@ def create_userconfig(instance, created, **kwargs):
         UserConfig(user=instance).save()
 
 
+#
+# REST API
+#
+
 class Token(models.Model):
     """
     An API token used for user authentication. This extends the stock model to allow each user to have multiple tokens.
@@ -197,6 +223,10 @@ class Token(models.Model):
         return True
 
 
+#
+# Permissions
+#
+
 class ObjectPermission(models.Model):
     """
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects

From 02687453f2cf8068d6ca999cbf27eb5b761f4ca3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 11:18:22 -0400
Subject: [PATCH 070/505] Add ArrayField on ObjectPermission to store actions

---
 netbox/netbox/tests/test_authentication.py    | 30 ++++++--------
 netbox/users/admin.py                         | 40 +++++++++++++++++--
 .../users/migrations/0007_proxy_group_user.py |  4 +-
 .../users/migrations/0008_objectpermission.py | 33 +++++++++++++++
 netbox/users/models.py                        | 39 +++++-------------
 netbox/utilities/auth_backends.py             | 16 ++++----
 netbox/utilities/testing/testcases.py         | 36 ++++++++---------
 7 files changed, 120 insertions(+), 78 deletions(-)
 create mode 100644 netbox/users/migrations/0008_objectpermission.py

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index ad900bdc0..bef8f004a 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -203,7 +203,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True
+            actions=['view']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -227,7 +227,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True
+            actions=['view']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -261,8 +261,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True,
-            can_add=True
+            actions=['view', 'add']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -309,8 +308,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True,
-            can_change=True
+            actions=['view', 'change']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -353,8 +351,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True,
-            can_delete=True
+            actions=['view', 'delete']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -402,7 +399,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_add=True
+            actions=['add']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -451,7 +448,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_change=True
+            actions=['change']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -495,8 +492,7 @@ class ObjectPermissionViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True,
-            can_delete=True
+            actions=['view', 'delete']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -567,7 +563,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True
+            actions=['view']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -594,7 +590,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_view=True
+            actions=['view']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -621,7 +617,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_add=True
+            actions=['add']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -650,7 +646,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_change=True
+            actions=['change']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
@@ -685,7 +681,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         # Assign object permission
         obj_perm = ObjectPermission(
             attrs={'site__name': 'Site 1'},
-            can_delete=True
+            actions=['delete']
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 9482efd5c..507b75869 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -2,9 +2,10 @@ from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group as StockGroup, User as StockUser
+from django.core.exceptions import FieldError, ValidationError
 
 from extras.admin import order_content_types
-from .models import Group, User, ObjectPermission, Token, UserConfig
+from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig
 
 
 #
@@ -16,7 +17,7 @@ admin.site.unregister(StockGroup)
 admin.site.unregister(StockUser)
 
 
-@admin.register(Group)
+@admin.register(AdminGroup)
 class GroupAdmin(admin.ModelAdmin):
     fields = ('name',)
     list_display = ('name', 'user_count')
@@ -34,7 +35,7 @@ class UserConfigInline(admin.TabularInline):
     verbose_name = 'Preferences'
 
 
-@admin.register(User)
+@admin.register(AdminUser)
 class UserAdmin(UserAdmin_):
     list_display = [
         'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active'
@@ -92,10 +93,41 @@ class ObjectPermissionForm(forms.ModelForm):
         order_content_types(self.fields['content_types'])
         self.fields['content_types'].choices.insert(0, ('', '---------'))
 
+    def clean(self):
+        content_types = self.cleaned_data['content_types']
+        attrs = self.cleaned_data['attrs']
+
+        # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
+        # returns anything; we just want to make sure the specified attributes are valid.
+        if attrs:
+            for ct in content_types:
+                model = ct.model_class()
+                try:
+                    model.objects.filter(**attrs).exists()
+                except FieldError as e:
+                    raise ValidationError({
+                        'attrs': f'Invalid attributes for {model}: {e}'
+                    })
+
 
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
     form = ObjectPermissionForm
     list_display = [
-        'model', 'can_view', 'can_add', 'can_change', 'can_delete'
+        'list_models', 'list_users', 'list_groups', 'actions', 'attrs',
     ]
+
+    def get_queryset(self, request):
+        return super().get_queryset(request).prefetch_related('content_types', 'users', 'groups')
+
+    def list_models(self, obj):
+        return ', '.join([f"{ct}" for ct in obj.content_types.all()])
+    list_models.short_description = 'Models'
+
+    def list_users(self, obj):
+        return ', '.join([u.username for u in obj.users.all()])
+    list_users.short_description = 'Users'
+
+    def list_groups(self, obj):
+        return ', '.join([g.name for g in obj.groups.all()])
+    list_groups.short_description = 'Groups'
diff --git a/netbox/users/migrations/0007_proxy_group_user.py b/netbox/users/migrations/0007_proxy_group_user.py
index 4a72eedd2..dfd0512bd 100644
--- a/netbox/users/migrations/0007_proxy_group_user.py
+++ b/netbox/users/migrations/0007_proxy_group_user.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Group',
+            name='AdminGroup',
             fields=[
             ],
             options={
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='User',
+            name='AdminUser',
             fields=[
             ],
             options={
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
new file mode 100644
index 000000000..f2ecb98b0
--- /dev/null
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.6 on 2020-05-29 14:59
+
+from django.conf import settings
+import django.contrib.postgres.fields
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('auth', '0011_update_proxy_permissions'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('users', '0007_proxy_group_user'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ObjectPermission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('attrs', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
+                ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
+                ('content_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
+                ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
+                ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Permission',
+            },
+        ),
+    ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index d2a4a152a..1c8775699 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -1,10 +1,9 @@
 import binascii
 import os
 
-from django.contrib.auth.models import Group as Group_, User as User_
+from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import JSONField
-from django.core.exceptions import FieldError, ValidationError
+from django.contrib.postgres.fields import ArrayField, JSONField
 from django.core.validators import MinLengthValidator
 from django.db import models
 from django.db.models.signals import post_save
@@ -25,7 +24,7 @@ __all__ = (
 # Proxy models for admin
 #
 
-class Group(Group_):
+class AdminGroup(Group):
     """
     Proxy contrib.auth.models.Group for the admin UI
     """
@@ -33,7 +32,7 @@ class Group(Group_):
         proxy = True
 
 
-class User(User_):
+class AdminUser(User):
     """
     Proxy contrib.auth.models.User for the admin UI
     """
@@ -256,31 +255,13 @@ class ObjectPermission(models.Model):
         null=True,
         verbose_name='Attributes'
     )
-    can_view = models.BooleanField(
-        default=False
-    )
-    can_add = models.BooleanField(
-        default=False
-    )
-    can_change = models.BooleanField(
-        default=False
-    )
-    can_delete = models.BooleanField(
-        default=False
+    actions = ArrayField(
+        base_field=models.CharField(max_length=30),
+        help_text="The list of actions granted by this permission"
     )
 
+    class Meta:
+        verbose_name = "Permission"
+
     def __str__(self):
         return "Object permission"
-
-    def clean(self):
-
-        # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
-        # returns anything; we just want to make sure the specified attributes are valid.
-        if self.attrs:
-            model = self.model.model_class()
-            try:
-                model.objects.filter(**self.attrs).exists()
-            except FieldError as e:
-                raise ValidationError({
-                    'attrs': f'Invalid attributes for {model}: {e}'
-                })
diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index 36796194e..bc263480f 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -32,13 +32,12 @@ class ObjectPermissionBackend(ModelBackend):
         perms = dict()
         for obj_perm in object_permissions:
             for content_type in obj_perm.content_types.all():
-                for action in ['view', 'add', 'change', 'delete']:
-                    if getattr(obj_perm, f"can_{action}"):
-                        perm_name = f"{content_type.app_label}.{action}_{content_type.model}"
-                        if perm_name in perms:
-                            perms[perm_name].append(obj_perm.attrs)
-                        else:
-                            perms[perm_name] = [obj_perm.attrs]
+                for action in obj_perm.actions:
+                    perm_name = f"{content_type.app_label}.{action}_{content_type.model}"
+                    if perm_name in perms:
+                        perms[perm_name].append(obj_perm.attrs)
+                    else:
+                        perms[perm_name] = [obj_perm.attrs]
 
         return perms
 
@@ -123,7 +122,8 @@ class RemoteUserBackend(_RemoteUserBackend):
         for permission_name in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS:
             try:
                 content_type, action = resolve_permission(permission_name)
-                obj_perm = ObjectPermission(**{f'can_{action}': True})
+                # TODO: Merge multiple actions into a single ObjectPermission per content type
+                obj_perm = ObjectPermission(actions=[action])
                 obj_perm.save()
                 obj_perm.users.add(user)
                 obj_perm.content_types.add(content_type)
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index cde394422..3514f9060 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -34,7 +34,7 @@ class TestCase(_TestCase):
         """
         for name in names:
             ct, action = resolve_permission(name)
-            obj_perm = ObjectPermission(**{f'can_{action}': True})
+            obj_perm = ObjectPermission(actions=[action])
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.content_types.add(ct)
@@ -165,7 +165,7 @@ class ViewTestCases:
 
             # Add model-level permission
             obj_perm = ObjectPermission(
-                can_view=True
+                actions=['view']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -181,7 +181,7 @@ class ViewTestCases:
             # Add object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk': instance1.pk},
-                can_view=True
+                actions=['view']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -221,7 +221,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_add=True
+                actions=['add']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -246,7 +246,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk__gt': 0},  # Dummy permission to allow all
-                can_add=True
+                actions=['add']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -305,7 +305,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_change=True
+                actions=['change']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -329,7 +329,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk': instance1.pk},
-                can_change=True
+                actions=['change']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -382,7 +382,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_delete=True
+                actions=['delete']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -407,7 +407,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk': instance1.pk},
-                can_delete=True
+                actions=['delete']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -459,7 +459,7 @@ class ViewTestCases:
 
             # Add model-level permission
             obj_perm = ObjectPermission(
-                can_view=True
+                actions=['view']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -481,7 +481,7 @@ class ViewTestCases:
             # Add object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk': instance1.pk},
-                can_view=True
+                actions=['view']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -512,7 +512,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(**request), 403)
 
             # Assign object-level permission
-            obj_perm = ObjectPermission(can_add=True)
+            obj_perm = ObjectPermission(actions=['add'])
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
@@ -557,7 +557,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_add=True
+                actions=['add']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -580,7 +580,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk__gt': 0},  # Dummy permission to allow all
-                can_add=True
+                actions=['add']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -627,7 +627,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_change=True
+                actions=['change']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -652,7 +652,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk__in': list(pk_list)},
-                can_change=True
+                actions=['change']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -697,7 +697,7 @@ class ViewTestCases:
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
-                can_delete=True
+                actions=['delete']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
@@ -719,7 +719,7 @@ class ViewTestCases:
             # Assign object-level permission
             obj_perm = ObjectPermission(
                 attrs={'pk__in': list(pk_list)},
-                can_delete=True
+                actions=['delete']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)

From 85c54703ec13dbd912f8d3ab12f0f783b7211cfa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 12:08:51 -0400
Subject: [PATCH 071/505] Improve the admin form for ObjectPermissions

---
 netbox/users/admin.py | 45 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 507b75869..e76150fc4 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -81,22 +81,53 @@ class TokenAdmin(admin.ModelAdmin):
 #
 
 class ObjectPermissionForm(forms.ModelForm):
+    can_view = forms.BooleanField(required=False)
+    can_add = forms.BooleanField(required=False)
+    can_change = forms.BooleanField(required=False)
+    can_delete = forms.BooleanField(required=False)
 
     class Meta:
         model = ObjectPermission
         exclude = []
+        help_texts = {
+            'actions': 'Actions granted in addition to those listed above'
+        }
+        labels = {
+            'actions': 'Additional actions'
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        # Make the actions field optional since the admin form uses it only for non-CRUD actions
+        self.fields['actions'].required = False
+
         # Format ContentType choices
         order_content_types(self.fields['content_types'])
         self.fields['content_types'].choices.insert(0, ('', '---------'))
 
+        # Check the appropriate checkboxes when editing an existing ObjectPermission
+        if self.instance:
+            for action in ['view', 'add', 'change', 'delete']:
+                if action in self.instance.actions:
+                    self.fields[f'can_{action}'].initial = True
+                    self.instance.actions.remove(action)
+
     def clean(self):
         content_types = self.cleaned_data['content_types']
         attrs = self.cleaned_data['attrs']
 
+        # Append any of the selected CRUD checkboxes to the actions list
+        if not self.cleaned_data.get('actions'):
+            self.cleaned_data['actions'] = list()
+        for action in ['view', 'add', 'change', 'delete']:
+            if self.cleaned_data[f'can_{action}'] and action not in self.cleaned_data['actions']:
+                self.cleaned_data['actions'].append(action)
+
+        # At least one action must be specified
+        if not self.cleaned_data['actions']:
+            raise ValidationError("At least one action must be selected.")
+
         # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
         # returns anything; we just want to make sure the specified attributes are valid.
         if attrs:
@@ -112,6 +143,20 @@ class ObjectPermissionForm(forms.ModelForm):
 
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
+    fieldsets = (
+        ('Objects', {
+            'fields': ('content_types',)
+        }),
+        ('Assignment', {
+            'fields': (('groups', 'users'),)
+        }),
+        ('Actions', {
+            'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
+        }),
+        ('Constraints', {
+            'fields': ('attrs',)
+        }),
+    )
     form = ObjectPermissionForm
     list_display = [
         'list_models', 'list_users', 'list_groups', 'actions', 'attrs',

From 5d3cf8074bc50e5e269fab047d64db8cc60d16e6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 13:42:38 -0400
Subject: [PATCH 072/505] Add migration for replicating legact permissions to
 ObjectPermissions

---
 .../migrations/0009_replicate_permissions.py  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 netbox/users/migrations/0009_replicate_permissions.py

diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
new file mode 100644
index 000000000..ba0663a0c
--- /dev/null
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -0,0 +1,41 @@
+from django.db import migrations
+
+
+ACTIONS = ['view', 'add', 'change', 'delete']
+
+
+def replicate_permissions(apps, schema_editor):
+    """
+    Replicate all Permission assignments as ObjectPermissions.
+    """
+    Permission = apps.get_model('auth', 'Permission')
+    ObjectPermission = apps.get_model('users', 'ObjectPermission')
+
+    # TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
+    # are combined into a single ObjectPermission instance.
+    for perm in Permission.objects.all():
+        print(f'Replicating permission {perm.codename}')
+        action, model_name = perm.codename.split('_')
+
+        if perm.group_set.exists() or perm.user_set.exists():
+            obj_perm = ObjectPermission(actions=[action])
+            obj_perm.save()
+            obj_perm.content_types.add(perm.content_type)
+            if perm.group_set.exists():
+                obj_perm.groups.add(*list(perm.group_set.all()))
+            if perm.user_set.exists():
+                obj_perm.users.add(*list(perm.user_set.all()))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0008_objectpermission'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=replicate_permissions,
+            reverse_code=migrations.RunPython.noop
+        )
+    ]

From 670139492d1a8c7f70aeb715d78f7f22d00f2d9b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 13:47:19 -0400
Subject: [PATCH 073/505] Fix permission action evaluation

---
 netbox/users/migrations/0009_replicate_permissions.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index ba0663a0c..c5e4d364c 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -14,8 +14,11 @@ def replicate_permissions(apps, schema_editor):
     # TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
     # are combined into a single ObjectPermission instance.
     for perm in Permission.objects.all():
-        print(f'Replicating permission {perm.codename}')
-        action, model_name = perm.codename.split('_')
+        # Account for non-standard permission names; e.g. napalm_read
+        if perm.codename.split('_')[0] in ACTIONS:
+            action = perm.codename.split('_')[0]
+        else:
+            action = perm.codename
 
         if perm.group_set.exists() or perm.user_set.exists():
             obj_perm = ObjectPermission(actions=[action])

From 8786bb25c519a71bd6f8d205b400e8413cf4e456 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 13:57:38 -0400
Subject: [PATCH 074/505] Fix instance evaluation

---
 netbox/users/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index e76150fc4..c1b659a8e 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -107,7 +107,7 @@ class ObjectPermissionForm(forms.ModelForm):
         self.fields['content_types'].choices.insert(0, ('', '---------'))
 
         # Check the appropriate checkboxes when editing an existing ObjectPermission
-        if self.instance:
+        if self.instance.pk:
             for action in ['view', 'add', 'change', 'delete']:
                 if action in self.instance.actions:
                     self.fields[f'can_{action}'].initial = True

From 58989b85c866cd526b1f6a21d0635f823783d625 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 14:12:24 -0400
Subject: [PATCH 075/505] Introduce restrict_queryset()

---
 netbox/utilities/api.py         | 11 +++--------
 netbox/utilities/permissions.py | 18 ++++++++++++++++++
 netbox/utilities/views.py       | 12 +++---------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 41002dd20..ef2650535 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDoesNotExist, PermissionDenied
 from django.db import transaction
-from django.db.models import ManyToManyField, ProtectedError, Q
+from django.db.models import ManyToManyField, ProtectedError
 from django.urls import reverse
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import BasePermission
@@ -16,7 +16,7 @@ from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
 from netbox.api import TokenPermissions
-from users.models import ObjectPermission
+from utilities.permissions import restrict_queryset
 from .utils import dict_to_filter_params, dynamic_import
 
 
@@ -340,12 +340,7 @@ class ModelViewSet(_ModelViewSet):
         permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
 
         # Update the view's QuerySet to filter only the permitted objects
-        obj_perm_attrs = request.user._object_perm_cache[permission_required]
-        attrs = Q()
-        for perm_attrs in obj_perm_attrs:
-            if perm_attrs:
-                attrs |= Q(**perm_attrs)
-        self.queryset = self.queryset.filter(attrs)
+        self.queryset = restrict_queryset(self.queryset, request.user, permission_required)
 
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 80d564db4..be5c0189e 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 
 
 def get_permission_for_model(model, action):
@@ -33,3 +34,20 @@ def resolve_permission(name):
         raise ValueError(f"Unknown app/model for {name}")
 
     return content_type, action
+
+
+def restrict_queryset(queryset, user, permission_required):
+    """
+    Filters a QuerySet to return only the objects on which the specified user has been granted the specified
+    permission.
+
+    :param queryset: Base QuerySet to be restricted
+    :param user: User instance
+    :param permission_required: Name of the required permission (e.g. "dcim.view_site")
+    """
+    obj_perm_attrs = user._object_perm_cache[permission_required]
+    attrs = Q()
+    for perm_attrs in obj_perm_attrs:
+        if perm_attrs:
+            attrs |= Q(**perm_attrs)
+    return queryset.filter(attrs)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index e73a55dc7..a86b5ccc5 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -8,7 +8,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.mixins import AccessMixin
 from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured, ObjectDoesNotExist, ValidationError
 from django.db import transaction, IntegrityError
-from django.db.models import ManyToManyField, ProtectedError, Q
+from django.db.models import ManyToManyField, ProtectedError
 from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput, Textarea
 from django.http import HttpResponse, HttpResponseServerError
 from django.shortcuts import get_object_or_404, redirect, render
@@ -26,10 +26,9 @@ from django_tables2 import RequestConfig
 
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
-from users.models import ObjectPermission
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
-from utilities.permissions import get_permission_for_model
+from utilities.permissions import get_permission_for_model, restrict_queryset
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm, ImportForm
@@ -67,12 +66,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
 
         # Update the view's QuerySet to filter only the permitted objects
         if user.is_authenticated and not user.is_superuser:
-            obj_perm_attrs = user._object_perm_cache[permission_required]
-            attrs = Q()
-            for perm_attrs in obj_perm_attrs:
-                if perm_attrs:
-                    attrs |= Q(**perm_attrs)
-            self.queryset = self.queryset.filter(attrs)
+            self.queryset = restrict_queryset(self.queryset, user, permission_required)
 
         return True
 

From 5b6a6fb63e2d5a67649a9db40450b1e835cda561 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 15:09:08 -0400
Subject: [PATCH 076/505] Move restrict_queryset() function to
 RestrictedQuerySet

---
 netbox/utilities/api.py         |  5 ++---
 netbox/utilities/permissions.py | 17 -----------------
 netbox/utilities/querysets.py   | 30 ++++++++++++++++++++++++++++++
 netbox/utilities/views.py       |  4 ++--
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index ef2650535..ac21d298c 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -16,7 +16,6 @@ from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
 from netbox.api import TokenPermissions
-from utilities.permissions import restrict_queryset
 from .utils import dict_to_filter_params, dynamic_import
 
 
@@ -339,8 +338,8 @@ class ModelViewSet(_ModelViewSet):
         }
         permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
 
-        # Update the view's QuerySet to filter only the permitted objects
-        self.queryset = restrict_queryset(self.queryset, request.user, permission_required)
+        # Restrict the view's QuerySet to allow only the permitted objects
+        self.queryset = self.queryset.restrict(request.user, permission_required)
 
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index be5c0189e..697e18828 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -34,20 +34,3 @@ def resolve_permission(name):
         raise ValueError(f"Unknown app/model for {name}")
 
     return content_type, action
-
-
-def restrict_queryset(queryset, user, permission_required):
-    """
-    Filters a QuerySet to return only the objects on which the specified user has been granted the specified
-    permission.
-
-    :param queryset: Base QuerySet to be restricted
-    :param user: User instance
-    :param permission_required: Name of the required permission (e.g. "dcim.view_site")
-    """
-    obj_perm_attrs = user._object_perm_cache[permission_required]
-    attrs = Q()
-    for perm_attrs in obj_perm_attrs:
-        if perm_attrs:
-            attrs |= Q(**perm_attrs)
-    return queryset.filter(attrs)
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 34b7a0cf3..36460310e 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -1,3 +1,6 @@
+from django.db.models import Q, QuerySet
+
+
 class DummyQuerySet:
     """
     A fake QuerySet that can be used to cache relationships to objects that have been deleted.
@@ -7,3 +10,30 @@ class DummyQuerySet:
 
     def all(self):
         return self._cache
+
+
+class RestrictedQuerySet(QuerySet):
+
+    def restrict(self, user, permission_required):
+        """
+        Filter the QuerySet to return only objects on which the specified user has been granted the specified
+        permission.
+
+        :param queryset: Base QuerySet to be restricted
+        :param user: User instance
+        :param permission_required: Name of the required permission (e.g. "dcim.view_site")
+        """
+
+        # Determine what constraints (if any) have been placed on this user for this action and model
+        # TODO: Find a better way to ensure permissions are cached
+        if not hasattr(user, '_object_perm_cache'):
+            user.get_all_permisisons()
+        obj_perm_attrs = user._object_perm_cache[permission_required]
+
+        # Filter the queryset to include only objects with allowed attributes
+        attrs = Q()
+        for perm_attrs in obj_perm_attrs:
+            if perm_attrs:
+                attrs |= Q(**perm_attrs)
+
+        return self.filter(attrs)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index a86b5ccc5..fed774812 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -28,7 +28,7 @@ from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
-from utilities.permissions import get_permission_for_model, restrict_queryset
+from utilities.permissions import get_permission_for_model
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm, ImportForm
@@ -66,7 +66,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
 
         # Update the view's QuerySet to filter only the permitted objects
         if user.is_authenticated and not user.is_superuser:
-            self.queryset = restrict_queryset(self.queryset, user, permission_required)
+            self.queryset = self.queryset.restrict(user, permission_required)
 
         return True
 

From e23b2c4c4fdf9d7c77145823648dc1c1ede7274e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 29 May 2020 16:27:36 -0400
Subject: [PATCH 077/505] Implement RestrictedQuerySet as a manager

---
 netbox/circuits/models.py                     |  8 ++++-
 netbox/circuits/querysets.py                  |  6 ++--
 netbox/dcim/models/__init__.py                | 35 +++++++++++++++++--
 .../dcim/models/device_component_templates.py |  2 ++
 netbox/dcim/models/device_components.py       |  3 ++
 netbox/extras/models/models.py                |  3 ++
 netbox/extras/models/tags.py                  |  3 ++
 netbox/extras/querysets.py                    |  4 ++-
 netbox/ipam/managers.py                       |  3 +-
 netbox/ipam/models.py                         | 23 ++++++++----
 netbox/ipam/querysets.py                      |  4 +--
 netbox/secrets/models.py                      |  6 +++-
 netbox/tenancy/models.py                      |  7 +++-
 netbox/utilities/mptt.py                      | 19 ++++++++++
 netbox/utilities/querysets.py                 |  2 +-
 netbox/virtualization/models.py               | 11 ++++--
 16 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 netbox/utilities/mptt.py

diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 57d41a994..dcf1c5118 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -8,6 +8,7 @@ from dcim.fields import ASNField
 from dcim.models import CableTermination
 from extras.models import CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
+from utilities.querysets import RestrictedQuerySet
 from utilities.models import ChangeLoggedModel
 from utilities.utils import serialize_object
 from .choices import *
@@ -66,9 +67,10 @@ class Provider(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments',
     ]
@@ -115,6 +117,8 @@ class CircuitType(ChangeLoggedModel):
         blank=True,
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'description']
 
     class Meta:
@@ -300,6 +304,8 @@ class CircuitTermination(CableTermination):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         ordering = ['circuit', 'term_side']
         unique_together = ['circuit', 'term_side']
diff --git a/netbox/circuits/querysets.py b/netbox/circuits/querysets.py
index 60956f32a..8a9bd50a4 100644
--- a/netbox/circuits/querysets.py
+++ b/netbox/circuits/querysets.py
@@ -1,7 +1,9 @@
-from django.db.models import OuterRef, QuerySet, Subquery
+from django.db.models import OuterRef, Subquery
+
+from utilities.querysets import RestrictedQuerySet
 
 
-class CircuitQuerySet(QuerySet):
+class CircuitQuerySet(RestrictedQuerySet):
 
     def annotate_sites(self):
         """
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 1f6478119..3dd3b8c89 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -25,7 +25,9 @@ from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, Ta
 from extras.utils import extras_features
 from utilities.choices import ColorChoices
 from utilities.fields import ColorField, NaturalOrderingField
+from utilities.querysets import RestrictedQuerySet
 from utilities.models import ChangeLoggedModel
+from utilities.mptt import TreeManager
 from utilities.utils import serialize_object, to_meters
 from utilities.validators import ExclusionValidator
 from .device_component_templates import (
@@ -103,6 +105,8 @@ class Region(MPTTModel, ChangeLoggedModel):
         blank=True
     )
 
+    objects = TreeManager()
+
     csv_headers = ['name', 'slug', 'parent', 'description']
 
     class MPTTMeta:
@@ -244,6 +248,8 @@ class Site(ChangeLoggedModel, CustomFieldModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
         'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email', 'comments',
@@ -326,6 +332,8 @@ class RackGroup(MPTTModel, ChangeLoggedModel):
         blank=True
     )
 
+    objects = TreeManager()
+
     csv_headers = ['site', 'parent', 'name', 'slug', 'description']
 
     class Meta:
@@ -388,6 +396,8 @@ class RackRole(ChangeLoggedModel):
         blank=True,
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'color', 'description']
 
     class Meta:
@@ -526,6 +536,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'site', 'group', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width',
         'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'comments',
@@ -821,6 +833,8 @@ class RackReservation(ChangeLoggedModel):
         max_length=200
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['site', 'rack_group', 'rack', 'units', 'tenant', 'user', 'description']
 
     class Meta:
@@ -900,6 +914,8 @@ class Manufacturer(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'description']
 
     class Meta:
@@ -982,9 +998,10 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     clone_fields = [
         'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role',
     ]
@@ -1206,6 +1223,8 @@ class DeviceRole(ChangeLoggedModel):
         blank=True,
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'color', 'vm_role', 'description']
 
     class Meta:
@@ -1263,6 +1282,8 @@ class Platform(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'description']
 
     class Meta:
@@ -1429,6 +1450,8 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'name', 'device_role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status',
         'site', 'rack_group', 'rack_name', 'position', 'face', 'comments',
@@ -1741,9 +1764,10 @@ class VirtualChassis(ChangeLoggedModel):
         max_length=30,
         blank=True
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['master', 'domain']
 
     class Meta:
@@ -1813,6 +1837,8 @@ class PowerPanel(ChangeLoggedModel):
         max_length=50
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['site', 'rack_group', 'name']
 
     class Meta:
@@ -1916,9 +1942,10 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'site', 'power_panel', 'rack_group', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
         'amperage', 'max_utilization', 'comments',
@@ -2084,6 +2111,8 @@ class Cable(ChangeLoggedModel):
         null=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'termination_a_type', 'termination_a_id', 'termination_b_type', 'termination_b_id', 'type', 'status', 'label',
         'color', 'length', 'length_unit',
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 164d37d77..e412a602e 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -6,6 +6,7 @@ from dcim.choices import *
 from dcim.constants import *
 from extras.models import ObjectChange
 from utilities.fields import NaturalOrderingField
+from utilities.querysets import RestrictedQuerySet
 from utilities.ordering import naturalize_interface
 from utilities.utils import serialize_object
 from .device_components import (
@@ -26,6 +27,7 @@ __all__ = (
 
 
 class ComponentTemplateModel(models.Model):
+    objects = RestrictedQuerySet.as_manager()
 
     class Meta:
         abstract = True
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 4005d41a4..702455c7e 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -16,6 +16,7 @@ from extras.models import ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.fields import NaturalOrderingField
 from utilities.ordering import naturalize_interface
+from utilities.querysets import RestrictedQuerySet
 from utilities.query_functions import CollateAsChar
 from utilities.utils import serialize_object
 from virtualization.choices import VMInterfaceTypeChoices
@@ -41,6 +42,8 @@ class ComponentModel(models.Model):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         abstract = True
 
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index f98a7b34f..a94fc3eea 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -12,6 +12,7 @@ from django.template import Template, Context
 from django.urls import reverse
 from rest_framework.utils.encoders import JSONEncoder
 
+from utilities.querysets import RestrictedQuerySet
 from utilities.utils import deepmerge, render_jinja2
 from extras.choices import *
 from extras.constants import *
@@ -670,6 +671,8 @@ class ObjectChange(models.Model):
         editable=False
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'time', 'user', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id',
         'related_object_type', 'related_object_id', 'object_repr', 'object_data',
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index d68ca2ce6..d5792ebda 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -6,6 +6,7 @@ from taggit.models import TagBase, GenericTaggedItemBase
 from utilities.choices import ColorChoices
 from utilities.fields import ColorField
 from utilities.models import ChangeLoggedModel
+from utilities.querysets import RestrictedQuerySet
 
 
 #
@@ -21,6 +22,8 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     def get_absolute_url(self):
         return reverse('extras:tag', args=[self.slug])
 
diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py
index 812c66714..9d9b55778 100644
--- a/netbox/extras/querysets.py
+++ b/netbox/extras/querysets.py
@@ -2,6 +2,8 @@ from collections import OrderedDict
 
 from django.db.models import Q, QuerySet
 
+from utilities.querysets import RestrictedQuerySet
+
 
 class CustomFieldQueryset:
     """
@@ -19,7 +21,7 @@ class CustomFieldQueryset:
             yield obj
 
 
-class ConfigContextQuerySet(QuerySet):
+class ConfigContextQuerySet(RestrictedQuerySet):
 
     def get_for_object(self, obj):
         """
diff --git a/netbox/ipam/managers.py b/netbox/ipam/managers.py
index 8811e504a..245a3c891 100644
--- a/netbox/ipam/managers.py
+++ b/netbox/ipam/managers.py
@@ -1,6 +1,7 @@
 from django.db import models
 
 from ipam.lookups import Host, Inet
+from utilities.querysets import RestrictedQuerySet
 
 
 class IPAddressManager(models.Manager):
@@ -13,5 +14,5 @@ class IPAddressManager(models.Manager):
         then re-cast this value to INET() so that records will be ordered properly. We are essentially re-casting each
         IP address as a /32 or /128.
         """
-        qs = super().get_queryset()
+        qs = RestrictedQuerySet(self.model, using=self._db)
         return qs.order_by(Inet(Host('address')))
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index eeb985b7c..b99a6c919 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -12,6 +12,7 @@ from dcim.models import Device, Interface
 from extras.models import CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
+from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
 from virtualization.models import VirtualMachine
 from .choices import *
@@ -74,9 +75,10 @@ class VRF(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'rd', 'tenant', 'enforce_unique', 'description']
     clone_fields = [
         'tenant', 'enforce_unique', 'description',
@@ -131,6 +133,8 @@ class RIR(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'is_private', 'description']
 
     class Meta:
@@ -179,9 +183,10 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['prefix', 'rir', 'date_added', 'description']
     clone_fields = [
         'rir', 'date_added', 'description',
@@ -274,6 +279,8 @@ class Role(ChangeLoggedModel):
         blank=True,
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'weight', 'description']
 
     class Meta:
@@ -360,9 +367,9 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
+    tags = TaggableManager(through=TaggedItem)
 
     objects = PrefixQuerySet.as_manager()
-    tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
         'prefix', 'vrf', 'tenant', 'site', 'vlan_group', 'vlan', 'status', 'role', 'is_pool', 'description',
@@ -631,9 +638,9 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
+    tags = TaggableManager(through=TaggedItem)
 
     objects = IPAddressManager()
-    tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
         'address', 'vrf', 'tenant', 'status', 'role', 'device', 'virtual_machine', 'interface', 'is_primary',
@@ -828,6 +835,8 @@ class VLANGroup(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'site', 'description']
 
     class Meta:
@@ -923,9 +932,10 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description']
     clone_fields = [
         'site', 'group', 'tenant', 'status', 'role', 'description',
@@ -1039,9 +1049,10 @@ class Service(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['device', 'virtual_machine', 'name', 'protocol', 'port', 'description']
 
     class Meta:
diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py
index 3a48be789..6d2dc6f33 100644
--- a/netbox/ipam/querysets.py
+++ b/netbox/ipam/querysets.py
@@ -1,7 +1,7 @@
-from django.db.models import QuerySet
+from utilities.querysets import RestrictedQuerySet
 
 
-class PrefixQuerySet(QuerySet):
+class PrefixQuerySet(RestrictedQuerySet):
 
     def annotate_depth(self, limit=None):
         """
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 61d8adb6b..757ef88c7 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -17,6 +17,7 @@ from dcim.models import Device
 from extras.models import CustomFieldModel, TaggedItem
 from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
+from utilities.querysets import RestrictedQuerySet
 from .exceptions import InvalidKey
 from .hashers import SecretValidationHasher
 from .querysets import UserKeyQuerySet
@@ -268,6 +269,8 @@ class SecretRole(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'description']
 
     class Meta:
@@ -333,9 +336,10 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     plaintext = None
     csv_headers = ['device', 'role', 'name', 'plaintext']
 
diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py
index 077fb6ad1..2e415b965 100644
--- a/netbox/tenancy/models.py
+++ b/netbox/tenancy/models.py
@@ -7,6 +7,8 @@ from taggit.managers import TaggableManager
 from extras.models import CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
+from utilities.mptt import TreeManager
+from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
 
 
@@ -40,6 +42,8 @@ class TenantGroup(MPTTModel, ChangeLoggedModel):
         blank=True
     )
 
+    objects = TreeManager()
+
     csv_headers = ['name', 'slug', 'parent', 'description']
 
     class Meta:
@@ -104,9 +108,10 @@ class Tenant(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'group', 'description', 'comments']
     clone_fields = [
         'group', 'description',
diff --git a/netbox/utilities/mptt.py b/netbox/utilities/mptt.py
new file mode 100644
index 000000000..1bae2053d
--- /dev/null
+++ b/netbox/utilities/mptt.py
@@ -0,0 +1,19 @@
+from mptt.managers import TreeManager as TreeManager_
+from mptt.querysets import TreeQuerySet as TreeQuerySet_
+
+from django.db.models import Manager
+from .querysets import RestrictedQuerySet
+
+
+class TreeQuerySet(TreeQuerySet_, RestrictedQuerySet):
+    """
+    Mate django-mptt's TreeQuerySet with our RestrictedQuerySet for permissions enforcement.
+    """
+    pass
+
+
+class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
+    """
+    Extend django-mptt's TreeManager to incorporate RestrictedQuerySet().
+    """
+    pass
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 36460310e..3bc41e072 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -27,7 +27,7 @@ class RestrictedQuerySet(QuerySet):
         # Determine what constraints (if any) have been placed on this user for this action and model
         # TODO: Find a better way to ensure permissions are cached
         if not hasattr(user, '_object_perm_cache'):
-            user.get_all_permisisons()
+            user.get_all_permissions()
         obj_perm_attrs = user._object_perm_cache[permission_required]
 
         # Filter the queryset to include only objects with allowed attributes
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 3daeff013..8ad40bab7 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -9,6 +9,7 @@ from dcim.models import Device
 from extras.models import ConfigContextModel, CustomFieldModel, TaggedItem
 from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
+from utilities.querysets import RestrictedQuerySet
 from .choices import *
 
 
@@ -40,6 +41,8 @@ class ClusterType(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'description']
 
     class Meta:
@@ -79,6 +82,8 @@ class ClusterGroup(ChangeLoggedModel):
         blank=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'slug', 'description']
 
     class Meta:
@@ -145,9 +150,10 @@ class Cluster(ChangeLoggedModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = ['name', 'type', 'group', 'site', 'comments']
     clone_fields = [
         'type', 'group', 'tenant', 'site',
@@ -269,9 +275,10 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         content_type_field='obj_type',
         object_id_field='obj_id'
     )
-
     tags = TaggableManager(through=TaggedItem)
 
+    objects = RestrictedQuerySet.as_manager()
+
     csv_headers = [
         'name', 'status', 'role', 'cluster', 'tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments',
     ]

From 5574aaa8cb8556e6b2cbe2d29a9137da54f36c61 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 10:45:49 -0400
Subject: [PATCH 078/505] Tweak restrict() to accept only an action keyword

---
 netbox/utilities/api.py       | 20 ++++++++++++--------
 netbox/utilities/querysets.py |  8 ++++++--
 netbox/utilities/views.py     |  3 ++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index ac21d298c..50401dfd1 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -330,16 +330,20 @@ class ModelViewSet(_ModelViewSet):
         if not request.user.is_authenticated or request.user.is_superuser:
             return
 
-        # TODO: Move this to a cleaner function
-        # Determine the required permission based on the request method
-        kwargs = {
-            'app_label': self.queryset.model._meta.app_label,
-            'model_name': self.queryset.model._meta.model_name
-        }
-        permission_required = TokenPermissions.perms_map[request.method][0] % kwargs
+        # TODO: Reconcile this with TokenPermissions.perms_map
+        action = {
+            'GET': 'view',
+            'OPTIONS': None,
+            'HEAD': 'view',
+            'POST': 'add',
+            'PUT': 'change',
+            'PATCH': 'change',
+            'DELETE': 'delete',
+        }[request.method]
 
         # Restrict the view's QuerySet to allow only the permitted objects
-        self.queryset = self.queryset.restrict(request.user, permission_required)
+        if action:
+            self.queryset = self.queryset.restrict(request.user, action)
 
     def dispatch(self, request, *args, **kwargs):
         logger = logging.getLogger('netbox.api.views.ModelViewSet')
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 3bc41e072..07199e143 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -14,15 +14,19 @@ class DummyQuerySet:
 
 class RestrictedQuerySet(QuerySet):
 
-    def restrict(self, user, permission_required):
+    def restrict(self, user, action):
         """
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
         permission.
 
         :param queryset: Base QuerySet to be restricted
         :param user: User instance
-        :param permission_required: Name of the required permission (e.g. "dcim.view_site")
+        :param action: The action which must be permitted (e.g. "view" for "dcim.view_site")
         """
+        # Resolve the full name of the required permission
+        app_label = self.model._meta.app_label
+        model_name = self.model._meta.model_name
+        permission_required = f'{app_label}.{action}_{model_name}'
 
         # Determine what constraints (if any) have been placed on this user for this action and model
         # TODO: Find a better way to ensure permissions are cached
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index fed774812..f59492a0c 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -66,7 +66,8 @@ class ObjectPermissionRequiredMixin(AccessMixin):
 
         # Update the view's QuerySet to filter only the permitted objects
         if user.is_authenticated and not user.is_superuser:
-            self.queryset = self.queryset.restrict(user, permission_required)
+            action = permission_required.split('.')[1].split('_')[0]
+            self.queryset = self.queryset.restrict(user, action)
 
         return True
 

From 3c334a0238fdb4631a4f8f9bdc5d2df5689564ba Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 11:43:49 -0400
Subject: [PATCH 079/505] Update views to restrict all querysets

---
 netbox/circuits/views.py                  |  6 +-
 netbox/dcim/views.py                      | 87 ++++++++++++++---------
 netbox/extras/views.py                    | 12 ++--
 netbox/ipam/managers.py                   |  7 +-
 netbox/ipam/views.py                      | 34 ++++-----
 netbox/tenancy/views.py                   | 22 +++---
 netbox/utilities/querysets.py             | 11 ++-
 netbox/virtualization/tests/test_views.py |  1 -
 netbox/virtualization/views.py            |  6 +-
 9 files changed, 108 insertions(+), 78 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index bb4d787c8..5da912f0a 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -33,7 +33,7 @@ class ProviderView(ObjectView):
     def get(self, request, slug):
 
         provider = get_object_or_404(self.queryset, slug=slug)
-        circuits = Circuit.objects.filter(
+        circuits = Circuit.objects.restrict(request.user, 'view').filter(
             provider=provider
         ).prefetch_related(
             'type', 'tenant', 'terminations__site'
@@ -138,12 +138,12 @@ class CircuitView(ObjectView):
     def get(self, request, pk):
 
         circuit = get_object_or_404(self.queryset, pk=pk)
-        termination_a = CircuitTermination.objects.prefetch_related(
+        termination_a = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
         ).first()
-        termination_z = CircuitTermination.objects.prefetch_related(
+        termination_z = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_Z
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d8ef5a5e9..0f4297fd6 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -19,8 +19,9 @@ from django.views.generic import View
 from circuits.models import Circuit
 from extras.models import Graph
 from extras.views import ObjectConfigContextView
-from ipam.models import Prefix, VLAN
+from ipam.models import Prefix, Service, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
+from secrets.models import Secret
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.permissions import get_permission_for_model
@@ -197,14 +198,16 @@ class SiteView(ObjectView):
 
         site = get_object_or_404(self.queryset, slug=slug)
         stats = {
-            'rack_count': Rack.objects.filter(site=site).count(),
-            'device_count': Device.objects.filter(site=site).count(),
-            'prefix_count': Prefix.objects.filter(site=site).count(),
-            'vlan_count': VLAN.objects.filter(site=site).count(),
-            'circuit_count': Circuit.objects.filter(terminations__site=site).count(),
-            'vm_count': VirtualMachine.objects.filter(cluster__site=site).count(),
+            'rack_count': Rack.objects.restrict(request.user, 'view').filter(site=site).count(),
+            'device_count': Device.objects.restrict(request.user, 'view').filter(site=site).count(),
+            'prefix_count': Prefix.objects.restrict(request.user, 'view').filter(site=site).count(),
+            'vlan_count': VLAN.objects.restrict(request.user, 'view').filter(site=site).count(),
+            'circuit_count': Circuit.objects.restrict(request.user, 'view').filter(terminations__site=site).count(),
+            'vm_count': VirtualMachine.objects.restrict(request.user, 'view').filter(cluster__site=site).count(),
         }
-        rack_groups = RackGroup.objects.filter(site=site).annotate(rack_count=Count('racks'))
+        rack_groups = RackGroup.objects.restrict(request.user, 'view').filter(site=site).annotate(
+            rack_count=Count('racks')
+        )
         show_graphs = Graph.objects.filter(type__model='site').exists()
 
         return render(request, 'dcim/site.html', {
@@ -372,7 +375,7 @@ class RackView(ObjectView):
 
         rack = get_object_or_404(self.queryset, pk=pk)
 
-        nonracked_devices = Device.objects.filter(
+        nonracked_devices = Device.objects.restrict(request.user, 'view').filter(
             rack=rack,
             position__isnull=True,
             parent_bay__isnull=True
@@ -384,8 +387,8 @@ class RackView(ObjectView):
         next_rack = peer_racks.filter(name__gt=rack.name).order_by('name').first()
         prev_rack = peer_racks.filter(name__lt=rack.name).order_by('-name').first()
 
-        reservations = RackReservation.objects.filter(rack=rack)
-        power_feeds = PowerFeed.objects.filter(rack=rack).prefetch_related('power_panel')
+        reservations = RackReservation.objects.restrict(request.user, 'view').filter(rack=rack)
+        power_feeds = PowerFeed.objects.restrict(request.user, 'view').filter(rack=rack).prefetch_related('power_panel')
 
         return render(request, 'dcim/rack.html', {
             'rack': rack,
@@ -558,35 +561,35 @@ class DeviceTypeView(ObjectView):
 
         # Component tables
         consoleport_table = tables.ConsolePortTemplateTable(
-            ConsolePortTemplate.objects.filter(device_type=devicetype),
+            ConsolePortTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         consoleserverport_table = tables.ConsoleServerPortTemplateTable(
-            ConsoleServerPortTemplate.objects.filter(device_type=devicetype),
+            ConsoleServerPortTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         powerport_table = tables.PowerPortTemplateTable(
-            PowerPortTemplate.objects.filter(device_type=devicetype),
+            PowerPortTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         poweroutlet_table = tables.PowerOutletTemplateTable(
-            PowerOutletTemplate.objects.filter(device_type=devicetype),
+            PowerOutletTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         interface_table = tables.InterfaceTemplateTable(
-            list(InterfaceTemplate.objects.filter(device_type=devicetype)),
+            list(InterfaceTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype)),
             orderable=False
         )
         front_port_table = tables.FrontPortTemplateTable(
-            FrontPortTemplate.objects.filter(device_type=devicetype),
+            FrontPortTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         rear_port_table = tables.RearPortTemplateTable(
-            RearPortTemplate.objects.filter(device_type=devicetype),
+            RearPortTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         devicebay_table = tables.DeviceBayTemplateTable(
-            DeviceBayTemplate.objects.filter(device_type=devicetype),
+            DeviceBayTemplate.objects.restrict(request.user, 'view').filter(device_type=devicetype),
             orderable=False
         )
         if request.user.has_perm('dcim.change_devicetype'):
@@ -995,47 +998,61 @@ class DeviceView(ObjectView):
 
         # VirtualChassis members
         if device.virtual_chassis is not None:
-            vc_members = Device.objects.filter(
+            vc_members = Device.objects.restrict(request.user, 'view').filter(
                 virtual_chassis=device.virtual_chassis
             ).order_by('vc_position')
         else:
             vc_members = []
 
         # Console ports
-        console_ports = device.consoleports.prefetch_related('connected_endpoint__device', 'cable')
+        console_ports = ConsolePort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            'connected_endpoint__device', 'cable',
+        )
 
         # Console server ports
-        consoleserverports = device.consoleserverports.prefetch_related('connected_endpoint__device', 'cable')
+        consoleserverports = ConsoleServerPort.objects.restrict(request.user, 'view').filter(
+            device=device
+        ).prefetch_related(
+            'connected_endpoint__device', 'cable',
+        )
 
         # Power ports
-        power_ports = device.powerports.prefetch_related('_connected_poweroutlet__device', 'cable')
+        power_ports = PowerPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            '_connected_poweroutlet__device', 'cable',
+        )
 
         # Power outlets
-        poweroutlets = device.poweroutlets.prefetch_related('connected_endpoint__device', 'cable', 'power_port')
+        poweroutlets = PowerOutlet.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            'connected_endpoint__device', 'cable', 'power_port',
+        )
 
         # Interfaces
-        interfaces = device.vc_interfaces.prefetch_related(
+        interfaces = device.vc_interfaces.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'lag', '_connected_interface__device', '_connected_circuittermination__circuit', 'cable',
             'cable__termination_a', 'cable__termination_b', 'ip_addresses', 'tags'
         )
 
         # Front ports
-        front_ports = device.frontports.prefetch_related('rear_port', 'cable')
+        front_ports = FrontPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            'rear_port', 'cable',
+        )
 
         # Rear ports
-        rear_ports = device.rearports.prefetch_related('cable')
+        rear_ports = RearPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related('cable')
 
         # Device bays
-        device_bays = device.device_bays.prefetch_related('installed_device__device_type__manufacturer')
+        device_bays = DeviceBay.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            'installed_device__device_type__manufacturer',
+        )
 
         # Services
-        services = device.services.all()
+        services = Service.objects.restrict(request.user, 'view').filter(device=device)
 
         # Secrets
-        secrets = device.secrets.all()
+        secrets = Secret.objects.restrict(request.user, 'view').filter(device=device)
 
         # Find up to ten devices in the same site with the same functional role for quick reference.
-        related_devices = Device.objects.filter(
+        related_devices = Device.objects.restrict(request.user, 'view').filter(
             site=device.site, device_role=device.device_role
         ).exclude(
             pk=device.pk
@@ -1068,7 +1085,7 @@ class DeviceInventoryView(ObjectView):
     def get(self, request, pk):
 
         device = get_object_or_404(self.queryset, pk=pk)
-        inventory_items = InventoryItem.objects.filter(
+        inventory_items = InventoryItem.objects.restrict(request.user, 'view').filter(
             device=device, parent=None
         ).prefetch_related(
             'manufacturer', 'child_items'
@@ -1102,7 +1119,9 @@ class DeviceLLDPNeighborsView(ObjectView):
     def get(self, request, pk):
 
         device = get_object_or_404(self.queryset, pk=pk)
-        interfaces = device.vc_interfaces.exclude(type__in=NONCONNECTABLE_IFACE_TYPES).prefetch_related(
+        interfaces = device.vc_interfaces.restrict(request.user, 'view').exclude(
+            type__in=NONCONNECTABLE_IFACE_TYPES
+        ).prefetch_related(
             '_connected_interface__device'
         )
 
@@ -1423,7 +1442,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ip_addresses.prefetch_related('vrf', 'tenant'),
+            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 9abf96f26..a607a4df8 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -163,7 +163,7 @@ class ObjectConfigContextView(ObjectView):
     def get(self, request, pk):
 
         obj = get_object_or_404(self.queryset, pk=pk)
-        source_contexts = ConfigContext.objects.get_for_object(obj)
+        source_contexts = ConfigContext.objects.restrict(request.user, 'view').get_for_object(obj)
         model_name = self.queryset.model._meta.model_name
 
         # Determine user's preferred output format
@@ -207,13 +207,17 @@ class ObjectChangeView(ObjectView):
 
         objectchange = get_object_or_404(self.queryset, pk=pk)
 
-        related_changes = ObjectChange.objects.filter(request_id=objectchange.request_id).exclude(pk=objectchange.pk)
+        related_changes = ObjectChange.objects.restrict(request.user, 'view').filter(
+            request_id=objectchange.request_id
+        ).exclude(
+            pk=objectchange.pk
+        )
         related_changes_table = ObjectChangeTable(
             data=related_changes[:50],
             orderable=False
         )
 
-        objectchanges = ObjectChange.objects.filter(
+        objectchanges = ObjectChange.objects.restrict(request.user, 'view').filter(
             changed_object_type=objectchange.changed_object_type,
             changed_object_id=objectchange.changed_object_id,
         )
@@ -255,7 +259,7 @@ class ObjectChangeLogView(View):
 
         # Gather all changes for this object (and its related objects)
         content_type = ContentType.objects.get_for_model(model)
-        objectchanges = ObjectChange.objects.prefetch_related(
+        objectchanges = ObjectChange.objects.restrict(request.user, 'view').prefetch_related(
             'user', 'changed_object_type'
         ).filter(
             Q(changed_object_type=content_type, changed_object_id=obj.pk) |
diff --git a/netbox/ipam/managers.py b/netbox/ipam/managers.py
index 245a3c891..1ef00e125 100644
--- a/netbox/ipam/managers.py
+++ b/netbox/ipam/managers.py
@@ -1,10 +1,10 @@
-from django.db import models
+from django.db.models import Manager
 
 from ipam.lookups import Host, Inet
 from utilities.querysets import RestrictedQuerySet
 
 
-class IPAddressManager(models.Manager):
+class IPAddressManager(Manager.from_queryset(RestrictedQuerySet)):
 
     def get_queryset(self):
         """
@@ -14,5 +14,4 @@ class IPAddressManager(models.Manager):
         then re-cast this value to INET() so that records will be ordered properly. We are essentially re-casting each
         IP address as a /32 or /128.
         """
-        qs = RestrictedQuerySet(self.model, using=self._db)
-        return qs.order_by(Inet(Host('address')))
+        return super().get_queryset().order_by(Inet(Host('address')))
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index d3b604be6..98fe1d73d 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -3,14 +3,13 @@ from django.conf import settings
 from django.db.models import Count, Q
 from django.db.models.expressions import RawSQL
 from django.shortcuts import get_object_or_404, redirect, render
-from django.views.generic import View
 from django_tables2 import RequestConfig
 
 from dcim.models import Device, Interface
 from utilities.paginator import EnhancedPaginator
 from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView,
-    ObjectListView, ObjectPermissionRequiredMixin,
+    ObjectListView,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
@@ -125,7 +124,7 @@ class VRFView(ObjectView):
     def get(self, request, pk):
 
         vrf = get_object_or_404(self.queryset, pk=pk)
-        prefix_count = Prefix.objects.filter(vrf=vrf).count()
+        prefix_count = Prefix.objects.restrict(request.user, 'view').filter(vrf=vrf).count()
 
         return render(request, 'ipam/vrf.html', {
             'vrf': vrf,
@@ -305,7 +304,7 @@ class AggregateView(ObjectView):
         aggregate = get_object_or_404(self.queryset, pk=pk)
 
         # Find all child prefixes contained by this aggregate
-        child_prefixes = Prefix.objects.filter(
+        child_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
             prefix__net_contained_or_equal=str(aggregate.prefix)
         ).prefetch_related(
             'site', 'role'
@@ -429,12 +428,14 @@ class PrefixView(ObjectView):
         prefix = get_object_or_404(self.queryset, pk=pk)
 
         try:
-            aggregate = Aggregate.objects.get(prefix__net_contains_or_equals=str(prefix.prefix))
+            aggregate = Aggregate.objects.restrict(request.user, 'view').get(
+                prefix__net_contains_or_equals=str(prefix.prefix)
+            )
         except Aggregate.DoesNotExist:
             aggregate = None
 
         # Parent prefixes table
-        parent_prefixes = Prefix.objects.filter(
+        parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
             Q(vrf=prefix.vrf) | Q(vrf__isnull=True)
         ).filter(
             prefix__net_contains=str(prefix.prefix)
@@ -445,7 +446,7 @@ class PrefixView(ObjectView):
         parent_prefix_table.exclude = ('vrf',)
 
         # Duplicate prefixes table
-        duplicate_prefixes = Prefix.objects.filter(
+        duplicate_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
             vrf=prefix.vrf, prefix=str(prefix.prefix)
         ).exclude(
             pk=prefix.pk
@@ -471,7 +472,7 @@ class PrefixPrefixesView(ObjectView):
         prefix = get_object_or_404(self.queryset, pk=pk)
 
         # Child prefixes table
-        child_prefixes = prefix.get_child_prefixes().prefetch_related(
+        child_prefixes = prefix.get_child_prefixes().restrict(request.user, 'view').prefetch_related(
             'site', 'vlan', 'role',
         ).annotate_depth(limit=0)
 
@@ -515,7 +516,7 @@ class PrefixIPAddressesView(ObjectView):
         prefix = get_object_or_404(self.queryset, pk=pk)
 
         # Find all IPAddresses belonging to this Prefix
-        ipaddresses = prefix.get_child_ips().prefetch_related(
+        ipaddresses = prefix.get_child_ips().restrict(request.user, 'view').prefetch_related(
             'vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for'
         )
 
@@ -607,7 +608,7 @@ class IPAddressView(ObjectView):
         ipaddress = get_object_or_404(self.queryset, pk=pk)
 
         # Parent prefixes table
-        parent_prefixes = Prefix.objects.filter(
+        parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
             vrf=ipaddress.vrf, prefix__net_contains=str(ipaddress.address.ip)
         ).prefetch_related(
             'site', 'role'
@@ -616,7 +617,7 @@ class IPAddressView(ObjectView):
         parent_prefixes_table.exclude = ('vrf',)
 
         # Duplicate IPs table
-        duplicate_ips = IPAddress.objects.filter(
+        duplicate_ips = IPAddress.objects.restrict(request.user, 'view').filter(
             vrf=ipaddress.vrf, address=str(ipaddress.address)
         ).exclude(
             pk=ipaddress.pk
@@ -629,14 +630,13 @@ class IPAddressView(ObjectView):
         duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
 
         # Related IP table
-        related_ips = IPAddress.objects.prefetch_related(
+        related_ips = IPAddress.objects.restrict(request.user, 'view').prefetch_related(
             'interface__device'
         ).exclude(
             address=str(ipaddress.address)
         ).filter(
             vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)
         )
-
         related_ips_table = tables.IPAddressTable(related_ips, orderable=False)
 
         paginate = {
@@ -785,7 +785,7 @@ class VLANGroupVLANsView(ObjectView):
     def get(self, request, pk):
         vlan_group = get_object_or_404(self.queryset, pk=pk)
 
-        vlans = VLAN.objects.filter(group_id=pk)
+        vlans = VLAN.objects.restrict(request.user, 'view').filter(group_id=pk)
         vlans = add_available_vlans(vlan_group, vlans)
 
         vlan_table = tables.VLANDetailTable(vlans)
@@ -832,7 +832,9 @@ class VLANView(ObjectView):
     def get(self, request, pk):
 
         vlan = get_object_or_404(self.queryset, pk=pk)
-        prefixes = Prefix.objects.filter(vlan=vlan).prefetch_related('vrf', 'site', 'role')
+        prefixes = Prefix.objects.restrict(request.user, 'view').filter(vlan=vlan).prefetch_related(
+            'vrf', 'site', 'role'
+        )
         prefix_table = tables.PrefixTable(list(prefixes), orderable=False)
         prefix_table.exclude = ('vlan',)
 
@@ -848,7 +850,7 @@ class VLANMembersView(ObjectView):
     def get(self, request, pk):
 
         vlan = get_object_or_404(self.queryset, pk=pk)
-        members = vlan.get_members().prefetch_related('device', 'virtual_machine')
+        members = vlan.get_members().restrict(request.user, 'view').prefetch_related('device', 'virtual_machine')
 
         members_table = tables.VLANMemberTable(members)
 
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 823df9933..a82b231f5 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -64,17 +64,17 @@ class TenantView(ObjectView):
 
         tenant = get_object_or_404(self.queryset, slug=slug)
         stats = {
-            'site_count': Site.objects.filter(tenant=tenant).count(),
-            'rack_count': Rack.objects.filter(tenant=tenant).count(),
-            'rackreservation_count': RackReservation.objects.filter(tenant=tenant).count(),
-            'device_count': Device.objects.filter(tenant=tenant).count(),
-            'vrf_count': VRF.objects.filter(tenant=tenant).count(),
-            'prefix_count': Prefix.objects.filter(tenant=tenant).count(),
-            'ipaddress_count': IPAddress.objects.filter(tenant=tenant).count(),
-            'vlan_count': VLAN.objects.filter(tenant=tenant).count(),
-            'circuit_count': Circuit.objects.filter(tenant=tenant).count(),
-            'virtualmachine_count': VirtualMachine.objects.filter(tenant=tenant).count(),
-            'cluster_count': Cluster.objects.filter(tenant=tenant).count(),
+            'site_count': Site.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'rack_count': Rack.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'rackreservation_count': RackReservation.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'device_count': Device.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'vrf_count': VRF.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'prefix_count': Prefix.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'ipaddress_count': IPAddress.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'vlan_count': VLAN.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'circuit_count': Circuit.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'virtualmachine_count': VirtualMachine.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
+            'cluster_count': Cluster.objects.restrict(request.user, 'view').filter(tenant=tenant).count(),
         }
 
         return render(request, 'tenancy/tenant.html', {
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 07199e143..6649e4d9c 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -28,15 +28,22 @@ class RestrictedQuerySet(QuerySet):
         model_name = self.model._meta.model_name
         permission_required = f'{app_label}.{action}_{model_name}'
 
+        # TODO: Handle anonymous users
+        if not user.is_authenticated:
+            return self
+
         # Determine what constraints (if any) have been placed on this user for this action and model
         # TODO: Find a better way to ensure permissions are cached
         if not hasattr(user, '_object_perm_cache'):
             user.get_all_permissions()
-        obj_perm_attrs = user._object_perm_cache[permission_required]
+
+        # User has not been granted any permission
+        if permission_required not in user._object_perm_cache:
+            return self.none()
 
         # Filter the queryset to include only objects with allowed attributes
         attrs = Q()
-        for perm_attrs in obj_perm_attrs:
+        for perm_attrs in user._object_perm_cache[permission_required]:
             if perm_attrs:
                 attrs |= Q(**perm_attrs)
 
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 9fde12186..5cd19381f 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -187,7 +187,6 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 # TODO: Update base class to DeviceComponentViewTestCase
 class InterfaceTestCase(
-    ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.BulkCreateObjectsViewTestCase,
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 79a807c21..aea4d0556 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -89,7 +89,7 @@ class ClusterView(ObjectView):
     def get(self, request, pk):
 
         cluster = get_object_or_404(self.queryset, pk=pk)
-        devices = Device.objects.filter(cluster=cluster).prefetch_related(
+        devices = Device.objects.restrict(request.user, 'view').filter(cluster=cluster).prefetch_related(
             'site', 'rack', 'tenant', 'device_type__manufacturer'
         )
         device_table = DeviceTable(list(devices), orderable=False)
@@ -235,8 +235,8 @@ class VirtualMachineView(ObjectView):
     def get(self, request, pk):
 
         virtualmachine = get_object_or_404(self.queryset, pk=pk)
-        interfaces = Interface.objects.filter(virtual_machine=virtualmachine)
-        services = Service.objects.filter(virtual_machine=virtualmachine)
+        interfaces = Interface.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
+        services = Service.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
 
         return render(request, 'virtualization/virtualmachine.html', {
             'virtualmachine': virtualmachine,

From 9679557747b456efc2caa4bf790008b0b6231840 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 12:31:18 -0400
Subject: [PATCH 080/505] Add permission_is_exempt()

---
 netbox/utilities/permissions.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 697e18828..de024cf99 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,5 +1,5 @@
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Q
 
 
 def get_permission_for_model(model, action):
@@ -34,3 +34,25 @@ def resolve_permission(name):
         raise ValueError(f"Unknown app/model for {name}")
 
     return content_type, action
+
+
+def permission_is_exempt(name):
+    """
+    Determine whether a specified permission is exempt from evaluation.
+
+    :param name: Permission name in the format <app>.<action>_<model>
+    """
+    app_label, codename = name.split('.')
+    action, model_name = codename.split('_')
+
+    if action == 'view':
+        if (
+            # All models are exempt from view permission enforcement
+            '*' in settings.EXEMPT_VIEW_PERMISSIONS
+        ) or (
+            # This specific model is exempt from view permission enforcement
+            '{}.{}'.format(app_label, model_name) in settings.EXEMPT_VIEW_PERMISSIONS
+        ):
+            return True
+
+    return False

From 3a9512f086fdb46a386639d8f98d5aa4fdcdb5f8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 13:09:34 -0400
Subject: [PATCH 081/505] Refine queryset restriction logic

---
 netbox/utilities/permissions.py | 18 ++++++++++++++++--
 netbox/utilities/querysets.py   | 16 ++++++----------
 netbox/utilities/views.py       | 16 ++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index de024cf99..38064b689 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -19,12 +19,26 @@ def get_permission_for_model(model, action):
     )
 
 
+def get_permission_action(name):
+    """
+    Return the action component (e.g. view or add) from a permission name.
+
+    :param name: Permission name in the format <app_label>.<action>_<model>
+    """
+    try:
+        return name.split('.')[1].split('_')[0]
+    except ValueError:
+        raise ValueError(
+            f"Invalid permission name: {name}. Must be in the format <app_label>.<action>_<model>"
+        )
+
+
 def resolve_permission(name):
     """
     Given a permission name, return the relevant ContentType and action. For example, "dcim.view_site" returns
     (Site, "view").
 
-    :param name: Permission name in the format <app>.<action>_<model>
+    :param name: Permission name in the format <app_label>.<action>_<model>
     """
     app_label, codename = name.split('.')
     action, model_name = codename.split('_')
@@ -40,7 +54,7 @@ def permission_is_exempt(name):
     """
     Determine whether a specified permission is exempt from evaluation.
 
-    :param name: Permission name in the format <app>.<action>_<model>
+    :param name: Permission name in the format <app_label>.<action>_<model>
     """
     app_label, codename = name.split('.')
     action, model_name = codename.split('_')
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 6649e4d9c..1ac79e90a 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -1,5 +1,7 @@
 from django.db.models import Q, QuerySet
 
+from utilities.permissions import permission_is_exempt
+
 
 class DummyQuerySet:
     """
@@ -19,7 +21,6 @@ class RestrictedQuerySet(QuerySet):
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
         permission.
 
-        :param queryset: Base QuerySet to be restricted
         :param user: User instance
         :param action: The action which must be permitted (e.g. "view" for "dcim.view_site")
         """
@@ -28,17 +29,12 @@ class RestrictedQuerySet(QuerySet):
         model_name = self.model._meta.model_name
         permission_required = f'{app_label}.{action}_{model_name}'
 
-        # TODO: Handle anonymous users
-        if not user.is_authenticated:
+        # Bypass restriction for superusers and exempt views
+        if user.is_superuser or permission_is_exempt(permission_required):
             return self
 
-        # Determine what constraints (if any) have been placed on this user for this action and model
-        # TODO: Find a better way to ensure permissions are cached
-        if not hasattr(user, '_object_perm_cache'):
-            user.get_all_permissions()
-
-        # User has not been granted any permission
-        if permission_required not in user._object_perm_cache:
+        # User is anonymous or has not been granted the requisite permission
+        if not user.is_authenticated or permission_required not in user.get_all_permissions():
             return self.none()
 
         # Filter the queryset to include only objects with allowed attributes
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index f59492a0c..0304780f3 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -28,7 +28,7 @@ from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
-from utilities.permissions import get_permission_for_model
+from utilities.permissions import get_permission_action, get_permission_for_model
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm, ImportForm
@@ -60,16 +60,16 @@ class ObjectPermissionRequiredMixin(AccessMixin):
         user = self.request.user
         permission_required = self.get_required_permission()
 
-        # First, check that the user is granted the required permission(s) at either the model or object level.
-        if not user.has_perms((permission_required, *self.additional_permissions)):
-            return False
+        # Check that the user has been granted the required permission(s).
+        if user.has_perms((permission_required, *self.additional_permissions)):
 
-        # Update the view's QuerySet to filter only the permitted objects
-        if user.is_authenticated and not user.is_superuser:
-            action = permission_required.split('.')[1].split('_')[0]
+            # Update the view's QuerySet to filter only the permitted objects
+            action = get_permission_action(permission_required)
             self.queryset = self.queryset.restrict(user, action)
 
-        return True
+            return True
+
+        return False
 
     def dispatch(self, request, *args, **kwargs):
 

From b6c38ceb732653cc9ad875385799713098d36d2d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 13:17:59 -0400
Subject: [PATCH 082/505] Call permission_is_exempt() to check for exempt
 permissions

---
 netbox/utilities/auth_backends.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/netbox/utilities/auth_backends.py b/netbox/utilities/auth_backends.py
index bc263480f..1522e6268 100644
--- a/netbox/utilities/auth_backends.py
+++ b/netbox/utilities/auth_backends.py
@@ -6,14 +6,14 @@ from django.contrib.auth.models import Group
 from django.db.models import Q
 
 from users.models import ObjectPermission
-from utilities.permissions import resolve_permission
+from utilities.permissions import permission_is_exempt, resolve_permission
 
 
 class ObjectPermissionBackend(ModelBackend):
 
     def get_all_permissions(self, user_obj, obj=None):
         if not user_obj.is_active or user_obj.is_anonymous:
-            return set()
+            return dict()
         if not hasattr(user_obj, '_object_perm_cache'):
             user_obj._object_perm_cache = self.get_object_permissions(user_obj)
         return user_obj._object_perm_cache
@@ -49,16 +49,9 @@ class ObjectPermissionBackend(ModelBackend):
         if user_obj.is_active and user_obj.is_superuser:
             return True
 
-        # If this is a view permission, check whether the model has been exempted from enforcement
-        if action == 'view':
-            if (
-                # All models are exempt from view permission enforcement
-                '*' in settings.EXEMPT_VIEW_PERMISSIONS
-            ) or (
-                # This specific model is exempt from view permission enforcement
-                '{}.{}'.format(app_label, model_name) in settings.EXEMPT_VIEW_PERMISSIONS
-            ):
-                return True
+        # Permission is exempt from enforcement (i.e. listed in EXEMPT_VIEW_PERMISSIONS)
+        if permission_is_exempt(perm):
+            return True
 
         # Handle inactive/anonymous users
         if not user_obj.is_active or user_obj.is_anonymous:

From a4af270ea8648892175a03f881fcd04bcef741fb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 13:36:57 -0400
Subject: [PATCH 083/505] Restrict querysets for home, search views

---
 netbox/netbox/views.py | 45 +++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 37a516409..d6be844d4 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -194,52 +194,51 @@ class HomeView(View):
 
     def get(self, request):
 
-        connected_consoleports = ConsolePort.objects.filter(
+        connected_consoleports = ConsolePort.objects.restrict(request.user, 'view').filter(
             connected_endpoint__isnull=False
         )
-        connected_powerports = PowerPort.objects.filter(
+        connected_powerports = PowerPort.objects.restrict(request.user, 'view').filter(
             _connected_poweroutlet__isnull=False
         )
-        connected_interfaces = Interface.objects.filter(
+        connected_interfaces = Interface.objects.restrict(request.user, 'view').filter(
             _connected_interface__isnull=False,
             pk__lt=F('_connected_interface')
         )
-        cables = Cable.objects.all()
 
         stats = {
 
             # Organization
-            'site_count': Site.objects.count(),
-            'tenant_count': Tenant.objects.count(),
+            'site_count': Site.objects.restrict(request.user, 'view').count(),
+            'tenant_count': Tenant.objects.restrict(request.user, 'view').count(),
 
             # DCIM
-            'rack_count': Rack.objects.count(),
-            'devicetype_count': DeviceType.objects.count(),
-            'device_count': Device.objects.count(),
+            'rack_count': Rack.objects.restrict(request.user, 'view').count(),
+            'devicetype_count': DeviceType.objects.restrict(request.user, 'view').count(),
+            'device_count': Device.objects.restrict(request.user, 'view').count(),
             'interface_connections_count': connected_interfaces.count(),
-            'cable_count': cables.count(),
+            'cable_count': Cable.objects.restrict(request.user, 'view').count(),
             'console_connections_count': connected_consoleports.count(),
             'power_connections_count': connected_powerports.count(),
-            'powerpanel_count': PowerPanel.objects.count(),
-            'powerfeed_count': PowerFeed.objects.count(),
+            'powerpanel_count': PowerPanel.objects.restrict(request.user, 'view').count(),
+            'powerfeed_count': PowerFeed.objects.restrict(request.user, 'view').count(),
 
             # IPAM
-            'vrf_count': VRF.objects.count(),
-            'aggregate_count': Aggregate.objects.count(),
-            'prefix_count': Prefix.objects.count(),
-            'ipaddress_count': IPAddress.objects.count(),
-            'vlan_count': VLAN.objects.count(),
+            'vrf_count': VRF.objects.restrict(request.user, 'view').count(),
+            'aggregate_count': Aggregate.objects.restrict(request.user, 'view').count(),
+            'prefix_count': Prefix.objects.restrict(request.user, 'view').count(),
+            'ipaddress_count': IPAddress.objects.restrict(request.user, 'view').count(),
+            'vlan_count': VLAN.objects.restrict(request.user, 'view').count(),
 
             # Circuits
-            'provider_count': Provider.objects.count(),
-            'circuit_count': Circuit.objects.count(),
+            'provider_count': Provider.objects.restrict(request.user, 'view').count(),
+            'circuit_count': Circuit.objects.restrict(request.user, 'view').count(),
 
             # Secrets
-            'secret_count': Secret.objects.count(),
+            'secret_count': Secret.objects.restrict(request.user, 'view').count(),
 
             # Virtualization
-            'cluster_count': Cluster.objects.count(),
-            'virtualmachine_count': VirtualMachine.objects.count(),
+            'cluster_count': Cluster.objects.restrict(request.user, 'view').count(),
+            'virtualmachine_count': VirtualMachine.objects.restrict(request.user, 'view').count(),
 
         }
 
@@ -293,7 +292,7 @@ class SearchView(View):
 
             for obj_type in obj_types:
 
-                queryset = SEARCH_TYPES[obj_type]['queryset']
+                queryset = SEARCH_TYPES[obj_type]['queryset'].restrict(request.user, 'view')
                 filterset = SEARCH_TYPES[obj_type]['filterset']
                 table = SEARCH_TYPES[obj_type]['table']
                 url = SEARCH_TYPES[obj_type]['url']

From 26d7c213140c82dca928e370167b6e2a70b901fe Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 13:47:34 -0400
Subject: [PATCH 084/505] Move authentication backends

---
 docs/configuration/optional-settings.md                       | 2 +-
 .../{utilities/auth_backends.py => netbox/authentication.py}  | 0
 netbox/netbox/configuration.example.py                        | 2 +-
 netbox/netbox/settings.py                                     | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename netbox/{utilities/auth_backends.py => netbox/authentication.py} (100%)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 3c4392915..7c4a7c9c2 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -384,7 +384,7 @@ NetBox can be configured to support remote user authentication by inferring user
 
 ## REMOTE_AUTH_BACKEND
 
-Default: `'utilities.auth_backends.RemoteUserBackend'`
+Default: `'netbox.authentication.RemoteUserBackend'`
 
 Python path to the custom [Django authentication backend](https://docs.djangoproject.com/en/stable/topics/auth/customizing/) to use for external user authentication, if not using NetBox's built-in backend. (Requires `REMOTE_AUTH_ENABLED`.)
 
diff --git a/netbox/utilities/auth_backends.py b/netbox/netbox/authentication.py
similarity index 100%
rename from netbox/utilities/auth_backends.py
rename to netbox/netbox/authentication.py
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 941cbcd88..0803efb2a 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -205,7 +205,7 @@ PREFER_IPV4 = False
 
 # Remote authentication support
 REMOTE_AUTH_ENABLED = False
-REMOTE_AUTH_BACKEND = 'utilities.auth_backends.RemoteUserBackend'
+REMOTE_AUTH_BACKEND = 'netbox.authentication.RemoteUserBackend'
 REMOTE_AUTH_HEADER = 'HTTP_REMOTE_USER'
 REMOTE_AUTH_AUTO_CREATE_USER = True
 REMOTE_AUTH_DEFAULT_GROUPS = []
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 3b345638b..6199ede27 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -97,7 +97,7 @@ PLUGINS = getattr(configuration, 'PLUGINS', [])
 PLUGINS_CONFIG = getattr(configuration, 'PLUGINS_CONFIG', {})
 PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 REMOTE_AUTH_AUTO_CREATE_USER = getattr(configuration, 'REMOTE_AUTH_AUTO_CREATE_USER', False)
-REMOTE_AUTH_BACKEND = getattr(configuration, 'REMOTE_AUTH_BACKEND', 'utilities.auth_backends.RemoteUserBackend')
+REMOTE_AUTH_BACKEND = getattr(configuration, 'REMOTE_AUTH_BACKEND', 'netbox.authentication.RemoteUserBackend')
 REMOTE_AUTH_DEFAULT_GROUPS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_GROUPS', [])
 REMOTE_AUTH_DEFAULT_PERMISSIONS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_PERMISSIONS', [])
 REMOTE_AUTH_ENABLED = getattr(configuration, 'REMOTE_AUTH_ENABLED', False)
@@ -339,7 +339,7 @@ TEMPLATES = [
 # Set up authentication backends
 AUTHENTICATION_BACKENDS = [
     REMOTE_AUTH_BACKEND,
-    'utilities.auth_backends.ObjectPermissionBackend',
+    'netbox.authentication.ObjectPermissionBackend',
 ]
 
 # Internationalization

From 5d4cc5bf3d278cb124a5cb05d3b302d87a0c9c4b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 13:59:58 -0400
Subject: [PATCH 085/505] Fix ordering of group and user fields in
 ObjectPermission admin

---
 netbox/users/admin.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index c1b659a8e..4c3da5acd 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -90,7 +90,9 @@ class ObjectPermissionForm(forms.ModelForm):
         model = ObjectPermission
         exclude = []
         help_texts = {
-            'actions': 'Actions granted in addition to those listed above'
+            'actions': 'Actions granted in addition to those listed above',
+            'attrs': 'JSON expression of a queryset filter that will return only permitted objects. Leave null to '
+                     'match all objects of this type.'
         }
         labels = {
             'actions': 'Additional actions'
@@ -106,6 +108,10 @@ class ObjectPermissionForm(forms.ModelForm):
         order_content_types(self.fields['content_types'])
         self.fields['content_types'].choices.insert(0, ('', '---------'))
 
+        # Order group and user fields
+        self.fields['groups'].queryset = self.fields['groups'].queryset.order_by('name')
+        self.fields['users'].queryset = self.fields['users'].queryset.order_by('username')
+
         # Check the appropriate checkboxes when editing an existing ObjectPermission
         if self.instance.pk:
             for action in ['view', 'add', 'change', 'delete']:

From e9831442cd770270008c060e0146692931319d10 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 15:28:36 -0400
Subject: [PATCH 086/505] Drafted documentation for object-based permissions

---
 docs/administration/permissions.md | 76 ++++++++++++++++++++++++++++++
 mkdocs.yml                         |  1 +
 2 files changed, 77 insertions(+)
 create mode 100644 docs/administration/permissions.md

diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
new file mode 100644
index 000000000..582709726
--- /dev/null
+++ b/docs/administration/permissions.md
@@ -0,0 +1,76 @@
+# Permissions
+
+NetBox v2.9 introduced a new object-based permissions framework, which replace's Django's built-in permission model. Object-based permissions allow for the assignment of permissions to an arbitrary subset of objects of a certain type, rather than only by type of object. For example, it is possible to grant a user permission to view only sites within a particular region, or to modify only VLANs with a numeric ID within a certain range.
+
+Assigning a permission in NetBox entails defining a relationship among several components:
+
+* Model(s) - One or more types of object in NetBox
+* User(s) - One or more users or groups of users
+* Actions - The actions that can be performed (view, add, change, and/or delete)
+* Attributes - An arbitrary filter used to limit the action to a specific subset of objects
+
+At a minimum, a permission assignment must specify one model, one user or group, and one action. The specification of constraining attributes is optional: A permission without any attributes specified will apply to all instances of the selected model(s).
+
+## Actions
+
+There are four core actions that can be permitted for each type of object within NetBox, roughly analogous to the CRUD convention (create, read, update, and delete):
+
+* View - Retrieve an object from the database
+* Add - Create a new object
+* Change - Modify an existing object
+* Delete - Delete an existing object
+
+Some models introduce additional permissions that can be granted to allow other actions. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
+
+## Attributes
+
+Constraining attributes are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
+
+All attributes defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following attributes.
+
+```json
+{
+  "status": "active",
+  "region__name": "Americas"
+}
+```
+
+The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of attributes, simply create another permission assignment for the same model and user/group. 
+
+### Example Attribute Definitions
+
+| Query Filter | Permission Attributes |
+| ------------ | --------------------- |
+| `filter(status='active')` | `{"status": "active"}` |
+| `filter(status='active', role='testing')` | `{"status": "active", "role": "testing"}` |
+| `filter(status__in=['planned', 'reserved'])` | `{"status__in": ["planned", "reserved"]}` |
+| `filter(name__startswith('Foo')` | `{"name__startswith": "Foo"}` |
+| `filter(vid__gte=100, vid__lt=200)` | `{"vid__gte": 100, "vid__lt": 200}` |
+
+## Permissions Enforcement
+
+### Viewing Objects
+
+Object-based permissions work by filtering the database query generated by a user's request to restrict the set of objects returned. When a request is received, NetBox first determines whether the user is authenticated and has been granted to perform the requested action. For example, if the requested URL is `/dcim/devices/`, NetBox will check for the `dcim.view_device` permission. If the user has not been assigned this permission (either directly or via a group assignment), NetBox will return a 403 (forbidden) HTTP response.
+
+If the permission has been granted, NetBox will compile any specified constraints for the model and action. For example, suppose two permissions have been assigned to the user granting view access to the device model, with the following constraints:
+
+```json
+[
+    {"site__name__in":  ["NYC1", "NYC2"]},
+    {"status":  "offline", "tenant__isnull":  true}
+]
+```
+
+This grants the user access to view any device that is in NYC1 or NYC2, **or** which has a status of "offline" and has no tenant assigned. These attributes will result in the following ORM query:
+
+```no-highlight
+Site.objects.filter(
+    Q(site__name__in=['NYC1', 'NYC2']),
+    Q(status='active', tenant__isnull=True)
+)
+```
+
+### Creating and Modifying Objects
+
+The same sort of logic is in play when a user attempts to create or modify an object in NetBox, with a twist. Once validation has completed, NetBox starts an atomic database transaction to facilitate the change, and the object is created or saved normally. Next, still within the transaction, NetBox issues a second query to retrieve the newly created/updated object, filtering the restricted queryset with the object's primary key. If this query fails to return the object, NetBox knows that the new revision does not match the attributes granted by the permission. The transaction is then aborted, and the database is left in its original state.
diff --git a/mkdocs.yml b/mkdocs.yml
index b8633ea8f..2c58acbd8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -58,6 +58,7 @@ nav:
         - Using Plugins: 'plugins/index.md'
         - Developing Plugins: 'plugins/development.md'
     - Administration:
+        - Permissions: 'administration/permissions.md'
         - Replicating NetBox: 'administration/replicating-netbox.md'
         - NetBox Shell: 'administration/netbox-shell.md'
     - API:

From 76f74f479ba74e86075aef2eda34dfa7d5f58dd0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 16:23:45 -0400
Subject: [PATCH 087/505] Support permission attribute assignment via
 REMOTE_AUTH_DEFAULT_PERMISSIONS

---
 docs/configuration/optional-settings.md |  4 ++--
 netbox/netbox/authentication.py         |  6 +++---
 netbox/netbox/configuration.example.py  |  2 +-
 netbox/netbox/settings.py               | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 7c4a7c9c2..31ee39a5f 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -416,9 +416,9 @@ The list of groups to assign a new user account when created using remote authen
 
 ## REMOTE_AUTH_DEFAULT_PERMISSIONS
 
-Default: `[]` (Empty list)
+Default: `{}` (Empty dictionary)
 
-The list of permissions to assign a new user account when created using remote authentication. (Requires `REMOTE_AUTH_ENABLED`.)
+A mapping of permissions to assign a new user account when created using remote authentication. Each key in the dictionary should be set to a dictionary of the attributes to be applied to the permission, or `None` to allow all objects. (Requires `REMOTE_AUTH_ENABLED`.)
 
 ---
 
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 1522e6268..4e9078a9a 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -112,18 +112,18 @@ class RemoteUserBackend(_RemoteUserBackend):
 
         # Assign default object permissions to the user
         permissions_list = []
-        for permission_name in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS:
+        for permission_name, attrs in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items():
             try:
                 content_type, action = resolve_permission(permission_name)
                 # TODO: Merge multiple actions into a single ObjectPermission per content type
-                obj_perm = ObjectPermission(actions=[action])
+                obj_perm = ObjectPermission(actions=[action], attrs=attrs)
                 obj_perm.save()
                 obj_perm.users.add(user)
                 obj_perm.content_types.add(content_type)
                 permissions_list.append(permission_name)
             except ValueError:
                 logging.error(
-                    "Invalid permission name: '{permission_name}'. Permissions must be in the form "
+                    f"Invalid permission name: '{permission_name}'. Permissions must be in the form "
                     "<app>.<action>_<model>. (Example: dcim.add_site)"
                 )
         if permissions_list:
diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py
index 0803efb2a..7b39fb19e 100644
--- a/netbox/netbox/configuration.example.py
+++ b/netbox/netbox/configuration.example.py
@@ -209,7 +209,7 @@ REMOTE_AUTH_BACKEND = 'netbox.authentication.RemoteUserBackend'
 REMOTE_AUTH_HEADER = 'HTTP_REMOTE_USER'
 REMOTE_AUTH_AUTO_CREATE_USER = True
 REMOTE_AUTH_DEFAULT_GROUPS = []
-REMOTE_AUTH_DEFAULT_PERMISSIONS = []
+REMOTE_AUTH_DEFAULT_PERMISSIONS = {}
 
 # This determines how often the GitHub API is called to check the latest release of NetBox. Must be at least 1 hour.
 RELEASE_CHECK_TIMEOUT = 24 * 3600
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 6199ede27..692382262 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -99,7 +99,7 @@ PREFER_IPV4 = getattr(configuration, 'PREFER_IPV4', False)
 REMOTE_AUTH_AUTO_CREATE_USER = getattr(configuration, 'REMOTE_AUTH_AUTO_CREATE_USER', False)
 REMOTE_AUTH_BACKEND = getattr(configuration, 'REMOTE_AUTH_BACKEND', 'netbox.authentication.RemoteUserBackend')
 REMOTE_AUTH_DEFAULT_GROUPS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_GROUPS', [])
-REMOTE_AUTH_DEFAULT_PERMISSIONS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_PERMISSIONS', [])
+REMOTE_AUTH_DEFAULT_PERMISSIONS = getattr(configuration, 'REMOTE_AUTH_DEFAULT_PERMISSIONS', {})
 REMOTE_AUTH_ENABLED = getattr(configuration, 'REMOTE_AUTH_ENABLED', False)
 REMOTE_AUTH_HEADER = getattr(configuration, 'REMOTE_AUTH_HEADER', 'HTTP_REMOTE_USER')
 RELEASE_CHECK_URL = getattr(configuration, 'RELEASE_CHECK_URL', None)
@@ -127,6 +127,17 @@ if RELEASE_CHECK_URL:
 if RELEASE_CHECK_TIMEOUT < 3600:
     raise ImproperlyConfigured("RELEASE_CHECK_TIMEOUT has to be at least 3600 seconds (1 hour)")
 
+# TODO: Remove in v2.10
+# Backward compatibility for REMOTE_AUTH_DEFAULT_PERMISSIONS
+if type(REMOTE_AUTH_DEFAULT_PERMISSIONS) is not dict:
+    try:
+        REMOTE_AUTH_DEFAULT_PERMISSIONS = {perm: None for perm in REMOTE_AUTH_DEFAULT_PERMISSIONS}
+        warnings.warn(
+            "REMOTE_AUTH_DEFAULT_PERMISSIONS should be a dictionary. Backward compatibility will be removed in v2.10."
+        )
+    except TypeError:
+        raise ImproperlyConfigured("REMOTE_AUTH_DEFAULT_PERMISSIONS must be a dictionary.")
+
 
 #
 # Database

From 32620dd5563507877522c6072055920d9c0ae5b8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 16:30:20 -0400
Subject: [PATCH 088/505] Changelog for #554

---
 docs/release-notes/version-2.9.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 docs/release-notes/version-2.9.md

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
new file mode 100644
index 000000000..b6cc699d4
--- /dev/null
+++ b/docs/release-notes/version-2.9.md
@@ -0,0 +1,13 @@
+# NetBox v2.8
+
+## v2.9.0 (FUTURE)
+
+### New Features
+
+#### Object-Based Permissions ([#554](https://github.com/netbox-community/netbox/issues/554))
+
+NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of attributes. The permission will apply only to objects which match the specified attributes. For example, assigning permission to modify devices with the attribute filter `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
+
+### Configuration Changes
+
+* `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`.

From 7b01ba9776fc06d91f0465e57b0c46efbb605542 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 1 Jun 2020 16:46:14 -0400
Subject: [PATCH 089/505] Fix external auth permissions test

---
 netbox/netbox/tests/test_authentication.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index bef8f004a..afeed2263 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -144,7 +144,7 @@ class ExternalAuthenticationTestCase(TestCase):
     @override_settings(
         REMOTE_AUTH_ENABLED=True,
         REMOTE_AUTH_AUTO_CREATE_USER=True,
-        REMOTE_AUTH_DEFAULT_PERMISSIONS=['dcim.add_site', 'dcim.change_site'],
+        REMOTE_AUTH_DEFAULT_PERMISSIONS={'dcim.add_site': None, 'dcim.change_site': None},
         LOGIN_REQUIRED=True
     )
     def test_remote_auth_default_permissions(self):
@@ -158,7 +158,7 @@ class ExternalAuthenticationTestCase(TestCase):
         self.assertTrue(settings.REMOTE_AUTH_ENABLED)
         self.assertTrue(settings.REMOTE_AUTH_AUTO_CREATE_USER)
         self.assertEqual(settings.REMOTE_AUTH_HEADER, 'HTTP_REMOTE_USER')
-        self.assertEqual(settings.REMOTE_AUTH_DEFAULT_PERMISSIONS, ['dcim.add_site', 'dcim.change_site'])
+        self.assertEqual(settings.REMOTE_AUTH_DEFAULT_PERMISSIONS, {'dcim.add_site': None, 'dcim.change_site': None})
 
         response = self.client.get(reverse('home'), follow=True, **headers)
         self.assertEqual(response.status_code, 200)

From 85e932bfc1e6ad62c3e09e0b5a354c7c69597830 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 09:26:45 -0400
Subject: [PATCH 090/505] Clean up permissions utility functions

---
 netbox/netbox/authentication.py       |  7 +++----
 netbox/utilities/permissions.py       | 20 +++++++++++---------
 netbox/utilities/testing/testcases.py |  4 ++--
 netbox/utilities/views.py             |  6 +++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 4e9078a9a..bf1f96edb 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -6,7 +6,7 @@ from django.contrib.auth.models import Group
 from django.db.models import Q
 
 from users.models import ObjectPermission
-from utilities.permissions import permission_is_exempt, resolve_permission
+from utilities.permissions import permission_is_exempt, resolve_permission, resolve_permission_ct
 
 
 class ObjectPermissionBackend(ModelBackend):
@@ -42,8 +42,7 @@ class ObjectPermissionBackend(ModelBackend):
         return perms
 
     def has_perm(self, user_obj, perm, obj=None):
-        app_label, codename = perm.split('.')
-        action, model_name = codename.split('_')
+        app_label, action, model_name = resolve_permission(perm)
 
         # Superusers implicitly have all permissions
         if user_obj.is_active and user_obj.is_superuser:
@@ -114,7 +113,7 @@ class RemoteUserBackend(_RemoteUserBackend):
         permissions_list = []
         for permission_name, attrs in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items():
             try:
-                content_type, action = resolve_permission(permission_name)
+                content_type, action = resolve_permission_ct(permission_name)
                 # TODO: Merge multiple actions into a single ObjectPermission per content type
                 obj_perm = ObjectPermission(actions=[action], attrs=attrs)
                 obj_perm.save()
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 38064b689..44c34942f 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -19,33 +19,36 @@ def get_permission_for_model(model, action):
     )
 
 
-def get_permission_action(name):
+def resolve_permission(name):
     """
-    Return the action component (e.g. view or add) from a permission name.
+    Given a permission name, return the app_label, action, and model_name components. For example, "dcim.view_site"
+    returns ("dcim", "view", "site").
 
     :param name: Permission name in the format <app_label>.<action>_<model>
     """
     try:
-        return name.split('.')[1].split('_')[0]
+        app_label, codename = name.split('.')
+        action, model_name = codename.rsplit('_', 1)
     except ValueError:
         raise ValueError(
             f"Invalid permission name: {name}. Must be in the format <app_label>.<action>_<model>"
         )
 
+    return app_label, action, model_name
 
-def resolve_permission(name):
+
+def resolve_permission_ct(name):
     """
     Given a permission name, return the relevant ContentType and action. For example, "dcim.view_site" returns
     (Site, "view").
 
     :param name: Permission name in the format <app_label>.<action>_<model>
     """
-    app_label, codename = name.split('.')
-    action, model_name = codename.split('_')
+    app_label, action, model_name = resolve_permission(name)
     try:
         content_type = ContentType.objects.get(app_label=app_label, model=model_name)
     except ContentType.DoesNotExist:
-        raise ValueError(f"Unknown app/model for {name}")
+        raise ValueError(f"Unknown app_label/model_name for {name}")
 
     return content_type, action
 
@@ -56,8 +59,7 @@ def permission_is_exempt(name):
 
     :param name: Permission name in the format <app_label>.<action>_<model>
     """
-    app_label, codename = name.split('.')
-    action, model_name = codename.split('_')
+    app_label, action, model_name = resolve_permission(name)
 
     if action == 'view':
         if (
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 3514f9060..2ef5a19fe 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -7,7 +7,7 @@ from django.urls import reverse, NoReverseMatch
 from rest_framework.test import APIClient
 
 from users.models import ObjectPermission, Token
-from utilities.permissions import resolve_permission
+from utilities.permissions import resolve_permission_ct
 from .utils import disable_warnings, post_data
 
 
@@ -33,7 +33,7 @@ class TestCase(_TestCase):
         Assign a set of permissions to the test user. Accepts permission names in the form <app>.<action>_<model>.
         """
         for name in names:
-            ct, action = resolve_permission(name)
+            ct, action = resolve_permission_ct(name)
             obj_perm = ObjectPermission(actions=[action])
             obj_perm.save()
             obj_perm.users.add(self.user)
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 0304780f3..e4161077c 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -28,7 +28,7 @@ from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
 from utilities.exceptions import AbortTransaction
 from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
-from utilities.permissions import get_permission_action, get_permission_for_model
+from utilities.permissions import get_permission_for_model, resolve_permission
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
 from .forms import ConfirmationForm, ImportForm
@@ -64,7 +64,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
         if user.has_perms((permission_required, *self.additional_permissions)):
 
             # Update the view's QuerySet to filter only the permitted objects
-            action = get_permission_action(permission_required)
+            action = resolve_permission(permission_required)[1]
             self.queryset = self.queryset.restrict(user, action)
 
             return True
@@ -233,7 +233,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
         # Compile a dictionary indicating which permissions are available to the current user for this model
         permissions = {}
         for action in ('add', 'change', 'delete', 'view'):
-            perm_name = '{}.{}_{}'.format(model._meta.app_label, action, model._meta.model_name)
+            perm_name = get_permission_for_model(model, action)
             permissions[action] = request.user.has_perm(perm_name)
 
         # Construct the table based on the user's permissions

From 110bad7041abff297b2202cad2bef9fcd16e52e4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 09:36:45 -0400
Subject: [PATCH 091/505] Update custom napalm_read, napalm_write permissions

---
 netbox/dcim/api/views.py                              | 2 +-
 netbox/dcim/migrations/0041_napalm_integration.py     | 2 +-
 netbox/dcim/migrations/0089_deterministic_ordering.py | 2 +-
 netbox/dcim/migrations/0095_primary_model_ordering.py | 2 +-
 netbox/dcim/models/__init__.py                        | 4 ----
 netbox/dcim/views.py                                  | 6 +++---
 netbox/templates/dcim/device.html                     | 2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 9c8fe12de..3abfddbc2 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -395,7 +395,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
             ))
 
         # Verify user permission
-        if not request.user.has_perm('dcim.napalm_read'):
+        if not request.user.has_perm('dcim.napalm_read_device'):
             return HttpResponseForbidden()
 
         # Connect to the device
diff --git a/netbox/dcim/migrations/0041_napalm_integration.py b/netbox/dcim/migrations/0041_napalm_integration.py
index 50c2fbd99..3acad9f0b 100644
--- a/netbox/dcim/migrations/0041_napalm_integration.py
+++ b/netbox/dcim/migrations/0041_napalm_integration.py
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ['name'], 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ['name']},
         ),
         migrations.AddField(
             model_name='platform',
diff --git a/netbox/dcim/migrations/0089_deterministic_ordering.py b/netbox/dcim/migrations/0089_deterministic_ordering.py
index 6944cff00..77d18739e 100644
--- a/netbox/dcim/migrations/0089_deterministic_ordering.py
+++ b/netbox/dcim/migrations/0089_deterministic_ordering.py
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ('name', 'pk'), 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ('name', 'pk')},
         ),
         migrations.AlterModelOptions(
             name='rack',
diff --git a/netbox/dcim/migrations/0095_primary_model_ordering.py b/netbox/dcim/migrations/0095_primary_model_ordering.py
index 3bc780161..6225a9b73 100644
--- a/netbox/dcim/migrations/0095_primary_model_ordering.py
+++ b/netbox/dcim/migrations/0095_primary_model_ordering.py
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterModelOptions(
             name='device',
-            options={'ordering': ('_name', 'pk'), 'permissions': (('napalm_read', 'Read-only access to devices via NAPALM'), ('napalm_write', 'Read/write access to devices via NAPALM'))},
+            options={'ordering': ('_name', 'pk')},
         ),
         migrations.AlterModelOptions(
             name='rack',
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 3dd3b8c89..4d18509a9 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -1477,10 +1477,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
             ('rack', 'position', 'face'),
             ('virtual_chassis', 'vc_position'),
         )
-        permissions = (
-            ('napalm_read', 'Read-only access to devices via NAPALM'),
-            ('napalm_write', 'Read/write access to devices via NAPALM'),
-        )
 
     def __str__(self):
         return self.display_name or super().__str__()
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0f4297fd6..2508590d9 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1099,7 +1099,7 @@ class DeviceInventoryView(ObjectView):
 
 
 class DeviceStatusView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1113,7 +1113,7 @@ class DeviceStatusView(ObjectView):
 
 
 class DeviceLLDPNeighborsView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
@@ -1133,7 +1133,7 @@ class DeviceLLDPNeighborsView(ObjectView):
 
 
 class DeviceConfigView(ObjectView):
-    additional_permissions = ['dcim.napalm_read']
+    additional_permissions = ['dcim.napalm_read_device']
     queryset = Device.objects.all()
 
     def get(self, request, pk):
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index ef1a301e2..a42250a3d 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -101,7 +101,7 @@
                 Inventory <span class="badge">{{ device.inventory_items.count }}</span>
             </a>
         </li>
-        {% if perms.dcim.napalm_read %}
+        {% if perms.dcim.napalm_read_device %}
             {% if device.status != 'active' %}
                 {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='Device must be in active status' %}
             {% elif not device.platform %}

From c6e85970d479ba570ddd1f730d4cf1e82bfddaa0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 09:47:31 -0400
Subject: [PATCH 092/505] Remove activate_userkey permission

---
 docs/release-notes/version-2.9.md                     | 4 ++++
 netbox/secrets/admin.py                               | 2 +-
 netbox/secrets/migrations/0001_initial.py             | 1 -
 netbox/secrets/models.py                              | 3 ---
 netbox/users/migrations/0009_replicate_permissions.py | 5 ++++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index b6cc699d4..fc16ed6fd 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -11,3 +11,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 ### Configuration Changes
 
 * `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`.
+
+### Other Changes
+
+* The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.
diff --git a/netbox/secrets/admin.py b/netbox/secrets/admin.py
index 94cd1c7fa..e11128674 100644
--- a/netbox/secrets/admin.py
+++ b/netbox/secrets/admin.py
@@ -23,7 +23,7 @@ class UserKeyAdmin(admin.ModelAdmin):
         actions = super().get_actions(request)
         if 'delete_selected' in actions:
             del actions['delete_selected']
-        if not request.user.has_perm('secrets.activate_userkey'):
+        if not request.user.has_perm('secrets.change_userkey'):
             del actions['activate_selected']
         return actions
 
diff --git a/netbox/secrets/migrations/0001_initial.py b/netbox/secrets/migrations/0001_initial.py
index 1281a266a..3664bae63 100644
--- a/netbox/secrets/migrations/0001_initial.py
+++ b/netbox/secrets/migrations/0001_initial.py
@@ -56,7 +56,6 @@ class Migration(migrations.Migration):
             ],
             options={
                 'ordering': ['user__username'],
-                'permissions': (('activate_userkey', 'Can activate user keys for decryption'),),
             },
         ),
         migrations.AddField(
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 757ef88c7..bf5858ff8 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -64,9 +64,6 @@ class UserKey(models.Model):
 
     class Meta:
         ordering = ['user__username']
-        permissions = (
-            ('activate_userkey', "Can activate user keys for decryption"),
-        )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index c5e4d364c..66084c3be 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -14,9 +14,12 @@ def replicate_permissions(apps, schema_editor):
     # TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
     # are combined into a single ObjectPermission instance.
     for perm in Permission.objects.all():
-        # Account for non-standard permission names; e.g. napalm_read
         if perm.codename.split('_')[0] in ACTIONS:
+            # Account for non-standard legacy permission names; e.g. napalm_read
             action = perm.codename.split('_')[0]
+        elif perm.codename == 'activate_userkey':
+            # Rename activate_userkey permission
+            action = 'change'
         else:
             action = perm.codename
 

From 7a7634de2d80726df9a5593ac8cb7306387ae7fa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 10:50:58 -0400
Subject: [PATCH 093/505] Accomodate custom legacy permission in schema
 migration

---
 netbox/extras/migrations/0024_scripts.py              | 1 -
 netbox/extras/models/models.py                        | 3 ---
 netbox/users/migrations/0009_replicate_permissions.py | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/netbox/extras/migrations/0024_scripts.py b/netbox/extras/migrations/0024_scripts.py
index 82d0afdc9..c8d81e5e2 100644
--- a/netbox/extras/migrations/0024_scripts.py
+++ b/netbox/extras/migrations/0024_scripts.py
@@ -16,7 +16,6 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
             ],
             options={
-                'permissions': (('run_script', 'Can run script'),),
                 'managed': False,
             },
         ),
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index a94fc3eea..9e000774f 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -564,9 +564,6 @@ class Script(models.Model):
     """
     class Meta:
         managed = False
-        permissions = (
-            ('run_script', 'Can run script'),
-        )
 
 
 #
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index 66084c3be..b25698a36 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -15,11 +15,11 @@ def replicate_permissions(apps, schema_editor):
     # are combined into a single ObjectPermission instance.
     for perm in Permission.objects.all():
         if perm.codename.split('_')[0] in ACTIONS:
-            # Account for non-standard legacy permission names; e.g. napalm_read
             action = perm.codename.split('_')[0]
         elif perm.codename == 'activate_userkey':
-            # Rename activate_userkey permission
             action = 'change'
+        elif perm.codename == 'run_script':
+            action = 'run'
         else:
             action = perm.codename
 

From a62b98ac506aa45d72c7879ac7c01fff556cad30 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 13:21:00 -0400
Subject: [PATCH 094/505] Admin UI improvements

---
 netbox/users/admin.py                         | 34 ++++++++++++++++---
 .../users/migrations/0007_proxy_group_user.py |  2 ++
 netbox/users/models.py                        |  7 +++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 4c3da5acd..80b7affaf 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -35,20 +35,42 @@ class UserConfigInline(admin.TabularInline):
     verbose_name = 'Preferences'
 
 
+class ObjectPermissionInline(admin.TabularInline):
+    model = AdminUser.object_permissions.through
+    fields = ['content_types', 'actions', 'attrs']
+    readonly_fields = fields
+    extra = 0
+    verbose_name = 'Permission'
+
+    def content_types(self, instance):
+        return ', '.join(instance.objectpermission.content_types.values_list('model', flat=True))
+
+    def actions(self, instance):
+        return ', '.join(instance.objectpermission.actions)
+
+    def attrs(self, instance):
+        return instance.objectpermission.attrs
+
+    def has_add_permission(self, request, obj):
+        # Don't allow the creation of new ObjectPermission assignments via this form
+        return False
+
+
 @admin.register(AdminUser)
 class UserAdmin(UserAdmin_):
     list_display = [
         'username', 'email', 'first_name', 'last_name', 'is_superuser', 'is_staff', 'is_active'
     ]
     fieldsets = (
-        (None, {'fields': ('username', 'password')}),
-        ('Personal info', {'fields': ('first_name', 'last_name', 'email')}),
+        (None, {'fields': ('username', 'password', 'first_name', 'last_name', 'email')}),
+        ('Groups', {'fields': ('groups',)}),
         ('Permissions', {
             'fields': ('is_active', 'is_staff', 'is_superuser'),
         }),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
     )
-    inlines = (UserConfigInline,)
+    inlines = [ObjectPermissionInline, UserConfigInline]
+    filter_horizontal = ('groups',)
 
 
 #
@@ -154,7 +176,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
             'fields': ('content_types',)
         }),
         ('Assignment', {
-            'fields': (('groups', 'users'),)
+            'fields': ('groups', 'users')
         }),
         ('Actions', {
             'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
@@ -163,10 +185,14 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
             'fields': ('attrs',)
         }),
     )
+    filter_horizontal = ('content_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
         'list_models', 'list_users', 'list_groups', 'actions', 'attrs',
     ]
+    list_filter = [
+        'groups', 'users'
+    ]
 
     def get_queryset(self, request):
         return super().get_queryset(request).prefetch_related('content_types', 'users', 'groups')
diff --git a/netbox/users/migrations/0007_proxy_group_user.py b/netbox/users/migrations/0007_proxy_group_user.py
index dfd0512bd..2aec9e425 100644
--- a/netbox/users/migrations/0007_proxy_group_user.py
+++ b/netbox/users/migrations/0007_proxy_group_user.py
@@ -21,6 +21,7 @@ class Migration(migrations.Migration):
                 'proxy': True,
                 'indexes': [],
                 'constraints': [],
+                'verbose_name': 'Group',
             },
             bases=('auth.group',),
             managers=[
@@ -35,6 +36,7 @@ class Migration(migrations.Migration):
                 'proxy': True,
                 'indexes': [],
                 'constraints': [],
+                'verbose_name': 'User',
             },
             bases=('auth.user',),
             managers=[
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 1c8775699..9dde9d009 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -29,6 +29,7 @@ class AdminGroup(Group):
     Proxy contrib.auth.models.Group for the admin UI
     """
     class Meta:
+        verbose_name = 'Group'
         proxy = True
 
 
@@ -37,6 +38,7 @@ class AdminUser(User):
     Proxy contrib.auth.models.User for the admin UI
     """
     class Meta:
+        verbose_name = 'User'
         proxy = True
 
 
@@ -264,4 +266,7 @@ class ObjectPermission(models.Model):
         verbose_name = "Permission"
 
     def __str__(self):
-        return "Object permission"
+        return '{}: {}'.format(
+            ', '.join(self.content_types.values_list('model', flat=True)),
+            ', '.join(self.actions)
+        )

From cae412d280fe876d0513af2aec8334f3020565cf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 14:19:08 -0400
Subject: [PATCH 095/505] Update ObjectImportView to support ObjectPermissions

---
 netbox/dcim/views.py      |  6 +++---
 netbox/utilities/views.py | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 2508590d9..b3b99d804 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -627,8 +627,8 @@ class DeviceTypeDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:devicetype_list'
 
 
-class DeviceTypeImportView(PermissionRequiredMixin, ObjectImportView):
-    permission_required = [
+class DeviceTypeImportView(ObjectImportView):
+    additional_permissions = [
         'dcim.add_devicetype',
         'dcim.add_consoleporttemplate',
         'dcim.add_consoleserverporttemplate',
@@ -639,7 +639,7 @@ class DeviceTypeImportView(PermissionRequiredMixin, ObjectImportView):
         'dcim.add_rearporttemplate',
         'dcim.add_devicebaytemplate',
     ]
-    model = DeviceType
+    queryset = DeviceType.objects.all()
     model_form = forms.DeviceTypeImportForm
     related_object_forms = OrderedDict((
         ('console-ports', forms.ConsolePortTemplateImportForm),
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index e4161077c..e448f2934 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -571,21 +571,29 @@ class BulkCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
-class ObjectImportView(GetReturnURLMixin, View):
+class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Import a single object (YAML or JSON format).
+
+    queryset: Base queryset for the objects being created
+    model_form: The ModelForm used to create individual objects
+    related_object_forms: A dictionary mapping of forms to be used for the creation of related (child) objects
+    template_name: The name of the template
     """
-    model = None
+    queryset = None
     model_form = None
     related_object_forms = dict()
     template_name = 'utilities/obj_import.html'
 
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'add')
+
     def get(self, request):
         form = ImportForm()
 
         return render(request, self.template_name, {
             'form': form,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'return_url': self.get_return_url(request),
         })
 
@@ -615,12 +623,17 @@ class ObjectImportView(GetReturnURLMixin, View):
 
                         # Save the primary object
                         obj = model_form.save()
+
+                        # Enforce object-level permissions
+                        self.queryset.get(pk=obj.pk)
+
                         logger.debug(f"Created {obj} (PK: {obj.pk})")
 
                         # Iterate through the related object forms (if any), validating and saving each instance.
                         for field_name, related_object_form in self.related_object_forms.items():
                             logger.debug("Processing form for related objects: {related_object_form}")
 
+                            related_obj_pks = []
                             for i, rel_obj_data in enumerate(data.get(field_name, list())):
 
                                 f = related_object_form(obj, rel_obj_data)
@@ -630,7 +643,8 @@ class ObjectImportView(GetReturnURLMixin, View):
                                         f.data[subfield_name] = field.initial
 
                                 if f.is_valid():
-                                    f.save()
+                                    related_obj = f.save()
+                                    related_obj_pks.append(related_obj.pk)
                                 else:
                                     # Replicate errors on the related object form to the primary form for display
                                     for subfield_name, errors in f.errors.items():
@@ -639,9 +653,19 @@ class ObjectImportView(GetReturnURLMixin, View):
                                             model_form.add_error(None, err_msg)
                                     raise AbortTransaction()
 
+                            # Enforce object-level permissions on related objects
+                            model = related_object_form.Meta.model
+                            if model.objects.filter(pk__in=related_obj_pks).count() != len(related_obj_pks):
+                                raise ObjectDoesNotExist
+
                 except AbortTransaction:
                     pass
 
+                except ObjectDoesNotExist:
+                    msg = "Object creation failed due to object-level permissions violation"
+                    logger.debug(msg)
+                    form.add_error(None, msg)
+
             if not model_form.errors:
                 logger.info(f"Import object {obj} (PK: {obj.pk})")
                 messages.success(request, mark_safe('Imported object: <a href="{}">{}</a>'.format(
@@ -673,7 +697,7 @@ class ObjectImportView(GetReturnURLMixin, View):
 
         return render(request, self.template_name, {
             'form': form,
-            'obj_type': self.model._meta.verbose_name,
+            'obj_type': self.queryset.model._meta.verbose_name,
             'return_url': self.get_return_url(request),
         })
 

From e463430d51567dd2111cf46e6dc7d03e5e24b73c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 15:15:57 -0400
Subject: [PATCH 096/505] Change CableCreateView to use ObjectEditView

---
 netbox/dcim/views.py      | 73 +++++++++++++--------------------------
 netbox/utilities/views.py |  2 +-
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index b3b99d804..12f7a5046 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1904,23 +1904,15 @@ class CableTraceView(ObjectView):
         })
 
 
-class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View):
-    permission_required = 'dcim.add_cable'
+class CableCreateView(ObjectEditView):
+    queryset = Cable.objects.all()
     template_name = 'dcim/cable_connect.html'
+    default_return_url = 'dcim:cable_list'
 
     def dispatch(self, request, *args, **kwargs):
 
-        termination_a_type = kwargs.get('termination_a_type')
-        termination_a_id = kwargs.get('termination_a_id')
-
-        termination_b_type_name = kwargs.get('termination_b_type')
-        self.termination_b_type = ContentType.objects.get(model=termination_b_type_name.replace('-', ''))
-
-        self.obj = Cable(
-            termination_a=termination_a_type.objects.get(pk=termination_a_id),
-            termination_b_type=self.termination_b_type
-        )
-        self.form_class = {
+        # Set the model_form class based on the type of component being connected
+        self.model_form = {
             'console-port': forms.ConnectCableToConsolePortForm,
             'console-server-port': forms.ConnectCableToConsoleServerPortForm,
             'power-port': forms.ConnectCableToPowerPortForm,
@@ -1930,59 +1922,42 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View):
             'rear-port': forms.ConnectCableToRearPortForm,
             'power-feed': forms.ConnectCableToPowerFeedForm,
             'circuit-termination': forms.ConnectCableToCircuitTerminationForm,
-        }[termination_b_type_name]
+        }[kwargs.get('termination_b_type')]
 
         return super().dispatch(request, *args, **kwargs)
 
+    def alter_obj(self, obj, request, url_args, url_kwargs):
+        termination_a_type = url_kwargs.get('termination_a_type')
+        termination_a_id = url_kwargs.get('termination_a_id')
+        termination_b_type_name = url_kwargs.get('termination_b_type')
+        self.termination_b_type = ContentType.objects.get(model=termination_b_type_name.replace('-', ''))
+
+        # Initialize Cable termination attributes
+        obj.termination_a = termination_a_type.objects.get(pk=termination_a_id)
+        obj.termination_b_type = self.termination_b_type
+
+        return obj
+
     def get(self, request, *args, **kwargs):
+        obj = self.alter_obj(self.get_object(kwargs), request, args, kwargs)
 
         # Parse initial data manually to avoid setting field values as lists
         initial_data = {k: request.GET[k] for k in request.GET}
 
         # Set initial site and rack based on side A termination (if not already set)
         if 'termination_b_site' not in initial_data:
-            initial_data['termination_b_site'] = getattr(self.obj.termination_a.parent, 'site', None)
+            initial_data['termination_b_site'] = getattr(obj.termination_a.parent, 'site', None)
         if 'termination_b_rack' not in initial_data:
-            initial_data['termination_b_rack'] = getattr(self.obj.termination_a.parent, 'rack', None)
+            initial_data['termination_b_rack'] = getattr(obj.termination_a.parent, 'rack', None)
 
-        form = self.form_class(instance=self.obj, initial=initial_data)
+        form = self.model_form(instance=obj, initial=initial_data)
 
         return render(request, self.template_name, {
-            'obj': self.obj,
+            'obj': obj,
             'obj_type': Cable._meta.verbose_name,
             'termination_b_type': self.termination_b_type.name,
             'form': form,
-            'return_url': self.get_return_url(request, self.obj),
-        })
-
-    def post(self, request, *args, **kwargs):
-
-        form = self.form_class(request.POST, request.FILES, instance=self.obj)
-
-        if form.is_valid():
-            obj = form.save()
-
-            msg = 'Created cable <a href="{}">{}</a>'.format(
-                obj.get_absolute_url(),
-                escape(obj)
-            )
-            messages.success(request, mark_safe(msg))
-
-            if '_addanother' in request.POST:
-                return redirect(request.get_full_path())
-
-            return_url = form.cleaned_data.get('return_url')
-            if return_url is not None and is_safe_url(url=return_url, allowed_hosts=request.get_host()):
-                return redirect(return_url)
-            else:
-                return redirect(self.get_return_url(request, obj))
-
-        return render(request, self.template_name, {
-            'obj': self.obj,
-            'obj_type': Cable._meta.verbose_name,
-            'termination_b_type': self.termination_b_type.name,
-            'form': form,
-            'return_url': self.get_return_url(request, self.obj),
+            'return_url': self.get_return_url(request, obj),
         })
 
 
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index e448f2934..9271e1c64 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -346,7 +346,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         form = self.model_form(
             data=request.POST,
             files=request.FILES,
-            instance=self.alter_obj(self.get_object(kwargs), request, args, kwargs)
+            instance=obj
         )
 
         if form.is_valid():

From 205acd2c4d8ebaf83eeed38b998377bb59b70ac7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 15:33:41 -0400
Subject: [PATCH 097/505] Update VirtualChassis views to support
 ObjectPermissions

---
 netbox/dcim/views.py | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 12f7a5046..de2bf80e5 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -3,7 +3,6 @@ import re
 
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import EmptyPage, PageNotAnInteger
 from django.db import transaction
@@ -12,7 +11,6 @@ from django.forms import modelformset_factory
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.html import escape
-from django.utils.http import is_safe_url
 from django.utils.safestring import mark_safe
 from django.views.generic import View
 
@@ -2169,8 +2167,11 @@ class VirtualChassisView(ObjectView):
         })
 
 
-class VirtualChassisCreateView(PermissionRequiredMixin, View):
-    permission_required = 'dcim.add_virtualchassis'
+class VirtualChassisCreateView(ObjectPermissionRequiredMixin, View):
+    queryset = VirtualChassis.objects.all()
+
+    def get_required_permission(self):
+        return 'dcim.add_virtualchassis'
 
     def post(self, request):
 
@@ -2224,8 +2225,11 @@ class VirtualChassisCreateView(PermissionRequiredMixin, View):
         })
 
 
-class VirtualChassisEditView(PermissionRequiredMixin, GetReturnURLMixin, View):
-    permission_required = 'dcim.change_virtualchassis'
+class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
+    queryset = VirtualChassis.objects.all()
+
+    def get_required_permission(self):
+        return 'dcim.change_virtualchassis'
 
     def get(self, request, pk):
 
@@ -2294,12 +2298,15 @@ class VirtualChassisDeleteView(ObjectDeleteView):
     default_return_url = 'dcim:device_list'
 
 
-class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, View):
-    permission_required = 'dcim.change_virtualchassis'
+class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
+    queryset = VirtualChassis.objects.all()
+
+    def get_required_permission(self):
+        return 'dcim.change_virtualchassis'
 
     def get(self, request, pk):
 
-        virtual_chassis = get_object_or_404(VirtualChassis, pk=pk)
+        virtual_chassis = get_object_or_404(self.queryset, pk=pk)
 
         initial_data = {k: request.GET[k] for k in request.GET}
         member_select_form = forms.VCMemberSelectForm(initial=initial_data)
@@ -2314,7 +2321,7 @@ class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, Vi
 
     def post(self, request, pk):
 
-        virtual_chassis = get_object_or_404(VirtualChassis, pk=pk)
+        virtual_chassis = get_object_or_404(self.queryset, pk=pk)
 
         member_select_form = forms.VCMemberSelectForm(request.POST)
 
@@ -2348,12 +2355,15 @@ class VirtualChassisAddMemberView(PermissionRequiredMixin, GetReturnURLMixin, Vi
         })
 
 
-class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin, View):
-    permission_required = 'dcim.change_virtualchassis'
+class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
+    queryset = Device.objects.all()
+
+    def get_required_permission(self):
+        return 'dcim.change_device'
 
     def get(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk, virtual_chassis__isnull=False)
+        device = get_object_or_404(self.queryset, pk=pk, virtual_chassis__isnull=False)
         form = ConfirmationForm(initial=request.GET)
 
         return render(request, 'dcim/virtualchassis_remove_member.html', {
@@ -2364,7 +2374,7 @@ class VirtualChassisRemoveMemberView(PermissionRequiredMixin, GetReturnURLMixin,
 
     def post(self, request, pk):
 
-        device = get_object_or_404(Device, pk=pk, virtual_chassis__isnull=False)
+        device = get_object_or_404(self.queryset, pk=pk, virtual_chassis__isnull=False)
         form = ConfirmationForm(request.POST)
 
         # Protect master device from being removed

From 3502398d1d90546f4fb56c678f591599ce0893c3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 15:36:31 -0400
Subject: [PATCH 098/505] Remove delete_token permission from TokenDeleteView

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/users/views.py             | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index fc16ed6fd..4fda77838 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -15,3 +15,4 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 ### Other Changes
 
 * The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.
+* The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
diff --git a/netbox/users/views.py b/netbox/users/views.py
index c3e366542..f88ff040c 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -3,7 +3,7 @@ import logging
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash
-from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import update_last_login
 from django.contrib.auth.signals import user_logged_in
 from django.http import HttpResponseForbidden, HttpResponseRedirect
@@ -320,8 +320,7 @@ class TokenEditView(LoginRequiredMixin, View):
         })
 
 
-class TokenDeleteView(PermissionRequiredMixin, View):
-    permission_required = 'users.delete_token'
+class TokenDeleteView(LoginRequiredMixin, View):
 
     def get(self, request, pk):
 

From 19407ba3bc7104b1d88c4efa1f997b469f7c8616 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 2 Jun 2020 15:40:39 -0400
Subject: [PATCH 099/505] Uodate script and report views to use
 ObjectPermissionRequiredMixin

---
 netbox/extras/views.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index a607a4df8..e80aa1d62 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1,7 +1,6 @@
 from django import template
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, Q
 from django.http import Http404, HttpResponseForbidden
@@ -13,7 +12,10 @@ from django_tables2 import RequestConfig
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import shallow_compare_dict
-from utilities.views import BulkDeleteView, BulkEditView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView
+from utilities.views import (
+    BulkDeleteView, BulkEditView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    ObjectPermissionRequiredMixin,
+)
 from . import filters, forms
 from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem
 from .reports import get_report, get_reports
@@ -324,11 +326,12 @@ class ImageAttachmentDeleteView(ObjectDeleteView):
 # Reports
 #
 
-class ReportListView(PermissionRequiredMixin, View):
+class ReportListView(ObjectPermissionRequiredMixin, View):
     """
     Retrieve all of the available reports from disk and the recorded ReportResult (if any) for each.
     """
-    permission_required = 'extras.view_reportresult'
+    def get_required_permission(self):
+        return 'extras.view_reportresult'
 
     def get(self, request):
 
@@ -348,11 +351,12 @@ class ReportListView(PermissionRequiredMixin, View):
         })
 
 
-class ReportView(PermissionRequiredMixin, View):
+class ReportView(ObjectPermissionRequiredMixin, View):
     """
     Display a single Report and its associated ReportResult (if any).
     """
-    permission_required = 'extras.view_reportresult'
+    def get_required_permission(self):
+        return 'extras.view_reportresult'
 
     def get(self, request, name):
 
@@ -371,11 +375,12 @@ class ReportView(PermissionRequiredMixin, View):
         })
 
 
-class ReportRunView(PermissionRequiredMixin, View):
+class ReportRunView(ObjectPermissionRequiredMixin, View):
     """
     Run a Report and record a new ReportResult.
     """
-    permission_required = 'extras.add_reportresult'
+    def get_required_permission(self):
+        return 'extras.add_reportresult'
 
     def post(self, request, name):
 
@@ -401,8 +406,10 @@ class ReportRunView(PermissionRequiredMixin, View):
 # Scripts
 #
 
-class ScriptListView(PermissionRequiredMixin, View):
-    permission_required = 'extras.view_script'
+class ScriptListView(ObjectPermissionRequiredMixin, View):
+
+    def get_required_permission(self):
+        return 'extras.view_script'
 
     def get(self, request):
 
@@ -411,8 +418,10 @@ class ScriptListView(PermissionRequiredMixin, View):
         })
 
 
-class ScriptView(PermissionRequiredMixin, View):
-    permission_required = 'extras.view_script'
+class ScriptView(ObjectPermissionRequiredMixin, View):
+
+    def get_required_permission(self):
+        return 'extras.view_script'
 
     def _get_script(self, module, name):
         scripts = get_scripts()

From ddcd172af130d0ebd529b55a297cd7824283b72f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 09:27:20 -0400
Subject: [PATCH 100/505] Rename content_types to object_types

---
 netbox/netbox/authentication.py               | 10 +++---
 netbox/netbox/tests/test_authentication.py    | 26 +++++++-------
 netbox/users/admin.py                         | 22 ++++++------
 .../users/migrations/0008_objectpermission.py |  2 +-
 .../migrations/0009_replicate_permissions.py  |  2 +-
 netbox/users/models.py                        |  4 +--
 netbox/utilities/testing/testcases.py         | 36 +++++++++----------
 7 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index bf1f96edb..a219c1498 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -26,14 +26,14 @@ class ObjectPermissionBackend(ModelBackend):
         object_permissions = ObjectPermission.objects.filter(
             Q(users=user_obj) |
             Q(groups__user=user_obj)
-        ).prefetch_related('content_types')
+        ).prefetch_related('object_types')
 
         # Create a dictionary mapping permissions to their attributes
         perms = dict()
         for obj_perm in object_permissions:
-            for content_type in obj_perm.content_types.all():
+            for object_type in obj_perm.object_types.all():
                 for action in obj_perm.actions:
-                    perm_name = f"{content_type.app_label}.{action}_{content_type.model}"
+                    perm_name = f"{object_type.app_label}.{action}_{object_type.model}"
                     if perm_name in perms:
                         perms[perm_name].append(obj_perm.attrs)
                     else:
@@ -113,12 +113,12 @@ class RemoteUserBackend(_RemoteUserBackend):
         permissions_list = []
         for permission_name, attrs in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items():
             try:
-                content_type, action = resolve_permission_ct(permission_name)
+                object_type, action = resolve_permission_ct(permission_name)
                 # TODO: Merge multiple actions into a single ObjectPermission per content type
                 obj_perm = ObjectPermission(actions=[action], attrs=attrs)
                 obj_perm.save()
                 obj_perm.users.add(user)
-                obj_perm.content_types.add(content_type)
+                obj_perm.object_types.add(object_type)
                 permissions_list.append(permission_name)
             except ValueError:
                 logging.error(
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index afeed2263..db63faffd 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -207,7 +207,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve permitted object
         response = self.client.get(self.prefixes[0].get_absolute_url())
@@ -231,7 +231,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(reverse('ipam:prefix_list'))
@@ -265,7 +265,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create a non-permitted object
         request = {
@@ -312,7 +312,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit a non-permitted object
         request = {
@@ -355,7 +355,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Delete permitted object
         request = {
@@ -403,7 +403,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create non-permitted objects
         request = {
@@ -452,7 +452,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit non-permitted objects
         request = {
@@ -496,7 +496,7 @@ class ObjectPermissionViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to delete non-permitted object
         request = {
@@ -567,7 +567,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[0].pk})
@@ -594,7 +594,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Retrieve all objects. Only permitted objects should be returned.
         response = self.client.get(url, **self.header)
@@ -621,7 +621,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to create a non-permitted object
         response = self.client.post(url, data, format='json', **self.header)
@@ -650,7 +650,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to edit a non-permitted object
         data = {'site': self.sites[0].pk}
@@ -685,7 +685,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
         )
         obj_perm.save()
         obj_perm.users.add(self.user)
-        obj_perm.content_types.add(ContentType.objects.get_for_model(Prefix))
+        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
 
         # Attempt to delete a non-permitted object
         url = reverse('ipam-api:prefix-detail', kwargs={'pk': self.prefixes[3].pk})
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 80b7affaf..80283340d 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -37,13 +37,13 @@ class UserConfigInline(admin.TabularInline):
 
 class ObjectPermissionInline(admin.TabularInline):
     model = AdminUser.object_permissions.through
-    fields = ['content_types', 'actions', 'attrs']
+    fields = ['object_types', 'actions', 'attrs']
     readonly_fields = fields
     extra = 0
     verbose_name = 'Permission'
 
-    def content_types(self, instance):
-        return ', '.join(instance.objectpermission.content_types.values_list('model', flat=True))
+    def object_types(self, instance):
+        return ', '.join(instance.objectpermission.object_types.values_list('model', flat=True))
 
     def actions(self, instance):
         return ', '.join(instance.objectpermission.actions)
@@ -127,8 +127,8 @@ class ObjectPermissionForm(forms.ModelForm):
         self.fields['actions'].required = False
 
         # Format ContentType choices
-        order_content_types(self.fields['content_types'])
-        self.fields['content_types'].choices.insert(0, ('', '---------'))
+        order_content_types(self.fields['object_types'])
+        self.fields['object_types'].choices.insert(0, ('', '---------'))
 
         # Order group and user fields
         self.fields['groups'].queryset = self.fields['groups'].queryset.order_by('name')
@@ -142,7 +142,7 @@ class ObjectPermissionForm(forms.ModelForm):
                     self.instance.actions.remove(action)
 
     def clean(self):
-        content_types = self.cleaned_data['content_types']
+        object_types = self.cleaned_data['object_types']
         attrs = self.cleaned_data['attrs']
 
         # Append any of the selected CRUD checkboxes to the actions list
@@ -159,7 +159,7 @@ class ObjectPermissionForm(forms.ModelForm):
         # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
         # returns anything; we just want to make sure the specified attributes are valid.
         if attrs:
-            for ct in content_types:
+            for ct in object_types:
                 model = ct.model_class()
                 try:
                     model.objects.filter(**attrs).exists()
@@ -173,7 +173,7 @@ class ObjectPermissionForm(forms.ModelForm):
 class ObjectPermissionAdmin(admin.ModelAdmin):
     fieldsets = (
         ('Objects', {
-            'fields': ('content_types',)
+            'fields': ('object_types',)
         }),
         ('Assignment', {
             'fields': ('groups', 'users')
@@ -185,7 +185,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
             'fields': ('attrs',)
         }),
     )
-    filter_horizontal = ('content_types', 'groups', 'users')
+    filter_horizontal = ('object_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
         'list_models', 'list_users', 'list_groups', 'actions', 'attrs',
@@ -195,10 +195,10 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     ]
 
     def get_queryset(self, request):
-        return super().get_queryset(request).prefetch_related('content_types', 'users', 'groups')
+        return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
 
     def list_models(self, obj):
-        return ', '.join([f"{ct}" for ct in obj.content_types.all()])
+        return ', '.join([f"{ct}" for ct in obj.object_types.all()])
     list_models.short_description = 'Models'
 
     def list_users(self, obj):
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index f2ecb98b0..4f301264e 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
                 ('attrs', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
-                ('content_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
+                ('object_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
                 ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index b25698a36..a5d28beac 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -26,7 +26,7 @@ def replicate_permissions(apps, schema_editor):
         if perm.group_set.exists() or perm.user_set.exists():
             obj_perm = ObjectPermission(actions=[action])
             obj_perm.save()
-            obj_perm.content_types.add(perm.content_type)
+            obj_perm.object_types.add(perm.content_type)
             if perm.group_set.exists():
                 obj_perm.groups.add(*list(perm.group_set.all()))
             if perm.user_set.exists():
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 9dde9d009..255980dfc 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -243,7 +243,7 @@ class ObjectPermission(models.Model):
         blank=True,
         related_name='object_permissions'
     )
-    content_types = models.ManyToManyField(
+    object_types = models.ManyToManyField(
         to=ContentType,
         limit_choices_to={
             'app_label__in': [
@@ -267,6 +267,6 @@ class ObjectPermission(models.Model):
 
     def __str__(self):
         return '{}: {}'.format(
-            ', '.join(self.content_types.values_list('model', flat=True)),
+            ', '.join(self.object_types.values_list('model', flat=True)),
             ', '.join(self.actions)
         )
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 2ef5a19fe..3cf6a9df6 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -37,7 +37,7 @@ class TestCase(_TestCase):
             obj_perm = ObjectPermission(actions=[action])
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ct)
+            obj_perm.object_types.add(ct)
 
     #
     # Convenience methods
@@ -169,7 +169,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
@@ -185,7 +185,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET to permitted object
             self.assertHttpStatus(self.client.get(instance1.get_absolute_url()), 200)
@@ -225,7 +225,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -250,7 +250,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with object-level permission
             self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
@@ -309,7 +309,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 200)
@@ -333,7 +333,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with a permitted object
             self.assertHttpStatus(self.client.get(self._get_url('edit', instance1)), 200)
@@ -386,7 +386,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('delete', instance)), 200)
@@ -411,7 +411,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with a permitted object
             self.assertHttpStatus(self.client.get(self._get_url('delete', instance1)), 200)
@@ -463,7 +463,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
@@ -485,7 +485,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with object-level permission
             self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
@@ -515,7 +515,7 @@ class ViewTestCases:
             obj_perm = ObjectPermission(actions=['add'])
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
@@ -561,7 +561,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with model-level permission
             self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
@@ -584,7 +584,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Test import with object-level permission
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
@@ -631,7 +631,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
@@ -656,7 +656,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
@@ -701,7 +701,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
@@ -723,7 +723,7 @@ class ViewTestCases:
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
-            obj_perm.content_types.add(ContentType.objects.get_for_model(self.model))
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try POST with object-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)

From d157818d7e7dd28e3b8d61456f1aecf66b8f1a31 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 09:43:46 -0400
Subject: [PATCH 101/505] Rename attrs to constraints

---
 netbox/netbox/authentication.py               | 28 +++++++++----------
 netbox/netbox/tests/test_authentication.py    | 26 ++++++++---------
 netbox/users/admin.py                         | 26 ++++++++---------
 .../users/migrations/0008_objectpermission.py |  4 +--
 netbox/users/models.py                        |  4 +--
 netbox/utilities/testing/testcases.py         | 18 ++++++------
 6 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index a219c1498..02b0be0f3 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -28,16 +28,16 @@ class ObjectPermissionBackend(ModelBackend):
             Q(groups__user=user_obj)
         ).prefetch_related('object_types')
 
-        # Create a dictionary mapping permissions to their attributes
+        # Create a dictionary mapping permissions to their constraints
         perms = dict()
         for obj_perm in object_permissions:
             for object_type in obj_perm.object_types.all():
                 for action in obj_perm.actions:
                     perm_name = f"{object_type.app_label}.{action}_{object_type.model}"
                     if perm_name in perms:
-                        perms[perm_name].append(obj_perm.attrs)
+                        perms[perm_name].append(obj_perm.constraints)
                     else:
-                        perms[perm_name] = [obj_perm.attrs]
+                        perms[perm_name] = [obj_perm.constraints]
 
         return perms
 
@@ -71,20 +71,20 @@ class ObjectPermissionBackend(ModelBackend):
             raise ValueError(f"Invalid permission {perm} for model {model}")
 
         # Compile a query filter that matches all instances of the specified model
-        obj_perm_attrs = self.get_all_permissions(user_obj)[perm]
-        attrs = Q()
-        for perm_attrs in obj_perm_attrs:
-            if perm_attrs:
-                attrs |= Q(**perm_attrs)
+        obj_perm_constraints = self.get_all_permissions(user_obj)[perm]
+        constraints = Q()
+        for perm_constraints in obj_perm_constraints:
+            if perm_constraints:
+                constraints |= Q(**perm_constraints)
             else:
-                # Found ObjectPermission with null attrs; allow model-level access
-                attrs = Q()
+                # Found ObjectPermission with null constraints; allow model-level access
+                constraints = Q()
                 break
 
         # Permission to perform the requested action on the object depends on whether the specified object matches
-        # the specified attributes. Note that this check is made against the *database* record representing the object,
+        # the specified constraints. Note that this check is made against the *database* record representing the object,
         # not the instance itself.
-        return model.objects.filter(attrs, pk=obj.pk).exists()
+        return model.objects.filter(constraints, pk=obj.pk).exists()
 
 
 class RemoteUserBackend(_RemoteUserBackend):
@@ -111,11 +111,11 @@ class RemoteUserBackend(_RemoteUserBackend):
 
         # Assign default object permissions to the user
         permissions_list = []
-        for permission_name, attrs in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items():
+        for permission_name, constraints in settings.REMOTE_AUTH_DEFAULT_PERMISSIONS.items():
             try:
                 object_type, action = resolve_permission_ct(permission_name)
                 # TODO: Merge multiple actions into a single ObjectPermission per content type
-                obj_perm = ObjectPermission(actions=[action], attrs=attrs)
+                obj_perm = ObjectPermission(actions=[action], constraints=constraints)
                 obj_perm.save()
                 obj_perm.users.add(user)
                 obj_perm.object_types.add(object_type)
diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index db63faffd..0e9bea90d 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -202,7 +202,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view']
         )
         obj_perm.save()
@@ -226,7 +226,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view']
         )
         obj_perm.save()
@@ -260,7 +260,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view', 'add']
         )
         obj_perm.save()
@@ -307,7 +307,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view', 'change']
         )
         obj_perm.save()
@@ -350,7 +350,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view', 'delete']
         )
         obj_perm.save()
@@ -398,7 +398,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['add']
         )
         obj_perm.save()
@@ -447,7 +447,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['change']
         )
         obj_perm.save()
@@ -491,7 +491,7 @@ class ObjectPermissionViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view', 'delete']
         )
         obj_perm.save()
@@ -562,7 +562,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view']
         )
         obj_perm.save()
@@ -589,7 +589,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['view']
         )
         obj_perm.save()
@@ -616,7 +616,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['add']
         )
         obj_perm.save()
@@ -645,7 +645,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['change']
         )
         obj_perm.save()
@@ -680,7 +680,7 @@ class ObjectPermissionAPIViewTestCase(TestCase):
 
         # Assign object permission
         obj_perm = ObjectPermission(
-            attrs={'site__name': 'Site 1'},
+            constraints={'site__name': 'Site 1'},
             actions=['delete']
         )
         obj_perm.save()
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 80283340d..cc7a1b379 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -37,7 +37,7 @@ class UserConfigInline(admin.TabularInline):
 
 class ObjectPermissionInline(admin.TabularInline):
     model = AdminUser.object_permissions.through
-    fields = ['object_types', 'actions', 'attrs']
+    fields = ['object_types', 'actions', 'constraints']
     readonly_fields = fields
     extra = 0
     verbose_name = 'Permission'
@@ -48,8 +48,8 @@ class ObjectPermissionInline(admin.TabularInline):
     def actions(self, instance):
         return ', '.join(instance.objectpermission.actions)
 
-    def attrs(self, instance):
-        return instance.objectpermission.attrs
+    def constraints(self, instance):
+        return instance.objectpermission.constraints
 
     def has_add_permission(self, request, obj):
         # Don't allow the creation of new ObjectPermission assignments via this form
@@ -113,8 +113,8 @@ class ObjectPermissionForm(forms.ModelForm):
         exclude = []
         help_texts = {
             'actions': 'Actions granted in addition to those listed above',
-            'attrs': 'JSON expression of a queryset filter that will return only permitted objects. Leave null to '
-                     'match all objects of this type.'
+            'constraints': 'JSON expression of a queryset filter that will return only permitted objects. Leave null '
+                           'to match all objects of this type.'
         }
         labels = {
             'actions': 'Additional actions'
@@ -143,7 +143,7 @@ class ObjectPermissionForm(forms.ModelForm):
 
     def clean(self):
         object_types = self.cleaned_data['object_types']
-        attrs = self.cleaned_data['attrs']
+        constraints = self.cleaned_data['constraints']
 
         # Append any of the selected CRUD checkboxes to the actions list
         if not self.cleaned_data.get('actions'):
@@ -156,16 +156,16 @@ class ObjectPermissionForm(forms.ModelForm):
         if not self.cleaned_data['actions']:
             raise ValidationError("At least one action must be selected.")
 
-        # Validate the specified model attributes by attempting to execute a query. We don't care whether the query
-        # returns anything; we just want to make sure the specified attributes are valid.
-        if attrs:
+        # Validate the specified model constraints by attempting to execute a query. We don't care whether the query
+        # returns anything; we just want to make sure the specified constraints are valid.
+        if constraints:
             for ct in object_types:
                 model = ct.model_class()
                 try:
-                    model.objects.filter(**attrs).exists()
+                    model.objects.filter(**constraints).exists()
                 except FieldError as e:
                     raise ValidationError({
-                        'attrs': f'Invalid attributes for {model}: {e}'
+                        'constraints': f'Invalid filter for {model}: {e}'
                     })
 
 
@@ -182,13 +182,13 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
             'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
         }),
         ('Constraints', {
-            'fields': ('attrs',)
+            'fields': ('constraints',)
         }),
     )
     filter_horizontal = ('object_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
-        'list_models', 'list_users', 'list_groups', 'actions', 'attrs',
+        'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
     ]
     list_filter = [
         'groups', 'users'
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 4f301264e..3f16e1ee8 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -1,5 +1,3 @@
-# Generated by Django 3.0.6 on 2020-05-29 14:59
-
 from django.conf import settings
 import django.contrib.postgres.fields
 import django.contrib.postgres.fields.jsonb
@@ -20,7 +18,7 @@ class Migration(migrations.Migration):
             name='ObjectPermission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('attrs', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
+                ('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
                 ('object_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
                 ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 255980dfc..b340ce90f 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -252,10 +252,10 @@ class ObjectPermission(models.Model):
         },
         related_name='object_permissions'
     )
-    attrs = JSONField(
+    constraints = JSONField(
         blank=True,
         null=True,
-        verbose_name='Attributes'
+        help_text="Queryset filter matching the applicable objects of the selected type(s)"
     )
     actions = ArrayField(
         base_field=models.CharField(max_length=30),
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/testcases.py
index 3cf6a9df6..0db0ff936 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/testcases.py
@@ -180,7 +180,7 @@ class ViewTestCases:
 
             # Add object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk': instance1.pk},
+                constraints={'pk': instance1.pk},
                 actions=['view']
             )
             obj_perm.save()
@@ -245,7 +245,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk__gt': 0},  # Dummy permission to allow all
+                constraints={'pk__gt': 0},  # Dummy permission to allow all
                 actions=['add']
             )
             obj_perm.save()
@@ -265,7 +265,7 @@ class ViewTestCases:
             self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
             # Nullify ObjectPermission to disallow new object creation
-            obj_perm.attrs = {'pk': 0}
+            obj_perm.constraints = {'pk': 0}
             obj_perm.save()
 
             # Try to create a non-permitted object
@@ -328,7 +328,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk': instance1.pk},
+                constraints={'pk': instance1.pk},
                 actions=['change']
             )
             obj_perm.save()
@@ -406,7 +406,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk': instance1.pk},
+                constraints={'pk': instance1.pk},
                 actions=['delete']
             )
             obj_perm.save()
@@ -480,7 +480,7 @@ class ViewTestCases:
 
             # Add object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk': instance1.pk},
+                constraints={'pk': instance1.pk},
                 actions=['view']
             )
             obj_perm.save()
@@ -579,7 +579,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk__gt': 0},  # Dummy permission to allow all
+                constraints={'pk__gt': 0},  # Dummy permission to allow all
                 actions=['add']
             )
             obj_perm.save()
@@ -651,7 +651,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk__in': list(pk_list)},
+                constraints={'pk__in': list(pk_list)},
                 actions=['change']
             )
             obj_perm.save()
@@ -718,7 +718,7 @@ class ViewTestCases:
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
-                attrs={'pk__in': list(pk_list)},
+                constraints={'pk__in': list(pk_list)},
                 actions=['delete']
             )
             obj_perm.save()

From 19b57aa1eaa93df5fba86e6b52e40075d7296227 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 10:00:58 -0400
Subject: [PATCH 102/505] Update permissions documentation

---
 docs/administration/permissions.md | 22 +++++++++++-----------
 docs/release-notes/version-2.9.md  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
index 582709726..56ff049ad 100644
--- a/docs/administration/permissions.md
+++ b/docs/administration/permissions.md
@@ -4,12 +4,12 @@ NetBox v2.9 introduced a new object-based permissions framework, which replace's
 
 Assigning a permission in NetBox entails defining a relationship among several components:
 
-* Model(s) - One or more types of object in NetBox
+* Object type(s) - One or more types of object in NetBox
 * User(s) - One or more users or groups of users
 * Actions - The actions that can be performed (view, add, change, and/or delete)
-* Attributes - An arbitrary filter used to limit the action to a specific subset of objects
+* Constraints - An arbitrary filter used to limit the granted action(s) to a specific subset of objects
 
-At a minimum, a permission assignment must specify one model, one user or group, and one action. The specification of constraining attributes is optional: A permission without any attributes specified will apply to all instances of the selected model(s).
+At a minimum, a permission assignment must specify one object type, one user or group, and one action. The specification of constraints is optional: A permission without any constraints specified will apply to all instances of the selected model(s).
 
 ## Actions
 
@@ -22,11 +22,11 @@ There are four core actions that can be permitted for each type of object within
 
 Some models introduce additional permissions that can be granted to allow other actions. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
 
-## Attributes
+## Constraints
 
-Constraining attributes are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
+Constraints are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
 
-All attributes defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following attributes.
+All constraints defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following constraints.
 
 ```json
 {
@@ -35,11 +35,11 @@ All attributes defined on a permission are applied with a logic AND. For example
 }
 ```
 
-The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of attributes, simply create another permission assignment for the same model and user/group. 
+The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of constraints, simply create another permission assignment for the same model and user/group. 
 
-### Example Attribute Definitions
+### Example Constraint Definitions
 
-| Query Filter | Permission Attributes |
+| Query Filter | Permission Constraints |
 | ------------ | --------------------- |
 | `filter(status='active')` | `{"status": "active"}` |
 | `filter(status='active', role='testing')` | `{"status": "active", "role": "testing"}` |
@@ -62,7 +62,7 @@ If the permission has been granted, NetBox will compile any specified constraint
 ]
 ```
 
-This grants the user access to view any device that is in NYC1 or NYC2, **or** which has a status of "offline" and has no tenant assigned. These attributes will result in the following ORM query:
+This grants the user access to view any device that is in NYC1 or NYC2, **or** which has a status of "offline" and has no tenant assigned. These constraints will result in the following ORM query:
 
 ```no-highlight
 Site.objects.filter(
@@ -73,4 +73,4 @@ Site.objects.filter(
 
 ### Creating and Modifying Objects
 
-The same sort of logic is in play when a user attempts to create or modify an object in NetBox, with a twist. Once validation has completed, NetBox starts an atomic database transaction to facilitate the change, and the object is created or saved normally. Next, still within the transaction, NetBox issues a second query to retrieve the newly created/updated object, filtering the restricted queryset with the object's primary key. If this query fails to return the object, NetBox knows that the new revision does not match the attributes granted by the permission. The transaction is then aborted, and the database is left in its original state.
+The same sort of logic is in play when a user attempts to create or modify an object in NetBox, with a twist. Once validation has completed, NetBox starts an atomic database transaction to facilitate the change, and the object is created or saved normally. Next, still within the transaction, NetBox issues a second query to retrieve the newly created/updated object, filtering the restricted queryset with the object's primary key. If this query fails to return the object, NetBox knows that the new revision does not match the constraints imposed by the permission. The transaction is then aborted, and the database is left in its original state.
diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 4fda77838..be6004feb 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,7 +6,7 @@
 
 #### Object-Based Permissions ([#554](https://github.com/netbox-community/netbox/issues/554))
 
-NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of attributes. The permission will apply only to objects which match the specified attributes. For example, assigning permission to modify devices with the attribute filter `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
+NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of constraints. The permission will apply only to objects which match the specified constraints. For example, assigning permission to modify devices with the constraint `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
 
 ### Configuration Changes
 

From 3084d58da1861acbb89f107cdce0953fcb2531eb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 13:08:04 -0400
Subject: [PATCH 103/505] Add REST API endpoint for ObjectPermissions

---
 netbox/netbox/urls.py                  |   1 +
 netbox/netbox/views.py                 |   1 +
 netbox/users/api/nested_serializers.py |  11 +-
 netbox/users/api/serializers.py        |  26 ++++-
 netbox/users/api/urls.py               |  21 ++++
 netbox/users/api/views.py              |  14 +++
 netbox/users/models.py                 |  26 ++---
 netbox/users/tests/test_api.py         | 144 +++++++++++++++++++++++++
 8 files changed, 228 insertions(+), 16 deletions(-)
 create mode 100644 netbox/users/api/urls.py
 create mode 100644 netbox/users/api/views.py
 create mode 100644 netbox/users/tests/test_api.py

diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index d8aa2f9d1..a928b79ea 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -65,6 +65,7 @@ _patterns = [
     path('api/ipam/', include('ipam.api.urls')),
     path('api/secrets/', include('secrets.api.urls')),
     path('api/tenancy/', include('tenancy.api.urls')),
+    path('api/users/', include('users.api.urls')),
     path('api/virtualization/', include('virtualization.api.urls')),
     path('api/docs/', schema_view.with_ui('swagger'), name='api_docs'),
     path('api/redoc/', schema_view.with_ui('redoc'), name='api_redocs'),
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index d6be844d4..7ac5f550b 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -343,5 +343,6 @@ class APIRootView(APIView):
             ('plugins', reverse('plugins-api:api-root', request=request, format=format)),
             ('secrets', reverse('secrets-api:api-root', request=request, format=format)),
             ('tenancy', reverse('tenancy-api:api-root', request=request, format=format)),
+            ('users', reverse('users-api:api-root', request=request, format=format)),
             ('virtualization', reverse('virtualization-api:api-root', request=request, format=format)),
         )))
diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
index d1b649713..f7721cf94 100644
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -1,4 +1,4 @@
-from django.contrib.auth.models import User
+from django.contrib.auth.models import Group, User
 
 from utilities.api import WritableNestedSerializer
 
@@ -8,9 +8,16 @@ _all_ = [
 
 
 #
-# Users
+# Groups and users
 #
 
+class NestedGroupSerializer(WritableNestedSerializer):
+
+    class Meta:
+        model = Group
+        fields = ['id', 'name']
+
+
 class NestedUserSerializer(WritableNestedSerializer):
 
     class Meta:
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index 86d350e69..dc5301846 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -1,4 +1,28 @@
+from django.contrib.contenttypes.models import ContentType
+
+from users.models import ObjectPermission
+from utilities.api import ContentTypeField, SerializedPKRelatedField, ValidatedModelSerializer
 from .nested_serializers import *
 
 
-# Placeholder for future serializers
+class ObjectPermissionSerializer(ValidatedModelSerializer):
+    object_types = ContentTypeField(
+        queryset=ContentType.objects.all(),
+        many=True
+    )
+    groups = SerializedPKRelatedField(
+        queryset=Group.objects.all(),
+        serializer=NestedGroupSerializer,
+        required=False,
+        many=True
+    )
+    users = SerializedPKRelatedField(
+        queryset=User.objects.all(),
+        serializer=NestedUserSerializer,
+        required=False,
+        many=True
+    )
+
+    class Meta:
+        model = ObjectPermission
+        fields = ('id', 'object_types', 'groups', 'users', 'actions', 'constraints')
diff --git a/netbox/users/api/urls.py b/netbox/users/api/urls.py
new file mode 100644
index 000000000..fffea5968
--- /dev/null
+++ b/netbox/users/api/urls.py
@@ -0,0 +1,21 @@
+from rest_framework import routers
+
+from . import views
+
+
+class UsersRootView(routers.APIRootView):
+    """
+    Users API root view
+    """
+    def get_view_name(self):
+        return 'Users'
+
+
+router = routers.DefaultRouter()
+router.APIRootView = UsersRootView
+
+# Permissions
+router.register('permissions', views.ObjectPermissionViewSet)
+
+app_name = 'users-api'
+urlpatterns = router.urls
diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
new file mode 100644
index 000000000..74b315b44
--- /dev/null
+++ b/netbox/users/api/views.py
@@ -0,0 +1,14 @@
+from utilities.api import ModelViewSet
+from . import serializers
+
+from users.models import ObjectPermission
+
+
+#
+# ObjectPermissions
+#
+
+class ObjectPermissionViewSet(ModelViewSet):
+    queryset = ObjectPermission.objects.prefetch_related('object_types', 'groups', 'users')
+    serializer_class = serializers.ObjectPermissionSerializer
+    # filterset_class = filters.ObjectPermissionFilterSet
diff --git a/netbox/users/models.py b/netbox/users/models.py
index b340ce90f..fa3277456 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -233,16 +233,6 @@ class ObjectPermission(models.Model):
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
     identified by ORM query parameters.
     """
-    users = models.ManyToManyField(
-        to=User,
-        blank=True,
-        related_name='object_permissions'
-    )
-    groups = models.ManyToManyField(
-        to=Group,
-        blank=True,
-        related_name='object_permissions'
-    )
     object_types = models.ManyToManyField(
         to=ContentType,
         limit_choices_to={
@@ -252,15 +242,25 @@ class ObjectPermission(models.Model):
         },
         related_name='object_permissions'
     )
-    constraints = JSONField(
+    groups = models.ManyToManyField(
+        to=Group,
         blank=True,
-        null=True,
-        help_text="Queryset filter matching the applicable objects of the selected type(s)"
+        related_name='object_permissions'
+    )
+    users = models.ManyToManyField(
+        to=User,
+        blank=True,
+        related_name='object_permissions'
     )
     actions = ArrayField(
         base_field=models.CharField(max_length=30),
         help_text="The list of actions granted by this permission"
     )
+    constraints = JSONField(
+        blank=True,
+        null=True,
+        help_text="Queryset filter matching the applicable objects of the selected type(s)"
+    )
 
     class Meta:
         verbose_name = "Permission"
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
new file mode 100644
index 000000000..f507192ee
--- /dev/null
+++ b/netbox/users/tests/test_api.py
@@ -0,0 +1,144 @@
+from django.contrib.auth.models import Group, User
+from django.contrib.contenttypes.models import ContentType
+from django.urls import reverse
+from rest_framework import status
+
+from users.models import ObjectPermission
+from utilities.testing import APITestCase
+
+
+class AppTest(APITestCase):
+
+    def test_root(self):
+
+        url = reverse('users-api:api-root')
+        response = self.client.get('{}?format=api'.format(url), **self.header)
+
+        self.assertEqual(response.status_code, 200)
+
+
+class ObjectPermissionTest(APITestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+
+        groups = (
+            Group(name='Group 1'),
+            Group(name='Group 2'),
+            Group(name='Group 3'),
+        )
+        Group.objects.bulk_create(groups)
+
+        users = (
+            User(username='User 1', is_active=True),
+            User(username='User 2', is_active=True),
+            User(username='User 3', is_active=True),
+        )
+        User.objects.bulk_create(users)
+
+        object_type = ContentType.objects.get(app_label='dcim', model='device')
+
+        for i in range(0, 3):
+            objectpermission = ObjectPermission(
+                actions=['view', 'add', 'change', 'delete'],
+                constraints={'name': f'TEST{i+1}'}
+            )
+            objectpermission.save()
+            objectpermission.object_types.add(object_type)
+            objectpermission.groups.add(groups[i])
+            objectpermission.users.add(users[i])
+
+    def test_get_objectpermission(self):
+        objectpermission = ObjectPermission.objects.first()
+        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
+        response = self.client.get(url, **self.header)
+
+        self.assertEqual(response.data['id'], objectpermission.pk)
+
+    def test_list_objectpermissions(self):
+        url = reverse('users-api:objectpermission-list')
+        response = self.client.get(url, **self.header)
+
+        self.assertEqual(response.data['count'], ObjectPermission.objects.count())
+
+    def test_create_objectpermission(self):
+        data = {
+            'object_types': ['dcim.site'],
+            'groups': [Group.objects.first().pk],
+            'users': [User.objects.first().pk],
+            'actions': ['view', 'add', 'change', 'delete'],
+            'constraints': {'name': 'TEST4'},
+        }
+
+        url = reverse('users-api:objectpermission-list')
+        response = self.client.post(url, data, format='json', **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_201_CREATED)
+        self.assertEqual(ObjectPermission.objects.count(), 4)
+        objectpermission = ObjectPermission.objects.get(pk=response.data['id'])
+        self.assertEqual(objectpermission.groups.first().pk, data['groups'][0])
+        self.assertEqual(objectpermission.users.first().pk, data['users'][0])
+        self.assertEqual(objectpermission.actions, data['actions'])
+        self.assertEqual(objectpermission.constraints, data['constraints'])
+
+    def test_create_objectpermission_bulk(self):
+        groups = Group.objects.all()[:3]
+        users = User.objects.all()[:3]
+        data = [
+            {
+                'object_types': ['dcim.site'],
+                'groups': [groups[0].pk],
+                'users': [users[0].pk],
+                'actions': ['view', 'add', 'change', 'delete'],
+                'constraints': {'name': 'TEST4'},
+            },
+            {
+                'object_types': ['dcim.site'],
+                'groups': [groups[1].pk],
+                'users': [users[1].pk],
+                'actions': ['view', 'add', 'change', 'delete'],
+                'constraints': {'name': 'TEST5'},
+            },
+            {
+                'object_types': ['dcim.site'],
+                'groups': [groups[2].pk],
+                'users': [users[2].pk],
+                'actions': ['view', 'add', 'change', 'delete'],
+                'constraints': {'name': 'TEST6'},
+            },
+        ]
+
+        url = reverse('users-api:objectpermission-list')
+        response = self.client.post(url, data, format='json', **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_201_CREATED)
+        self.assertEqual(ObjectPermission.objects.count(), 6)
+
+    def test_update_objectpermission(self):
+        objectpermission = ObjectPermission.objects.first()
+        data = {
+            'object_types': ['dcim.site', 'dcim.device'],
+            'groups': [g.pk for g in Group.objects.all()[:2]],
+            'users': [u.pk for u in User.objects.all()[:2]],
+            'actions': ['view'],
+            'constraints': {'name': 'TEST'},
+        }
+
+        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
+        response = self.client.put(url, data, format='json', **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_200_OK)
+        self.assertEqual(ObjectPermission.objects.count(), 3)
+        objectpermission = ObjectPermission.objects.get(pk=response.data['id'])
+        self.assertEqual(objectpermission.groups.first().pk, data['groups'][0])
+        self.assertEqual(objectpermission.users.first().pk, data['users'][0])
+        self.assertEqual(objectpermission.actions, data['actions'])
+        self.assertEqual(objectpermission.constraints, data['constraints'])
+
+    def test_delete_objectpermission(self):
+        objectpermission = ObjectPermission.objects.first()
+        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
+        response = self.client.delete(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
+        self.assertEqual(ObjectPermission.objects.count(), 2)

From dbf6c0a075a0a92b3d42922baa1fce6f60e71360 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 13:20:35 -0400
Subject: [PATCH 104/505] Split ObjectPermission model documentation

---
 docs/administration/permissions.md    | 35 +-------------------------
 docs/models/users/objectpermission.md | 36 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 docs/models/users/objectpermission.md

diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
index 56ff049ad..7e47db0d9 100644
--- a/docs/administration/permissions.md
+++ b/docs/administration/permissions.md
@@ -2,40 +2,7 @@
 
 NetBox v2.9 introduced a new object-based permissions framework, which replace's Django's built-in permission model. Object-based permissions allow for the assignment of permissions to an arbitrary subset of objects of a certain type, rather than only by type of object. For example, it is possible to grant a user permission to view only sites within a particular region, or to modify only VLANs with a numeric ID within a certain range.
 
-Assigning a permission in NetBox entails defining a relationship among several components:
-
-* Object type(s) - One or more types of object in NetBox
-* User(s) - One or more users or groups of users
-* Actions - The actions that can be performed (view, add, change, and/or delete)
-* Constraints - An arbitrary filter used to limit the granted action(s) to a specific subset of objects
-
-At a minimum, a permission assignment must specify one object type, one user or group, and one action. The specification of constraints is optional: A permission without any constraints specified will apply to all instances of the selected model(s).
-
-## Actions
-
-There are four core actions that can be permitted for each type of object within NetBox, roughly analogous to the CRUD convention (create, read, update, and delete):
-
-* View - Retrieve an object from the database
-* Add - Create a new object
-* Change - Modify an existing object
-* Delete - Delete an existing object
-
-Some models introduce additional permissions that can be granted to allow other actions. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
-
-## Constraints
-
-Constraints are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
-
-All constraints defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following constraints.
-
-```json
-{
-  "status": "active",
-  "region__name": "Americas"
-}
-```
-
-The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of constraints, simply create another permission assignment for the same model and user/group. 
+{!docs/models/users/objectpermission.md!}
 
 ### Example Constraint Definitions
 
diff --git a/docs/models/users/objectpermission.md b/docs/models/users/objectpermission.md
new file mode 100644
index 000000000..80313fc0b
--- /dev/null
+++ b/docs/models/users/objectpermission.md
@@ -0,0 +1,36 @@
+# Object Permissions
+
+Assigning a permission in NetBox entails defining a relationship among several components:
+
+* Object type(s) - One or more types of object in NetBox
+* User(s) - One or more users or groups of users
+* Actions - The actions that can be performed (view, add, change, and/or delete)
+* Constraints - An arbitrary filter used to limit the granted action(s) to a specific subset of objects
+
+At a minimum, a permission assignment must specify one object type, one user or group, and one action. The specification of constraints is optional: A permission without any constraints specified will apply to all instances of the selected model(s).
+
+## Actions
+
+There are four core actions that can be permitted for each type of object within NetBox, roughly analogous to the CRUD convention (create, read, update, and delete):
+
+* View - Retrieve an object from the database
+* Add - Create a new object
+* Change - Modify an existing object
+* Delete - Delete an existing object
+
+Some models introduce additional permissions that can be granted to allow other actions. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
+
+## Constraints
+
+Constraints are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
+
+All constraints defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following constraints.
+
+```json
+{
+  "status": "active",
+  "region__name": "Americas"
+}
+```
+
+The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of constraints, simply create another permission assignment for the same model and user/group. 

From b31cc89478414608fa76b32d0ecdf0690516c4f2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 14:13:18 -0400
Subject: [PATCH 105/505] Dropped backward compatibility for 'webhooks' Redis
 queue

---
 docs/release-notes/version-2.9.md |  1 +
 netbox/netbox/settings.py         | 17 ++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index be6004feb..31dc0be02 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -16,3 +16,4 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 * The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.
 * The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
+* Backward compatibility for the `webhooks` Redis queue configuration has been dropped. (Use `tasks` instead.)
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 692382262..eb9fab57a 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -195,19 +195,11 @@ if STORAGE_CONFIG and STORAGE_BACKEND is None:
 #
 
 # Background task queuing
-if 'tasks' in REDIS:
-    TASKS_REDIS = REDIS['tasks']
-elif 'webhooks' in REDIS:
-    # TODO: Remove support for 'webhooks' name in v2.9
-    warnings.warn(
-        "The 'webhooks' REDIS configuration section has been renamed to 'tasks'. Please update your configuration as "
-        "support for the old name will be removed in a future release."
-    )
-    TASKS_REDIS = REDIS['webhooks']
-else:
+if 'tasks' not in REDIS:
     raise ImproperlyConfigured(
         "REDIS section in configuration.py is missing the 'tasks' subsection."
     )
+TASKS_REDIS = REDIS['tasks']
 TASKS_REDIS_HOST = TASKS_REDIS.get('HOST', 'localhost')
 TASKS_REDIS_PORT = TASKS_REDIS.get('PORT', 6379)
 TASKS_REDIS_SENTINELS = TASKS_REDIS.get('SENTINELS', [])
@@ -222,12 +214,11 @@ TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get('DEFAULT_TIMEOUT', 300)
 TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
 
 # Caching
-if 'caching' in REDIS:
-    CACHING_REDIS = REDIS['caching']
-else:
+if 'caching' not in REDIS:
     raise ImproperlyConfigured(
         "REDIS section in configuration.py is missing caching subsection."
     )
+CACHING_REDIS = REDIS['caching']
 CACHING_REDIS_HOST = CACHING_REDIS.get('HOST', 'localhost')
 CACHING_REDIS_PORT = CACHING_REDIS.get('PORT', 6379)
 CACHING_REDIS_SENTINELS = CACHING_REDIS.get('SENTINELS', [])

From bb1484a444f7a040dc5d3998aedc80521b4ec99b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 14:15:29 -0400
Subject: [PATCH 106/505] Dropped backward compatibility for the
 /admin/webhook-backend-status URL

---
 docs/release-notes/version-2.9.md |  3 ++-
 netbox/netbox/urls.py             | 16 +---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 31dc0be02..7c63af51c 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -16,4 +16,5 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 * The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.
 * The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
-* Backward compatibility for the `webhooks` Redis queue configuration has been dropped. (Use `tasks` instead.)
+* Dropped backward compatibility for the `webhooks` Redis queue configuration (use `tasks` instead).
+* Dropped backward compatibility for the `/admin/webhook-backend-status` URL (moved to `/admin/background-tasks/`).
diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index a928b79ea..4878729b0 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -1,7 +1,6 @@
 from django.conf import settings
 from django.conf.urls import include
-from django.urls import path, re_path, reverse
-from django.views.generic.base import RedirectView
+from django.urls import path, re_path
 from django.views.static import serve
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
@@ -12,17 +11,6 @@ from users.views import LoginView, LogoutView
 from .admin import admin_site
 
 
-# TODO: Remove in v2.9
-class RQRedirectView(RedirectView):
-    """
-    Temporary 301 redirect from the old URL to the new one.
-    """
-    permanent = True
-
-    def get_redirect_url(self, *args, **kwargs):
-        return reverse('rq_home')
-
-
 openapi_info = openapi.Info(
     title="NetBox API",
     default_version='v2',
@@ -77,8 +65,6 @@ _patterns = [
     # Admin
     path('admin/', admin_site.urls),
     path('admin/background-tasks/', include('django_rq.urls')),
-    # TODO: Remove in v2.9
-    path('admin/webhook-backend-status/', RQRedirectView.as_view()),
 
     # Errors
     path('media-failure/', StaticMediaFailureView.as_view(), name='media_failure'),

From 040fadb0c300b9675bcec17832da4cdb4ed40f40 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 15:42:24 -0400
Subject: [PATCH 107/505] Move LDAP authentication support to LDAPBackend

---
 netbox/netbox/authentication.py | 48 +++++++++++++++++++++++
 netbox/netbox/settings.py       | 69 ---------------------------------
 2 files changed, 48 insertions(+), 69 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 02b0be0f3..10d2d1b09 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -3,6 +3,7 @@ import logging
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
 from django.contrib.auth.models import Group
+from django.core.exceptions import ImproperlyConfigured
 from django.db.models import Q
 
 from users.models import ObjectPermission
@@ -132,3 +133,50 @@ class RemoteUserBackend(_RemoteUserBackend):
 
     def has_perm(self, user_obj, perm, obj=None):
         return False
+
+
+class LDAPBackend:
+
+    def __new__(cls, *args, **kwargs):
+        try:
+            import ldap
+            from django_auth_ldap.backend import LDAPBackend as LDAPBackend_, LDAPSettings
+        except ImportError:
+            raise ImproperlyConfigured(
+                "LDAP authentication has been configured, but django-auth-ldap is not installed."
+            )
+
+        try:
+            from netbox import ldap_config
+        except ImportError:
+            raise ImproperlyConfigured(
+                "ldap_config.py does not exist"
+            )
+
+        try:
+            getattr(ldap_config, 'AUTH_LDAP_SERVER_URI')
+        except AttributeError:
+            raise ImproperlyConfigured(
+                "Required parameter AUTH_LDAP_SERVER_URI is missing from ldap_config.py."
+            )
+
+        # Create a new instance of django-auth-ldap's LDAPBackend
+        obj = LDAPBackend_()
+
+        # Read LDAP configuration parameters from ldap_config.py instead of settings.py
+        settings = LDAPSettings()
+        for param in dir(ldap_config):
+            if param.startswith(settings._prefix):
+                setattr(settings, param[10:], getattr(ldap_config, param))
+        obj.settings = settings
+
+        # Optionally disable strict certificate checking
+        if getattr(ldap_config, 'LDAP_IGNORE_CERT_ERRORS', False):
+            ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
+
+        # Enable logging for django_auth_ldap
+        ldap_logger = logging.getLogger('django_auth_ldap')
+        ldap_logger.addHandler(logging.StreamHandler())
+        ldap_logger.setLevel(logging.DEBUG)
+
+        return obj
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index eb9fab57a..bc1a8c2e7 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -378,75 +378,6 @@ LOGIN_URL = '/{}login/'.format(BASE_PATH)
 
 CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
-
-#
-# LDAP authentication (optional)
-#
-
-try:
-    from netbox import ldap_config as LDAP_CONFIG
-except ImportError:
-    LDAP_CONFIG = None
-
-if LDAP_CONFIG is not None:
-
-    # Check that django_auth_ldap is installed
-    try:
-        import ldap
-        import django_auth_ldap
-    except ImportError:
-        raise ImproperlyConfigured(
-            "LDAP authentication has been configured, but django-auth-ldap is not installed. Remove "
-            "netbox/ldap_config.py to disable LDAP."
-        )
-
-    # Required configuration parameters
-    try:
-        AUTH_LDAP_SERVER_URI = getattr(LDAP_CONFIG, 'AUTH_LDAP_SERVER_URI')
-    except AttributeError:
-        raise ImproperlyConfigured(
-            "Required parameter AUTH_LDAP_SERVER_URI is missing from ldap_config.py."
-        )
-
-    # Optional configuration parameters
-    AUTH_LDAP_ALWAYS_UPDATE_USER = getattr(LDAP_CONFIG, 'AUTH_LDAP_ALWAYS_UPDATE_USER', True)
-    AUTH_LDAP_AUTHORIZE_ALL_USERS = getattr(LDAP_CONFIG, 'AUTH_LDAP_AUTHORIZE_ALL_USERS', False)
-    AUTH_LDAP_BIND_AS_AUTHENTICATING_USER = getattr(LDAP_CONFIG, 'AUTH_LDAP_BIND_AS_AUTHENTICATING_USER', False)
-    AUTH_LDAP_BIND_DN = getattr(LDAP_CONFIG, 'AUTH_LDAP_BIND_DN', '')
-    AUTH_LDAP_BIND_PASSWORD = getattr(LDAP_CONFIG, 'AUTH_LDAP_BIND_PASSWORD', '')
-    AUTH_LDAP_CACHE_TIMEOUT = getattr(LDAP_CONFIG, 'AUTH_LDAP_CACHE_TIMEOUT', 0)
-    AUTH_LDAP_CONNECTION_OPTIONS = getattr(LDAP_CONFIG, 'AUTH_LDAP_CONNECTION_OPTIONS', {})
-    AUTH_LDAP_DENY_GROUP = getattr(LDAP_CONFIG, 'AUTH_LDAP_DENY_GROUP', None)
-    AUTH_LDAP_FIND_GROUP_PERMS = getattr(LDAP_CONFIG, 'AUTH_LDAP_FIND_GROUP_PERMS', False)
-    AUTH_LDAP_GLOBAL_OPTIONS = getattr(LDAP_CONFIG, 'AUTH_LDAP_GLOBAL_OPTIONS', {})
-    AUTH_LDAP_GROUP_SEARCH = getattr(LDAP_CONFIG, 'AUTH_LDAP_GROUP_SEARCH', None)
-    AUTH_LDAP_GROUP_TYPE = getattr(LDAP_CONFIG, 'AUTH_LDAP_GROUP_TYPE', None)
-    AUTH_LDAP_MIRROR_GROUPS = getattr(LDAP_CONFIG, 'AUTH_LDAP_MIRROR_GROUPS', None)
-    AUTH_LDAP_MIRROR_GROUPS_EXCEPT = getattr(LDAP_CONFIG, 'AUTH_LDAP_MIRROR_GROUPS_EXCEPT', None)
-    AUTH_LDAP_PERMIT_EMPTY_PASSWORD = getattr(LDAP_CONFIG, 'AUTH_LDAP_PERMIT_EMPTY_PASSWORD', False)
-    AUTH_LDAP_REQUIRE_GROUP = getattr(LDAP_CONFIG, 'AUTH_LDAP_REQUIRE_GROUP', None)
-    AUTH_LDAP_NO_NEW_USERS = getattr(LDAP_CONFIG, 'AUTH_LDAP_NO_NEW_USERS', False)
-    AUTH_LDAP_START_TLS = getattr(LDAP_CONFIG, 'AUTH_LDAP_START_TLS', False)
-    AUTH_LDAP_USER_QUERY_FIELD = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_QUERY_FIELD', None)
-    AUTH_LDAP_USER_ATTRLIST = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_ATTRLIST', None)
-    AUTH_LDAP_USER_ATTR_MAP = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_ATTR_MAP', {})
-    AUTH_LDAP_USER_DN_TEMPLATE = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_DN_TEMPLATE', None)
-    AUTH_LDAP_USER_FLAGS_BY_GROUP = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_FLAGS_BY_GROUP', {})
-    AUTH_LDAP_USER_SEARCH = getattr(LDAP_CONFIG, 'AUTH_LDAP_USER_SEARCH', None)
-
-    # Optionally disable strict certificate checking
-    if getattr(LDAP_CONFIG, 'LDAP_IGNORE_CERT_ERRORS', False):
-        ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
-
-    # Prepend LDAPBackend to the authentication backends list
-    AUTHENTICATION_BACKENDS.insert(0, 'django_auth_ldap.backend.LDAPBackend')
-
-    # Enable logging for django_auth_ldap
-    ldap_logger = logging.getLogger('django_auth_ldap')
-    ldap_logger.addHandler(logging.StreamHandler())
-    ldap_logger.setLevel(logging.DEBUG)
-
-
 #
 # Caching
 #

From dc161d9f2f260e8bae77b3925ee9b023e7acd25b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 3 Jun 2020 15:57:11 -0400
Subject: [PATCH 108/505] Update LDAP configuration documentation

---
 docs/configuration/optional-settings.md |  5 ++++-
 docs/installation/5-ldap.md             | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 31ee39a5f..9fddbe82a 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -386,7 +386,10 @@ NetBox can be configured to support remote user authentication by inferring user
 
 Default: `'netbox.authentication.RemoteUserBackend'`
 
-Python path to the custom [Django authentication backend](https://docs.djangoproject.com/en/stable/topics/auth/customizing/) to use for external user authentication, if not using NetBox's built-in backend. (Requires `REMOTE_AUTH_ENABLED`.)
+Python path to the custom [Django authentication backend](https://docs.djangoproject.com/en/stable/topics/auth/customizing/) to use for external user authentication. NetBox provides two built-in backends (listed below), though backends may also be provided via other packages.
+
+* `netbox.authentication.RemoteUserBackend`
+* `netbox.authentication.LDAPBackend`
 
 ---
 
diff --git a/docs/installation/5-ldap.md b/docs/installation/5-ldap.md
index 2fd88b841..bb1300c08 100644
--- a/docs/installation/5-ldap.md
+++ b/docs/installation/5-ldap.md
@@ -36,7 +36,13 @@ Once installed, add the package to `local_requirements.txt` to ensure it is re-i
 
 ## Configuration
 
-Create a file in the same directory as `configuration.py` (typically `netbox/netbox/`) named `ldap_config.py`. Define all of the parameters required below in `ldap_config.py`. Complete documentation of all `django-auth-ldap` configuration options is included in the project's [official documentation](http://django-auth-ldap.readthedocs.io/).
+First, enable the LDAP authentication backend in `configuration.py`. (Be sure to overwrite this definition if it is already set to `RemoteUserBackend`.)
+
+```python
+REMOTE_AUTH_BACKEND = 'netbox.authentication.LDAPBackend'
+```
+
+Next, create a file in the same directory as `configuration.py` (typically `netbox/netbox/`) named `ldap_config.py`. Define all of the parameters required below in `ldap_config.py`. Complete documentation of all `django-auth-ldap` configuration options is included in the project's [official documentation](http://django-auth-ldap.readthedocs.io/).
 
 ### General Server Configuration
 
@@ -145,7 +151,8 @@ logfile = "/opt/netbox/logs/django-ldap-debug.log"
 my_logger = logging.getLogger('django_auth_ldap')
 my_logger.setLevel(logging.DEBUG)
 handler = logging.handlers.RotatingFileHandler(
-   logfile, maxBytes=1024 * 500, backupCount=5)
+    logfile, maxBytes=1024 * 500, backupCount=5
+)
 my_logger.addHandler(handler)
 ```
 

From cde1db443673036d407a6ff9ea68eb585d0924b7 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Thu, 4 Jun 2020 16:44:25 -0400
Subject: [PATCH 109/505] Add `label` to interface models

---
 .../dcim/migrations/0107_interface_label.py   | 23 +++++++++++++++++++
 .../dcim/models/device_component_templates.py |  5 ++++
 netbox/dcim/models/device_components.py       |  5 ++++
 3 files changed, 33 insertions(+)
 create mode 100644 netbox/dcim/migrations/0107_interface_label.py

diff --git a/netbox/dcim/migrations/0107_interface_label.py b/netbox/dcim/migrations/0107_interface_label.py
new file mode 100644
index 000000000..48970d25d
--- /dev/null
+++ b/netbox/dcim/migrations/0107_interface_label.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.7 on 2020-06-04 20:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0106_role_default_color'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='interface',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='interfacetemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+    ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 164d37d77..1a9e7bbf9 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -263,6 +263,11 @@ class InterfaceTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this interface"
+    )
     type = models.CharField(
         max_length=50,
         choices=InterfaceTypeChoices
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 4005d41a4..e5c2e5936 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -605,6 +605,11 @@ class Interface(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this interface"
+    )
     _connected_interface = models.OneToOneField(
         to='self',
         on_delete=models.SET_NULL,

From e9f8640ee680e6eacf49a1ad0523bde1055dd86c Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Thu, 4 Jun 2020 16:50:51 -0400
Subject: [PATCH 110/505] Add `label` to Interface serializers

---
 netbox/dcim/api/serializers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 9ac58dc3a..e8bc57d1d 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -304,7 +304,7 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'mgmt_only']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'mgmt_only']
 
 
 class RearPortTemplateSerializer(ValidatedModelSerializer):
@@ -536,7 +536,7 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = Interface
         fields = [
-            'id', 'device', 'name', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
+            'id', 'device', 'name', 'label', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
             'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan',
             'tagged_vlans', 'tags', 'count_ipaddresses',
         ]

From f8851121abd26eaa2a761c04375d95f76b666acb Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Thu, 4 Jun 2020 17:11:27 -0400
Subject: [PATCH 111/505] Add the `label` to the string representation

---
 netbox/dcim/models/device_component_templates.py | 2 ++
 netbox/dcim/models/device_components.py          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 1a9e7bbf9..f61c3f057 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -282,6 +282,8 @@ class InterfaceTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def instantiate(self, device):
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index e5c2e5936..9d9e79196 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -691,6 +691,8 @@ class Interface(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def get_absolute_url(self):

From a06d74472da1c4ffbcb8e3fc23b9b8f62af079f0 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Fri, 5 Jun 2020 10:32:59 -0400
Subject: [PATCH 112/505] Add `label` to *ports models

---
 netbox/dcim/migrations/0108_port_label.py     | 53 +++++++++++++++++++
 .../dcim/models/device_component_templates.py | 20 +++++++
 netbox/dcim/models/device_components.py       | 20 +++++++
 3 files changed, 93 insertions(+)
 create mode 100644 netbox/dcim/migrations/0108_port_label.py

diff --git a/netbox/dcim/migrations/0108_port_label.py b/netbox/dcim/migrations/0108_port_label.py
new file mode 100644
index 000000000..af0aa1962
--- /dev/null
+++ b/netbox/dcim/migrations/0108_port_label.py
@@ -0,0 +1,53 @@
+# Generated by Django 3.0.7 on 2020-06-05 14:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0107_interface_label'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='consoleport',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='consoleporttemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='consoleserverport',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='consoleserverporttemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='poweroutlet',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='poweroutlettemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='powerport',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='powerporttemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+    ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index f61c3f057..b7f94a450 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -69,6 +69,11 @@ class ConsolePortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this console port"
+    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -107,6 +112,11 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this console server port"
+    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -145,6 +155,11 @@ class PowerPortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this power supply port"
+    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -197,6 +212,11 @@ class PowerOutletTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this power outlet"
+    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 9d9e79196..860e1bd65 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -231,6 +231,11 @@ class ConsolePort(CableTermination, ComponentModel):
     name = models.CharField(
         max_length=50
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this console port"
+    )
     _name = NaturalOrderingField(
         target_field='name',
         max_length=100,
@@ -298,6 +303,11 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this console server port"
+    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -353,6 +363,11 @@ class PowerPort(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this power supply port"
+    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -516,6 +531,11 @@ class PowerOutlet(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="The physical label for this power outlet"
+    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,

From 1fae9aff0c90d5217309263388ed02925435d4f2 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Fri, 5 Jun 2020 10:42:13 -0400
Subject: [PATCH 113/505] Add `label` to *port serializers

---
 netbox/dcim/api/serializers.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index e8bc57d1d..a2f576aca 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -248,7 +248,7 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsolePortTemplate
-        fields = ['id', 'device_type', 'name', 'type']
+        fields = ['id', 'device_type', 'name', 'label', 'type']
 
 
 class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
@@ -261,7 +261,7 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
-        fields = ['id', 'device_type', 'name', 'type']
+        fields = ['id', 'device_type', 'name', 'label',  'type']
 
 
 class PowerPortTemplateSerializer(ValidatedModelSerializer):
@@ -274,7 +274,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'maximum_draw', 'allocated_draw']
+        fields = ['id', 'device_type', 'name', 'label',  'type', 'maximum_draw', 'allocated_draw']
 
 
 class PowerOutletTemplateSerializer(ValidatedModelSerializer):
@@ -295,7 +295,7 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'power_port', 'feed_leg']
+        fields = ['id', 'device_type', 'name', 'label',  'type', 'power_port', 'feed_leg']
 
 
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
@@ -446,7 +446,7 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer)
     class Meta:
         model = ConsoleServerPort
         fields = [
-            'id', 'device', 'name', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
+            'id', 'device', 'name', 'label',  'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
             'connection_status', 'cable', 'tags',
         ]
 
@@ -464,7 +464,7 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = ConsolePort
         fields = [
-            'id', 'device', 'name', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
+            'id', 'device', 'name', 'label',  'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
             'connection_status', 'cable', 'tags',
         ]
 
@@ -494,7 +494,7 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = PowerOutlet
         fields = [
-            'id', 'device', 'name', 'type', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type',
+            'id', 'device', 'name', 'label',  'type', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type',
             'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
@@ -512,7 +512,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = PowerPort
         fields = [
-            'id', 'device', 'name', 'type', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
+            'id', 'device', 'name', 'label',  'type', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
             'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 

From e21cbf2a0667e2d014740a1bfef06a056c238a40 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Fri, 5 Jun 2020 11:01:39 -0400
Subject: [PATCH 114/505] Add the `label` to the string representation

---
 netbox/dcim/models/device_component_templates.py | 8 ++++++++
 netbox/dcim/models/device_components.py          | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index b7f94a450..acb5f0d46 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -85,6 +85,8 @@ class ConsolePortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def instantiate(self, device):
@@ -128,6 +130,8 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def instantiate(self, device):
@@ -183,6 +187,8 @@ class PowerPortTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def instantiate(self, device):
@@ -241,6 +247,8 @@ class PowerOutletTemplate(ComponentTemplateModel):
         unique_together = ('device_type', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def clean(self):
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 860e1bd65..b8331365d 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -267,6 +267,8 @@ class ConsolePort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def get_absolute_url(self):
@@ -327,6 +329,8 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def get_absolute_url(self):
@@ -413,6 +417,8 @@ class PowerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def get_absolute_url(self):
@@ -568,6 +574,8 @@ class PowerOutlet(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
         return self.name
 
     def get_absolute_url(self):

From d65cead212dc781a6dbbe35ea15eea7b75023da9 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Fri, 5 Jun 2020 12:34:09 -0400
Subject: [PATCH 115/505] Return an empty list if value is None

---
 netbox/utilities/forms.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 979b6ac32..3d8dbe33f 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -530,6 +530,8 @@ class ExpandableNameField(forms.CharField):
                 """
 
     def to_python(self, value):
+        if value is None:
+            return list()
         if re.search(ALPHANUMERIC_EXPANSION_PATTERN, value):
             return list(expand_alphanumeric_pattern(value))
         return [value]

From 286a3e6ca296609201d3f02892a3d50c338b9f78 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Fri, 5 Jun 2020 13:59:59 -0400
Subject: [PATCH 116/505] Add `label` to forms, views and templates

---
 netbox/dcim/forms.py                      | 200 ++++++++++++++++++++--
 netbox/templates/dcim/interface.html      |   4 +
 netbox/templates/dcim/interface_edit.html |   1 +
 netbox/utilities/views.py                 |  19 +-
 4 files changed, 207 insertions(+), 17 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 94cf51fcd..0e9d9763e 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1032,7 +1032,7 @@ class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = ConsolePortTemplate
         fields = [
-            'device_type', 'name', 'type',
+            'device_type', 'name', 'label', 'type',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1046,11 +1046,27 @@ class ConsolePortTemplateCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1072,7 +1088,7 @@ class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = ConsoleServerPortTemplate
         fields = [
-            'device_type', 'name', 'type',
+            'device_type', 'name', 'label', 'type',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1086,11 +1102,27 @@ class ConsoleServerPortTemplateCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1112,7 +1144,7 @@ class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = PowerPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'maximum_draw', 'allocated_draw',
+            'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1126,6 +1158,10 @@ class PowerPortTemplateCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerPortTypeChoices),
         required=False
@@ -1141,6 +1177,18 @@ class PowerPortTemplateCreateForm(BootstrapMixin, forms.Form):
         help_text="Allocated power draw (watts)"
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1172,7 +1220,7 @@ class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = PowerOutletTemplate
         fields = [
-            'device_type', 'name', 'type', 'power_port', 'feed_leg',
+            'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1196,6 +1244,10 @@ class PowerOutletTemplateCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerOutletTypeChoices),
         required=False
@@ -1221,6 +1273,18 @@ class PowerOutletTemplateCreateForm(BootstrapMixin, forms.Form):
             device_type=device_type
         )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1247,7 +1311,7 @@ class InterfaceTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = InterfaceTemplate
         fields = [
-            'device_type', 'name', 'type', 'mgmt_only',
+            'device_type', 'name', 'label', 'type', 'mgmt_only',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1262,6 +1326,10 @@ class InterfaceTemplateCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=InterfaceTypeChoices,
         widget=StaticSelect2()
@@ -1271,6 +1339,18 @@ class InterfaceTemplateCreateForm(BootstrapMixin, forms.Form):
         label='Management only'
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} interfaces, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1504,7 +1584,7 @@ class ConsolePortTemplateImportForm(ComponentTemplateImportForm):
     class Meta:
         model = ConsolePortTemplate
         fields = [
-            'device_type', 'name', 'type',
+            'device_type', 'name', 'label', 'type',
         ]
 
 
@@ -1513,7 +1593,7 @@ class ConsoleServerPortTemplateImportForm(ComponentTemplateImportForm):
     class Meta:
         model = ConsoleServerPortTemplate
         fields = [
-            'device_type', 'name', 'type',
+            'device_type', 'name', 'label', 'type',
         ]
 
 
@@ -1522,7 +1602,7 @@ class PowerPortTemplateImportForm(ComponentTemplateImportForm):
     class Meta:
         model = PowerPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'maximum_draw', 'allocated_draw',
+            'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw',
         ]
 
 
@@ -1536,7 +1616,7 @@ class PowerOutletTemplateImportForm(ComponentTemplateImportForm):
     class Meta:
         model = PowerOutletTemplate
         fields = [
-            'device_type', 'name', 'type', 'power_port', 'feed_leg',
+            'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg',
         ]
 
 
@@ -1548,7 +1628,7 @@ class InterfaceTemplateImportForm(ComponentTemplateImportForm):
     class Meta:
         model = InterfaceTemplate
         fields = [
-            'device_type', 'name', 'type', 'mgmt_only',
+            'device_type', 'name', 'label', 'type', 'mgmt_only',
         ]
 
 
@@ -2199,12 +2279,28 @@ class DeviceBulkAddComponentForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
 
     def clean_tags(self):
         # Because we're feeding TagField data (on the bulk edit form) to another TagField (on the model form), we
         # must first convert the list of tags to a string.
         return ','.join(self.cleaned_data.get('tags'))
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} {}}, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, self.type, label_pattern_count)
+            })
+
 
 #
 # Console ports
@@ -2229,7 +2325,7 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = ConsolePort
         fields = [
-            'device', 'name', 'type', 'description', 'tags',
+            'device', 'name', 'label', 'type', 'description', 'tags',
         ]
         widgets = {
             'device': forms.HiddenInput(),
@@ -2243,6 +2339,10 @@ class ConsolePortCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -2256,6 +2356,18 @@ class ConsolePortCreateForm(BootstrapMixin, forms.Form):
         required=False
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class ConsolePortBulkCreateForm(
     form_from_model(ConsolePort, ['type', 'description', 'tags']),
@@ -2329,6 +2441,10 @@ class ConsoleServerPortCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -2342,6 +2458,18 @@ class ConsoleServerPortCreateForm(BootstrapMixin, forms.Form):
         required=False
     )
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class ConsoleServerPortBulkCreateForm(
     form_from_model(ConsoleServerPort, ['type', 'description', 'tags']),
@@ -2429,6 +2557,10 @@ class PowerPortCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerPortTypeChoices),
         required=False,
@@ -2451,6 +2583,17 @@ class PowerPortCreateForm(BootstrapMixin, forms.Form):
     tags = TagField(
         required=False
     )
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
 
 
 class PowerPortBulkCreateForm(
@@ -2538,6 +2681,10 @@ class PowerOutletCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerOutletTypeChoices),
         required=False,
@@ -2568,6 +2715,18 @@ class PowerOutletCreateForm(BootstrapMixin, forms.Form):
         )
         self.fields['power_port'].queryset = PowerPort.objects.filter(device=device)
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
 
 class PowerOutletBulkCreateForm(
     form_from_model(PowerOutlet, ['type', 'feed_leg', 'description', 'tags']),
@@ -2721,7 +2880,7 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
     class Meta:
         model = Interface
         fields = [
-            'device', 'name', 'type', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description',
+            'device', 'name', 'label', 'type', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description',
             'mode', 'untagged_vlan', 'tagged_vlans', 'tags',
         ]
         widgets = {
@@ -2763,6 +2922,10 @@ class InterfaceCreateForm(BootstrapMixin, InterfaceCommonForm, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
     type = forms.ChoiceField(
         choices=InterfaceTypeChoices,
         widget=StaticSelect2(),
@@ -2843,6 +3006,19 @@ class InterfaceCreateForm(BootstrapMixin, InterfaceCommonForm, forms.Form):
         self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', device.site.pk)
         self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
 
+    def clean(self):
+
+        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} interfaces, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, label_pattern_count)
+            })
+
+
 
 class InterfaceBulkCreateForm(
     form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description', 'tags']),
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 9d94e0639..d35504368 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -58,6 +58,10 @@
                     <td>Name</td>
                     <td>{{ interface.name }}</td>
                 </tr>
+                <tr>
+                    <td>Label</td>
+                    <td>{{ interface.label }}</td>
+                </tr>
                 <tr>
                     <td>Type</td>
                     <td>{{ interface.get_type_display }}</td>
diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index a80b7c592..eaffe2bca 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -6,6 +6,7 @@
         <div class="panel-heading"><strong>Interface</strong></div>
         <div class="panel-body">
             {% render_field form.name %}
+            {% render_field form.label %}
             {% render_field form.type %}
             {% render_field form.enabled %}
             {% render_field form.lag %}
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 4b5993c5f..462e45819 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -919,21 +919,26 @@ class ComponentCreateView(GetReturnURLMixin, View):
             new_components = []
             data = deepcopy(request.POST)
 
-            for i, name in enumerate(form.cleaned_data['name_pattern']):
-
+            names = form.cleaned_data['name_pattern']
+            labels = form.cleaned_data.get('label_pattern')
+            for pos, name in enumerate(names):
+                label = labels[pos] if labels else None
                 # Initialize the individual component form
                 data['name'] = name
+                data['label'] = label
                 if hasattr(form, 'get_iterative_data'):
-                    data.update(form.get_iterative_data(i))
+                    data.update(form.get_iterative_data(pos))
                 component_form = self.model_form(data)
 
                 if component_form.is_valid():
                     new_components.append(component_form)
                 else:
                     for field, errors in component_form.errors.as_data().items():
-                        # Assign errors on the child form's name field to name_pattern on the parent form
+                        # Assign errors on the child form's name/label field to name_pattern/label_pattern on the parent form
                         if field == 'name':
                             field = 'name_pattern'
+                        if field == 'label':
+                            field = 'label_pattern'
                         for e in errors:
                             form.add_error(field, '{}: {}'.format(name, ', '.join(e)))
 
@@ -1003,10 +1008,14 @@ class BulkComponentCreateView(GetReturnURLMixin, View):
                         for obj in data['pk']:
 
                             names = data['name_pattern']
-                            for name in names:
+                            labels = data['label_pattern']
+                            for pos, name in enumerate(names):
+                                label = labels[pos] if labels else None
+
                                 component_data = {
                                     self.parent_field: obj.pk,
                                     'name': name,
+                                    'label': label
                                 }
                                 component_data.update(data)
                                 component_form = self.model_form(component_data)

From f83e435a90f01f1b0d97daa50955f17d1f868f77 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 10:46:53 -0400
Subject: [PATCH 117/505] Move APIViewTestCases to api.py

---
 netbox/netbox/tests/test_authentication.py    |   2 +-
 netbox/utilities/testing/__init__.py          |   3 +-
 netbox/utilities/testing/api.py               | 141 ++++++++++++++++++
 .../testing/{testcases.py => views.py}        | 137 +----------------
 4 files changed, 152 insertions(+), 131 deletions(-)
 create mode 100644 netbox/utilities/testing/api.py
 rename netbox/utilities/testing/{testcases.py => views.py} (87%)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 0e9bea90d..7e5ce89b7 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -11,7 +11,7 @@ from dcim.models import Site
 from ipam.choices import PrefixStatusChoices
 from ipam.models import Prefix
 from users.models import ObjectPermission, Token
-from utilities.testing.testcases import TestCase
+from utilities.testing import TestCase
 
 
 class ExternalAuthenticationTestCase(TestCase):
diff --git a/netbox/utilities/testing/__init__.py b/netbox/utilities/testing/__init__.py
index 30e452215..1c18a3481 100644
--- a/netbox/utilities/testing/__init__.py
+++ b/netbox/utilities/testing/__init__.py
@@ -1,2 +1,3 @@
-from .testcases import *
+from .api import *
 from .utils import *
+from .views import *
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
new file mode 100644
index 000000000..d9688b6e2
--- /dev/null
+++ b/netbox/utilities/testing/api.py
@@ -0,0 +1,141 @@
+from django.contrib.auth.models import User
+from django.urls import reverse
+from django.test import override_settings
+from rest_framework import status
+from rest_framework.test import APIClient
+
+from users.models import Token
+from .views import TestCase
+
+
+__all__ = (
+    'APITestCase',
+    'APIViewTestCases',
+)
+
+
+#
+# REST API Tests
+#
+
+class APITestCase(TestCase):
+    client_class = APIClient
+    model = None
+
+    def setUp(self):
+        """
+        Create a superuser and token for API calls.
+        """
+        self.user = User.objects.create(username='testuser', is_superuser=True)
+        self.token = Token.objects.create(user=self.user)
+        self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
+
+    def _get_detail_url(self, instance):
+        viewname = f'{instance._meta.app_label}-api:{instance._meta.model_name}-detail'
+        return reverse(viewname, kwargs={'pk': instance.pk})
+
+    def _get_list_url(self):
+        viewname = f'{self.model._meta.app_label}-api:{self.model._meta.model_name}-list'
+        return reverse(viewname)
+
+
+class APIViewTestCases:
+
+    class GetObjectViewTestCase(APITestCase):
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_get_object(self):
+            """
+            GET a single object identified by its numeric ID.
+            """
+            instance = self.model.objects.first()
+            url = self._get_detail_url(instance)
+            response = self.client.get(url, **self.header)
+
+            self.assertEqual(response.data['id'], instance.pk)
+
+    class ListObjectsViewTestCase(APITestCase):
+        brief_fields = []
+
+        def test_list_objects(self):
+            """
+            GET a list of objects.
+            """
+            url = self._get_list_url()
+            response = self.client.get(url, **self.header)
+
+            self.assertEqual(len(response.data['results']), self.model.objects.count())
+
+        def test_list_objects_brief(self):
+            """
+            GET a list of objects using the "brief" parameter.
+            """
+            url = f'{self._get_list_url()}?brief=1'
+            response = self.client.get(url, **self.header)
+
+            self.assertEqual(len(response.data['results']), self.model.objects.count())
+            self.assertEqual(sorted(response.data['results'][0]), self.brief_fields)
+
+    class CreateObjectViewTestCase(APITestCase):
+        create_data = []
+
+        def test_create_object(self):
+            """
+            POST a single object.
+            """
+            initial_count = self.model.objects.count()
+            url = self._get_list_url()
+            response = self.client.post(url, self.create_data[0], format='json', **self.header)
+
+            self.assertHttpStatus(response, status.HTTP_201_CREATED)
+            self.assertEqual(self.model.objects.count(), initial_count + 1)
+            self.assertInstanceEqual(self.model.objects.get(pk=response.data['id']), self.create_data[0], api=True)
+
+        def test_bulk_create_object(self):
+            """
+            POST a set of objects in a single request.
+            """
+            initial_count = self.model.objects.count()
+            url = self._get_list_url()
+            response = self.client.post(url, self.create_data, format='json', **self.header)
+
+            self.assertHttpStatus(response, status.HTTP_201_CREATED)
+            self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
+
+    class UpdateObjectViewTestCase(APITestCase):
+        update_data = {}
+
+        def test_update_object(self):
+            """
+            PATCH a single object identified by its numeric ID.
+            """
+            instance = self.model.objects.first()
+            url = self._get_detail_url(instance)
+            update_data = self.update_data or getattr(self, 'create_data')[0]
+            response = self.client.patch(url, update_data, format='json', **self.header)
+
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            instance.refresh_from_db()
+            self.assertInstanceEqual(instance, self.update_data, api=True)
+
+    class DeleteObjectViewTestCase(APITestCase):
+
+        def test_delete_object(self):
+            """
+            DELETE a single object identified by its numeric ID.
+            """
+            instance = self.model.objects.first()
+            url = self._get_detail_url(instance)
+            response = self.client.delete(url, **self.header)
+
+            self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
+            self.assertFalse(self.model.objects.filter(pk=instance.pk).exists())
+
+    class APIViewTestCase(
+        GetObjectViewTestCase,
+        ListObjectsViewTestCase,
+        CreateObjectViewTestCase,
+        UpdateObjectViewTestCase,
+        DeleteObjectViewTestCase
+    ):
+        pass
diff --git a/netbox/utilities/testing/testcases.py b/netbox/utilities/testing/views.py
similarity index 87%
rename from netbox/utilities/testing/testcases.py
rename to netbox/utilities/testing/views.py
index dabadc2fa..2400d7087 100644
--- a/netbox/utilities/testing/testcases.py
+++ b/netbox/utilities/testing/views.py
@@ -5,14 +5,19 @@ from django.forms.models import model_to_dict
 from django.test import Client, TestCase as _TestCase, override_settings
 from django.urls import reverse, NoReverseMatch
 from netaddr import IPNetwork
-from rest_framework import status
-from rest_framework.test import APIClient
 
-from users.models import ObjectPermission, Token
+from users.models import ObjectPermission
 from utilities.permissions import resolve_permission_ct
 from .utils import disable_warnings, post_data
 
 
+__all__ = (
+    'TestCase',
+    'ModelViewTestCase',
+    'ViewTestCases',
+)
+
+
 class TestCase(_TestCase):
     user_permissions = ()
 
@@ -799,129 +804,3 @@ class ViewTestCases:
         TestCase suitable for testing device component models (ConsolePorts, Interfaces, etc.)
         """
         maxDiff = None
-
-
-#
-# REST API Tests
-#
-
-class APITestCase(TestCase):
-    client_class = APIClient
-    model = None
-
-    def setUp(self):
-        """
-        Create a superuser and token for API calls.
-        """
-        self.user = User.objects.create(username='testuser', is_superuser=True)
-        self.token = Token.objects.create(user=self.user)
-        self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
-
-    def _get_detail_url(self, instance):
-        viewname = f'{instance._meta.app_label}-api:{instance._meta.model_name}-detail'
-        return reverse(viewname, kwargs={'pk': instance.pk})
-
-    def _get_list_url(self):
-        viewname = f'{self.model._meta.app_label}-api:{self.model._meta.model_name}-list'
-        return reverse(viewname)
-
-
-class APIViewTestCases:
-
-    class GetObjectViewTestCase(APITestCase):
-
-        def test_get_object(self):
-            """
-            GET a single object identified by its numeric ID.
-            """
-            instance = self.model.objects.first()
-            url = self._get_detail_url(instance)
-            response = self.client.get(url, **self.header)
-
-            self.assertEqual(response.data['id'], instance.pk)
-
-    class ListObjectsViewTestCase(APITestCase):
-        brief_fields = []
-
-        def test_list_objects(self):
-            """
-            GET a list of objects.
-            """
-            url = self._get_list_url()
-            response = self.client.get(url, **self.header)
-
-            self.assertEqual(len(response.data['results']), self.model.objects.count())
-
-        def test_list_objects_brief(self):
-            """
-            GET a list of objects using the "brief" parameter.
-            """
-            url = f'{self._get_list_url()}?brief=1'
-            response = self.client.get(url, **self.header)
-
-            self.assertEqual(len(response.data['results']), self.model.objects.count())
-            self.assertEqual(sorted(response.data['results'][0]), self.brief_fields)
-
-    class CreateObjectViewTestCase(APITestCase):
-        create_data = []
-
-        def test_create_object(self):
-            """
-            POST a single object.
-            """
-            initial_count = self.model.objects.count()
-            url = self._get_list_url()
-            response = self.client.post(url, self.create_data[0], format='json', **self.header)
-
-            self.assertHttpStatus(response, status.HTTP_201_CREATED)
-            self.assertEqual(self.model.objects.count(), initial_count + 1)
-            self.assertInstanceEqual(self.model.objects.get(pk=response.data['id']), self.create_data[0], api=True)
-
-        def test_bulk_create_object(self):
-            """
-            POST a set of objects in a single request.
-            """
-            initial_count = self.model.objects.count()
-            url = self._get_list_url()
-            response = self.client.post(url, self.create_data, format='json', **self.header)
-
-            self.assertHttpStatus(response, status.HTTP_201_CREATED)
-            self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
-
-    class UpdateObjectViewTestCase(APITestCase):
-        update_data = {}
-
-        def test_update_object(self):
-            """
-            PATCH a single object identified by its numeric ID.
-            """
-            instance = self.model.objects.first()
-            url = self._get_detail_url(instance)
-            update_data = self.update_data or getattr(self, 'create_data')[0]
-            response = self.client.patch(url, update_data, format='json', **self.header)
-
-            self.assertHttpStatus(response, status.HTTP_200_OK)
-            instance.refresh_from_db()
-            self.assertInstanceEqual(instance, self.update_data, api=True)
-
-    class DeleteObjectViewTestCase(APITestCase):
-
-        def test_delete_object(self):
-            """
-            DELETE a single object identified by its numeric ID.
-            """
-            instance = self.model.objects.first()
-            url = self._get_detail_url(instance)
-            response = self.client.delete(url, **self.header)
-
-            self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-            self.assertFalse(self.model.objects.filter(pk=instance.pk).exists())
-
-    class APIViewTestCase(
-        GetObjectViewTestCase,
-        ListObjectsViewTestCase,
-        CreateObjectViewTestCase,
-        UpdateObjectViewTestCase,
-        DeleteObjectViewTestCase
-    ):
-        pass

From 830fd5f83ab04fb3032677a5f7374c13617c41fa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 11:22:12 -0400
Subject: [PATCH 118/505] Remove duplicate test method

---
 netbox/utilities/testing/views.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 2400d7087..1ba96e395 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -207,13 +207,6 @@ class ViewTestCases:
             # Try GET to non-permitted object
             self.assertHttpStatus(self.client.get(instance2.get_absolute_url()), 404)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-        def test_get_object_anonymous(self):
-            # Make the request as an unauthenticated user
-            self.client.logout()
-            response = self.client.get(self.model.objects.first().get_absolute_url())
-            self.assertHttpStatus(response, 200)
-
     class CreateObjectViewTestCase(ModelViewTestCase):
         """
         Create a single new instance.

From 3b44e7c1c4a8d8bee88f808a4bbeb05cf78d2aaf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 11:35:01 -0400
Subject: [PATCH 119/505] Update API test methods to evaluate permissions
 assignment

---
 netbox/utilities/testing/api.py | 174 +++++++++++++++++++++++++++++---
 1 file changed, 158 insertions(+), 16 deletions(-)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index d9688b6e2..fb8b0d795 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -1,10 +1,12 @@
 from django.contrib.auth.models import User
+from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from django.test import override_settings
 from rest_framework import status
 from rest_framework.test import APIClient
 
-from users.models import Token
+from users.models import ObjectPermission, Token
+from .utils import disable_warnings
 from .views import TestCase
 
 
@@ -26,7 +28,9 @@ class APITestCase(TestCase):
         """
         Create a superuser and token for API calls.
         """
-        self.user = User.objects.create(username='testuser', is_superuser=True)
+        # Create the test user and assign permissions
+        self.user = User.objects.create_user(username='testuser')
+        self.add_permissions(*self.user_permissions)
         self.token = Token.objects.create(user=self.user)
         self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
 
@@ -43,32 +47,70 @@ class APIViewTestCases:
 
     class GetObjectViewTestCase(APITestCase):
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_get_object_anonymous(self):
+            """
+            GET a single object as an unauthenticated user.
+            """
+            url = self._get_detail_url(self.model.objects.first())
+            response = self.client.get(url, **self.header)
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_get_object_without_permission(self):
+            """
+            GET a single object as an authenticated user without the required permission.
+            """
+            url = self._get_detail_url(self.model.objects.first())
+
+            # Try GET without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
+
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object(self):
             """
-            GET a single object identified by its numeric ID.
+            GET a single object as an authenticated user with permission to view the object.
             """
-            instance = self.model.objects.first()
-            url = self._get_detail_url(instance)
-            response = self.client.get(url, **self.header)
+            self.assertGreaterEqual(self.model.objects.count(), 2,
+                                    f"Test requires the creation of at least two {self.model} instances")
+            instance1, instance2 = self.model.objects.all()[:2]
 
-            self.assertEqual(response.data['id'], instance.pk)
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                constraints={'pk': instance1.pk},
+                actions=['view']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            # Try GET to permitted object
+            url = self._get_detail_url(instance1)
+            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_200_OK)
+
+            # Try GET to non-permitted object
+            url = self._get_detail_url(instance2)
+            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_404_NOT_FOUND)
 
     class ListObjectsViewTestCase(APITestCase):
         brief_fields = []
 
-        def test_list_objects(self):
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_list_objects_anonymous(self):
             """
-            GET a list of objects.
+            GET a list of objects as an unauthenticated user.
             """
             url = self._get_list_url()
             response = self.client.get(url, **self.header)
 
             self.assertEqual(len(response.data['results']), self.model.objects.count())
+            self.assertHttpStatus(response, status.HTTP_200_OK)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_list_objects_brief(self):
             """
-            GET a list of objects using the "brief" parameter.
+            GET a list of objects using the "brief" parameter as an unauthenticated user.
             """
             url = f'{self._get_list_url()}?brief=1'
             response = self.client.get(url, **self.header)
@@ -76,35 +118,108 @@ class APIViewTestCases:
             self.assertEqual(len(response.data['results']), self.model.objects.count())
             self.assertEqual(sorted(response.data['results'][0]), self.brief_fields)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects_without_permission(self):
+            """
+            GET a list of objects as an authenticated user without the required permission.
+            """
+            url = self._get_list_url()
+
+            # Try GET without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_list_objects(self):
+            """
+            GET a list of objects as an authenticated user with permission to view the objects.
+            """
+            self.assertGreaterEqual(self.model.objects.count(), 3,
+                                    f"Test requires the creation of at least three {self.model} instances")
+            instance1, instance2 = self.model.objects.all()[:2]
+
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                constraints={'pk__in': [instance1.pk, instance2.pk]},
+                actions=['view']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            # Try GET to permitted objects
+            response = self.client.get(self._get_list_url(), **self.header)
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertEqual(len(response.data['results']), 2)
+
     class CreateObjectViewTestCase(APITestCase):
         create_data = []
 
+        def test_create_object_without_permission(self):
+            """
+            POST a single object without permission.
+            """
+            url = self._get_list_url()
+
+            # Try POST without permission
+            with disable_warnings('django.request'):
+                response = self.client.post(url, self.create_data[0], format='json', **self.header)
+                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
+
         def test_create_object(self):
             """
-            POST a single object.
+            POST a single object with permission.
             """
             initial_count = self.model.objects.count()
             url = self._get_list_url()
-            response = self.client.post(url, self.create_data[0], format='json', **self.header)
 
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                actions=['add']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            response = self.client.post(url, self.create_data[0], format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(self.model.objects.count(), initial_count + 1)
             self.assertInstanceEqual(self.model.objects.get(pk=response.data['id']), self.create_data[0], api=True)
 
-        def test_bulk_create_object(self):
+        def test_bulk_create_objects(self):
             """
             POST a set of objects in a single request.
             """
             initial_count = self.model.objects.count()
             url = self._get_list_url()
-            response = self.client.post(url, self.create_data, format='json', **self.header)
 
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                actions=['add']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            response = self.client.post(url, self.create_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
 
     class UpdateObjectViewTestCase(APITestCase):
         update_data = {}
 
+        def test_update_object_without_permission(self):
+            """
+            PATCH a single object without permission.
+            """
+            url = self._get_detail_url(self.model.objects.first())
+            update_data = self.update_data or getattr(self, 'create_data')[0]
+
+            # Try PATCH without permission
+            with disable_warnings('django.request'):
+                response = self.client.patch(url, update_data, format='json', **self.header)
+                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
+
         def test_update_object(self):
             """
             PATCH a single object identified by its numeric ID.
@@ -112,22 +227,49 @@ class APIViewTestCases:
             instance = self.model.objects.first()
             url = self._get_detail_url(instance)
             update_data = self.update_data or getattr(self, 'create_data')[0]
-            response = self.client.patch(url, update_data, format='json', **self.header)
 
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                actions=['change']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            response = self.client.patch(url, update_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_200_OK)
             instance.refresh_from_db()
             self.assertInstanceEqual(instance, self.update_data, api=True)
 
     class DeleteObjectViewTestCase(APITestCase):
 
+        def test_delete_object_without_permission(self):
+            """
+            DELETE a single object without permission.
+            """
+            url = self._get_detail_url(self.model.objects.first())
+
+            # Try DELETE without permission
+            with disable_warnings('django.request'):
+                response = self.client.delete(url, **self.header)
+                self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
+
         def test_delete_object(self):
             """
             DELETE a single object identified by its numeric ID.
             """
             instance = self.model.objects.first()
             url = self._get_detail_url(instance)
-            response = self.client.delete(url, **self.header)
 
+            # Add object-level permission
+            obj_perm = ObjectPermission(
+                actions=['delete']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            response = self.client.delete(url, **self.header)
             self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
             self.assertFalse(self.model.objects.filter(pk=instance.pk).exists())
 

From a8145fe4c275463ecb54a1f2b522359b5f9c19d4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 12:22:29 -0400
Subject: [PATCH 120/505] Add permission assignment to custom test methods

---
 netbox/circuits/tests/test_api.py        |  1 +
 netbox/dcim/tests/test_api.py            | 20 +++++++++
 netbox/extras/tests/test_api.py          |  6 +++
 netbox/extras/tests/test_changelog.py    | 17 +++-----
 netbox/extras/tests/test_customfields.py | 22 ++++++----
 netbox/extras/tests/test_tags.py         | 11 ++---
 netbox/extras/tests/test_webhooks.py     | 12 +++---
 netbox/ipam/tests/test_api.py            | 11 +++++
 netbox/utilities/tests/test_api.py       | 31 ++++++--------
 netbox/virtualization/tests/test_api.py  | 53 +++++++++++-------------
 10 files changed, 104 insertions(+), 80 deletions(-)

diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index 71db7234d..4e062cc1a 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -58,6 +58,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
         )
         Graph.objects.bulk_create(graphs)
 
+        self.add_permissions('circuits.view_provider')
         url = reverse('circuits-api:provider-graphs', kwargs={'pk': provider.pk})
         response = self.client.get(url, **self.header)
 
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 6c6b75c7f..c0e1de5c8 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -106,6 +106,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
         )
         Graph.objects.bulk_create(graphs)
 
+        self.add_permissions('dcim.view_site')
         url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.first().pk})
         response = self.client.get(url, **self.header)
 
@@ -245,6 +246,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
     def test_get_elevation_rack_units(self):
         rack = Rack.objects.first()
 
+        self.add_permissions('dcim.view_rack')
         url = '{}?q=3'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
         response = self.client.get(url, **self.header)
 
@@ -270,6 +272,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         GET a single rack elevation.
         """
         rack = Rack.objects.first()
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk})
         response = self.client.get(url, **self.header)
 
@@ -280,6 +283,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         GET a single rack elevation in SVG format.
         """
         rack = Rack.objects.first()
+        self.add_permissions('dcim.view_rack')
         url = '{}?render=svg'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
         response = self.client.get(url, **self.header)
 
@@ -784,6 +788,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         )
         Graph.objects.bulk_create(graphs)
 
+        self.add_permissions('dcim.view_device')
         url = reverse('dcim-api:device-graphs', kwargs={'pk': Device.objects.first().pk})
         response = self.client.get(url, **self.header)
 
@@ -794,6 +799,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         """
         Check that config context data is included by default in the devices list.
         """
+        self.add_permissions('dcim.view_device')
         url = reverse('dcim-api:device-list') + '?slug=device-with-context-data'
         response = self.client.get(url, **self.header)
 
@@ -803,6 +809,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         """
         Check that config context data can be excluded by passing ?exclude=config_context.
         """
+        self.add_permissions('dcim.view_device')
         url = reverse('dcim-api:device-list') + '?exclude=config_context'
         response = self.client.get(url, **self.header)
 
@@ -820,6 +827,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
             'name': device.name,
         }
 
+        self.add_permissions('dcim.add_device')
         url = reverse('dcim-api:device-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -878,6 +886,7 @@ class ConsolePortTest(APIViewTestCases.APIViewTestCase):
         cable = Cable(termination_a=consoleport, termination_b=consoleserverport, label='Cable 1')
         cable.save()
 
+        self.add_permissions('dcim.view_consoleport')
         url = reverse('dcim-api:consoleport-trace', kwargs={'pk': consoleport.pk})
         response = self.client.get(url, **self.header)
 
@@ -941,6 +950,7 @@ class ConsoleServerPortTest(APIViewTestCases.APIViewTestCase):
         cable = Cable(termination_a=consoleserverport, termination_b=consoleport, label='Cable 1')
         cable.save()
 
+        self.add_permissions('dcim.view_consoleserverport')
         url = reverse('dcim-api:consoleserverport-trace', kwargs={'pk': consoleserverport.pk})
         response = self.client.get(url, **self.header)
 
@@ -1004,6 +1014,7 @@ class PowerPortTest(APIViewTestCases.APIViewTestCase):
         cable = Cable(termination_a=powerport, termination_b=poweroutlet, label='Cable 1')
         cable.save()
 
+        self.add_permissions('dcim.view_powerport')
         url = reverse('dcim-api:powerport-trace', kwargs={'pk': powerport.pk})
         response = self.client.get(url, **self.header)
 
@@ -1067,6 +1078,7 @@ class PowerOutletTest(APIViewTestCases.APIViewTestCase):
         cable = Cable(termination_a=poweroutlet, termination_b=powerport, label='Cable 1')
         cable.save()
 
+        self.add_permissions('dcim.view_poweroutlet')
         url = reverse('dcim-api:poweroutlet-trace', kwargs={'pk': poweroutlet.pk})
         response = self.client.get(url, **self.header)
 
@@ -1143,6 +1155,7 @@ class InterfaceTest(APIViewTestCases.APIViewTestCase):
         )
         Graph.objects.bulk_create(graphs)
 
+        self.add_permissions('dcim.view_interface')
         url = reverse('dcim-api:interface-graphs', kwargs={'pk': Interface.objects.first().pk})
         response = self.client.get(url, **self.header)
 
@@ -1446,6 +1459,7 @@ class ConnectionTest(APITestCase):
             'termination_b_id': consoleserverport1.pk,
         }
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -1484,6 +1498,7 @@ class ConnectionTest(APITestCase):
             device=self.panel2, name='Test Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rearport2
         )
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         cables = [
             # Console port to panel1 front
@@ -1539,6 +1554,7 @@ class ConnectionTest(APITestCase):
             'termination_b_id': poweroutlet1.pk,
         }
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -1574,6 +1590,7 @@ class ConnectionTest(APITestCase):
             'termination_b_id': interface2.pk,
         }
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -1612,6 +1629,7 @@ class ConnectionTest(APITestCase):
             device=self.panel2, name='Test Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rearport2
         )
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         cables = [
             # Interface1 to panel1 front
@@ -1676,6 +1694,7 @@ class ConnectionTest(APITestCase):
             'termination_b_id': circuittermination1.pk,
         }
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         response = self.client.post(url, data, format='json', **self.header)
 
@@ -1723,6 +1742,7 @@ class ConnectionTest(APITestCase):
             device=self.panel2, name='Test Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rearport2
         )
 
+        self.add_permissions('dcim.add_cable')
         url = reverse('dcim-api:cable-list')
         cables = [
             # Interface to panel1 front
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 2635fbbdc..0c1fcd91c 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -295,6 +295,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         )
 
     def test_get_rack_created(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?created=2001-02-03'.format(url), **self.header)
 
@@ -302,6 +303,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         self.assertEqual(response.data['results'][0]['id'], self.rack2.pk)
 
     def test_get_rack_created_gte(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?created__gte=2001-02-04'.format(url), **self.header)
 
@@ -309,6 +311,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         self.assertEqual(response.data['results'][0]['id'], self.rack1.pk)
 
     def test_get_rack_created_lte(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?created__lte=2001-02-04'.format(url), **self.header)
 
@@ -316,6 +319,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         self.assertEqual(response.data['results'][0]['id'], self.rack2.pk)
 
     def test_get_rack_last_updated(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?last_updated=2001-02-03%2001:02:03.000004'.format(url), **self.header)
 
@@ -323,6 +327,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         self.assertEqual(response.data['results'][0]['id'], self.rack2.pk)
 
     def test_get_rack_last_updated_gte(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?last_updated__gte=2001-02-04%2001:02:03.000004'.format(url), **self.header)
 
@@ -330,6 +335,7 @@ class CreatedUpdatedFilterTest(APITestCase):
         self.assertEqual(response.data['results'][0]['id'], self.rack1.pk)
 
     def test_get_rack_last_updated_lte(self):
+        self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-list')
         response = self.client.get('{}?last_updated__lte=2001-02-04%2001:02:03.000004'.format(url), **self.header)
 
diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 8f01cc3bf..50d9c5be6 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -4,7 +4,6 @@ from rest_framework import status
 
 from dcim.models import Site
 from extras.choices import *
-from extras.constants import *
 from extras.models import CustomField, CustomFieldValue, ObjectChange
 from utilities.testing import APITestCase
 
@@ -26,7 +25,6 @@ class ChangeLogTest(APITestCase):
         cf.obj_type.set([ct])
 
     def test_create_object(self):
-
         data = {
             'name': 'Test Site 1',
             'slug': 'test-site-1',
@@ -37,10 +35,10 @@ class ChangeLogTest(APITestCase):
                 'bar', 'foo'
             ],
         }
-
         self.assertEqual(ObjectChange.objects.count(), 0)
-
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
+
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
@@ -55,7 +53,6 @@ class ChangeLogTest(APITestCase):
         self.assertListEqual(sorted(oc.object_data['tags']), data['tags'])
 
     def test_update_object(self):
-
         site = Site(name='Test Site 1', slug='test-site-1')
         site.save()
 
@@ -69,10 +66,10 @@ class ChangeLogTest(APITestCase):
                 'abc', 'xyz'
             ],
         }
-
         self.assertEqual(ObjectChange.objects.count(), 0)
-
+        self.add_permissions('dcim.change_site')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
+
         response = self.client.put(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
 
@@ -87,7 +84,6 @@ class ChangeLogTest(APITestCase):
         self.assertListEqual(sorted(oc.object_data['tags']), data['tags'])
 
     def test_delete_object(self):
-
         site = Site(
             name='Test Site 1',
             slug='test-site-1'
@@ -99,12 +95,11 @@ class ChangeLogTest(APITestCase):
             obj=site,
             value='ABC'
         )
-
         self.assertEqual(ObjectChange.objects.count(), 0)
-
+        self.add_permissions('dcim.delete_site')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
-        response = self.client.delete(url, **self.header)
 
+        response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertEqual(Site.objects.count(), 0)
 
diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py
index 4df06e12f..e543b63e3 100644
--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -182,8 +182,9 @@ class CustomFieldAPITest(APITestCase):
         Validate that custom fields are present on an object even if it has no values defined.
         """
         url = reverse('dcim-api:site-detail', kwargs={'pk': self.sites[0].pk})
-        response = self.client.get(url, **self.header)
+        self.add_permissions('dcim.view_site')
 
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['name'], self.sites[0].name)
         self.assertEqual(response.data['custom_fields'], {
             'text_field': None,
@@ -201,10 +202,10 @@ class CustomFieldAPITest(APITestCase):
         site2_cfvs = {
             cfv.field.name: cfv.value for cfv in self.sites[1].custom_field_values.all()
         }
-
         url = reverse('dcim-api:site-detail', kwargs={'pk': self.sites[1].pk})
-        response = self.client.get(url, **self.header)
+        self.add_permissions('dcim.view_site')
 
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['name'], self.sites[1].name)
         self.assertEqual(response.data['custom_fields']['text_field'], site2_cfvs['text_field'])
         self.assertEqual(response.data['custom_fields']['number_field'], site2_cfvs['number_field'])
@@ -221,8 +222,9 @@ class CustomFieldAPITest(APITestCase):
             'name': 'Site 3',
             'slug': 'site-3',
         }
-
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
+
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
@@ -263,8 +265,9 @@ class CustomFieldAPITest(APITestCase):
                 'choice_field': self.cf_select_choice2.pk,
             },
         }
-
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
+
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
@@ -309,8 +312,9 @@ class CustomFieldAPITest(APITestCase):
                 'slug': 'site-5',
             },
         )
-
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
+
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(len(response.data), len(data))
@@ -367,8 +371,9 @@ class CustomFieldAPITest(APITestCase):
                 'custom_fields': custom_field_data,
             },
         )
-
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
+
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(len(response.data), len(data))
@@ -410,8 +415,9 @@ class CustomFieldAPITest(APITestCase):
                 'number_field': 1234,
             },
         }
-
         url = reverse('dcim-api:site-detail', kwargs={'pk': self.sites[1].pk})
+        self.add_permissions('dcim.change_site')
+
         response = self.client.patch(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
 
diff --git a/netbox/extras/tests/test_tags.py b/netbox/extras/tests/test_tags.py
index 9b50959bc..8991c58e7 100644
--- a/netbox/extras/tests/test_tags.py
+++ b/netbox/extras/tests/test_tags.py
@@ -15,16 +15,15 @@ class TaggedItemTest(APITestCase):
         super().setUp()
 
     def test_create_tagged_item(self):
-
         data = {
             'name': 'Test Site',
             'slug': 'test-site',
             'tags': ['Foo', 'Bar', 'Baz']
         }
-
         url = reverse('dcim-api:site-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('dcim.add_site')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(sorted(response.data['tags']), sorted(data['tags']))
         site = Site.objects.get(pk=response.data['id'])
@@ -32,20 +31,18 @@ class TaggedItemTest(APITestCase):
         self.assertEqual(sorted(tags), sorted(data['tags']))
 
     def test_update_tagged_item(self):
-
         site = Site.objects.create(
             name='Test Site',
             slug='test-site'
         )
         site.tags.add('Foo', 'Bar', 'Baz')
-
         data = {
             'tags': ['Foo', 'Bar', 'New Tag']
         }
-
+        self.add_permissions('dcim.change_site')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
-        response = self.client.patch(url, data, format='json', **self.header)
 
+        response = self.client.patch(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(sorted(response.data['tags']), sorted(data['tags']))
         site = Site.objects.get(pk=response.data['id'])
diff --git a/netbox/extras/tests/test_webhooks.py b/netbox/extras/tests/test_webhooks.py
index f87242404..8f741bbc2 100644
--- a/netbox/extras/tests/test_webhooks.py
+++ b/netbox/extras/tests/test_webhooks.py
@@ -42,13 +42,13 @@ class WebhookTest(APITestCase):
             webhook.obj_type.set([site_ct])
 
     def test_enqueue_webhook_create(self):
-
         # Create an object via the REST API
         data = {
             'name': 'Test Site',
             'slug': 'test-site',
         }
         url = reverse('dcim-api:site-list')
+        self.add_permissions('dcim.add_site')
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(Site.objects.count(), 1)
@@ -62,14 +62,13 @@ class WebhookTest(APITestCase):
         self.assertEqual(job.args[3], ObjectChangeActionChoices.ACTION_CREATE)
 
     def test_enqueue_webhook_update(self):
-
-        site = Site.objects.create(name='Site 1', slug='site-1')
-
         # Update an object via the REST API
+        site = Site.objects.create(name='Site 1', slug='site-1')
         data = {
             'comments': 'Updated the site',
         }
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
+        self.add_permissions('dcim.change_site')
         response = self.client.patch(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
 
@@ -82,11 +81,10 @@ class WebhookTest(APITestCase):
         self.assertEqual(job.args[3], ObjectChangeActionChoices.ACTION_UPDATE)
 
     def test_enqueue_webhook_delete(self):
-
-        site = Site.objects.create(name='Site 1', slug='site-1')
-
         # Delete an object via the REST API
+        site = Site.objects.create(name='Site 1', slug='site-1')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
+        self.add_permissions('dcim.delete_site')
         response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
 
diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py
index a5cb76953..41f39703c 100644
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -176,6 +176,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         Prefix.objects.create(prefix=IPNetwork('192.0.2.64/26'))
         Prefix.objects.create(prefix=IPNetwork('192.0.2.192/27'))
         url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
+        self.add_permissions('ipam.view_prefix')
 
         # Retrieve all available IPs
         response = self.client.get(url, **self.header)
@@ -190,6 +191,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         vrf = VRF.objects.create(name='Test VRF 1', rd='1234')
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), vrf=vrf, is_pool=True)
         url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
+        self.add_permissions('ipam.add_prefix')
 
         # Create four available prefixes with individual requests
         prefixes_to_be_created = [
@@ -225,6 +227,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/28'), is_pool=True)
         url = reverse('ipam-api:prefix-available-prefixes', kwargs={'pk': prefix.pk})
+        self.add_permissions('ipam.view_prefix', 'ipam.add_prefix')
 
         # Try to create five /30s (only four are available)
         data = [
@@ -240,6 +243,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
 
         # Verify that no prefixes were created (the entire /28 is still available)
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data[0]['prefix'], '192.0.2.0/28')
 
         # Create four /30s in a single request
@@ -253,6 +257,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
+        self.add_permissions('ipam.view_prefix', 'ipam.view_ipaddress')
 
         # Retrieve all available IPs
         response = self.client.get(url, **self.header)
@@ -271,6 +276,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         vrf = VRF.objects.create(name='Test VRF 1', rd='1234')
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/30'), vrf=vrf, is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
+        # TODO: ipam.add_prefix should not be required
+        self.add_permissions('ipam.add_prefix', 'ipam.add_ipaddress')
 
         # Create all four available IPs with individual requests
         for i in range(1, 5):
@@ -293,6 +300,8 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
+        # TODO: ipam.add_prefix, ipam.view_prefix should not be required
+        self.add_permissions('ipam.add_prefix', 'ipam.view_prefix', 'ipam.view_ipaddress', 'ipam.add_ipaddress')
 
         # Try to create nine IPs (only eight are available)
         data = [{'description': 'Test IP {}'.format(i)} for i in range(1, 10)]  # 9 IPs
@@ -302,6 +311,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
 
         # Verify that no IPs were created (eight are still available)
         response = self.client.get(url, **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(len(response.data), 8)
 
         # Create all eight available IPs in a single request
@@ -411,6 +421,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
         vlan = VLAN.objects.first()
         Prefix.objects.create(prefix=IPNetwork('192.0.2.0/24'), vlan=vlan)
 
+        self.add_permissions('ipam.delete_vlan')
         url = reverse('ipam-api:vlan-detail', kwargs={'pk': vlan.pk})
         with disable_warnings('django.request'):
             response = self.client.delete(url, **self.header)
diff --git a/netbox/utilities/tests/test_api.py b/netbox/utilities/tests/test_api.py
index 469bb3150..01d4ab8f3 100644
--- a/netbox/utilities/tests/test_api.py
+++ b/netbox/utilities/tests/test_api.py
@@ -18,7 +18,6 @@ class WritableNestedSerializerTest(APITestCase):
     """
 
     def setUp(self):
-
         super().setUp()
 
         self.region_a = Region.objects.create(name='Region A', slug='region-a')
@@ -26,39 +25,36 @@ class WritableNestedSerializerTest(APITestCase):
         self.site2 = Site.objects.create(region=self.region_a, name='Site 2', slug='site-2')
 
     def test_related_by_pk(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
             'site': self.site1.pk,
         }
-
         url = reverse('ipam-api:vlan-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('ipam.add_vlan')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(response.data['site']['id'], self.site1.pk)
         vlan = VLAN.objects.get(pk=response.data['id'])
         self.assertEqual(vlan.site, self.site1)
 
     def test_related_by_pk_no_match(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
             'site': 999,
         }
-
         url = reverse('ipam-api:vlan-list')
+        self.add_permissions('ipam.add_vlan')
+
         with disable_warnings('django.request'):
             response = self.client.post(url, data, format='json', **self.header)
-
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(VLAN.objects.count(), 0)
         self.assertTrue(response.data['site'][0].startswith("Related object not found"))
 
     def test_related_by_attributes(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
@@ -66,17 +62,16 @@ class WritableNestedSerializerTest(APITestCase):
                 'name': 'Site 1'
             },
         }
-
         url = reverse('ipam-api:vlan-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('ipam.add_vlan')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(response.data['site']['id'], self.site1.pk)
         vlan = VLAN.objects.get(pk=response.data['id'])
         self.assertEqual(vlan.site, self.site1)
 
     def test_related_by_attributes_no_match(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
@@ -84,17 +79,16 @@ class WritableNestedSerializerTest(APITestCase):
                 'name': 'Site X'
             },
         }
-
         url = reverse('ipam-api:vlan-list')
+        self.add_permissions('ipam.add_vlan')
+
         with disable_warnings('django.request'):
             response = self.client.post(url, data, format='json', **self.header)
-
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(VLAN.objects.count(), 0)
         self.assertTrue(response.data['site'][0].startswith("Related object not found"))
 
     def test_related_by_attributes_multiple_matches(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
@@ -104,27 +98,26 @@ class WritableNestedSerializerTest(APITestCase):
                 },
             },
         }
-
         url = reverse('ipam-api:vlan-list')
+        self.add_permissions('ipam.add_vlan')
+
         with disable_warnings('django.request'):
             response = self.client.post(url, data, format='json', **self.header)
-
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(VLAN.objects.count(), 0)
         self.assertTrue(response.data['site'][0].startswith("Multiple objects match"))
 
     def test_related_by_invalid(self):
-
         data = {
             'vid': 100,
             'name': 'Test VLAN 100',
             'site': 'XXX',
         }
-
         url = reverse('ipam-api:vlan-list')
+        self.add_permissions('ipam.add_vlan')
+
         with disable_warnings('django.request'):
             response = self.client.post(url, data, format='json', **self.header)
-
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(VLAN.objects.count(), 0)
 
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index e436a46c5..6b466116e 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -164,10 +164,10 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         Check that config context data is included by default in the virtual machines list.
         """
         virtualmachine = VirtualMachine.objects.first()
-        url = reverse('virtualization-api:virtualmachine-list')
-        url = '{}?id={}'.format(url, virtualmachine.pk)
-        response = self.client.get(url, **self.header)
+        url = '{}?id={}'.format(reverse('virtualization-api:virtualmachine-list'), virtualmachine.pk)
+        self.add_permissions('virtualization.view_virtualmachine')
 
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['results'][0].get('config_context', {}).get('A'), 1)
 
     def test_config_context_excluded(self):
@@ -175,8 +175,9 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         Check that config context data can be excluded by passing ?exclude=config_context.
         """
         url = reverse('virtualization-api:virtualmachine-list') + '?exclude=config_context'
-        response = self.client.get(url, **self.header)
+        self.add_permissions('virtualization.view_virtualmachine')
 
+        response = self.client.get(url, **self.header)
         self.assertFalse('config_context' in response.data['results'][0])
 
     def test_unique_name_per_cluster_constraint(self):
@@ -188,8 +189,9 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
             'cluster': Cluster.objects.first().pk,
         }
         url = reverse('virtualization-api:virtualmachine-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('virtualization.add_virtualmachine')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
 
 
@@ -224,39 +226,38 @@ class InterfaceTest(APITestCase):
         self.vlan3 = VLAN.objects.create(name="Test VLAN 3", vid=3)
 
     def test_get_interface(self):
-
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        response = self.client.get(url, **self.header)
+        self.add_permissions('dcim.view_interface')
 
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['name'], self.interface1.name)
 
     def test_list_interfaces(self):
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.get(url, **self.header)
+        self.add_permissions('dcim.view_interface')
 
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['count'], 3)
 
     def test_list_interfaces_brief(self):
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.get('{}?brief=1'.format(url), **self.header)
+        self.add_permissions('dcim.view_interface')
 
+        response = self.client.get('{}?brief=1'.format(url), **self.header)
         self.assertEqual(
             sorted(response.data['results'][0]),
             ['id', 'name', 'url', 'virtual_machine']
         )
 
     def test_create_interface(self):
-
         data = {
             'virtual_machine': self.virtualmachine.pk,
             'name': 'Test Interface 4',
         }
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('dcim.add_interface')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(Interface.objects.count(), 4)
         interface4 = Interface.objects.get(pk=response.data['id'])
@@ -264,7 +265,6 @@ class InterfaceTest(APITestCase):
         self.assertEqual(interface4.name, data['name'])
 
     def test_create_interface_with_802_1q(self):
-
         data = {
             'virtual_machine': self.virtualmachine.pk,
             'name': 'Test Interface 4',
@@ -272,10 +272,10 @@ class InterfaceTest(APITestCase):
             'untagged_vlan': self.vlan3.id,
             'tagged_vlans': [self.vlan1.id, self.vlan2.id],
         }
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('dcim.add_interface')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(Interface.objects.count(), 4)
         self.assertEqual(response.data['virtual_machine']['id'], data['virtual_machine'])
@@ -284,7 +284,6 @@ class InterfaceTest(APITestCase):
         self.assertEqual([v['id'] for v in response.data['tagged_vlans']], data['tagged_vlans'])
 
     def test_create_interface_bulk(self):
-
         data = [
             {
                 'virtual_machine': self.virtualmachine.pk,
@@ -299,10 +298,10 @@ class InterfaceTest(APITestCase):
                 'name': 'Test Interface 6',
             },
         ]
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('dcim.add_interface')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(Interface.objects.count(), 6)
         self.assertEqual(response.data[0]['name'], data[0]['name'])
@@ -310,7 +309,6 @@ class InterfaceTest(APITestCase):
         self.assertEqual(response.data[2]['name'], data[2]['name'])
 
     def test_create_interface_802_1q_bulk(self):
-
         data = [
             {
                 'virtual_machine': self.virtualmachine.pk,
@@ -334,10 +332,10 @@ class InterfaceTest(APITestCase):
                 'tagged_vlans': [self.vlan1.id],
             },
         ]
-
         url = reverse('virtualization-api:interface-list')
-        response = self.client.post(url, data, format='json', **self.header)
+        self.add_permissions('dcim.add_interface')
 
+        response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(Interface.objects.count(), 6)
         for i in range(0, 3):
@@ -346,24 +344,23 @@ class InterfaceTest(APITestCase):
             self.assertEqual(response.data[i]['untagged_vlan']['id'], data[i]['untagged_vlan'])
 
     def test_update_interface(self):
-
         data = {
             'virtual_machine': self.virtualmachine.pk,
             'name': 'Test Interface X',
         }
-
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        response = self.client.put(url, data, format='json', **self.header)
+        self.add_permissions('dcim.change_interface')
 
+        response = self.client.put(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(Interface.objects.count(), 3)
         interface1 = Interface.objects.get(pk=response.data['id'])
         self.assertEqual(interface1.name, data['name'])
 
     def test_delete_interface(self):
-
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        response = self.client.delete(url, **self.header)
+        self.add_permissions('dcim.delete_interface')
 
+        response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertEqual(Interface.objects.count(), 2)

From c1a37db87187649bb3bc86855a59bf38d34ccf10 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 13:41:12 -0400
Subject: [PATCH 121/505] Fix managers on Graph and ExportTemplate

---
 netbox/extras/models/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 9e000774f..082a153e9 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -232,6 +232,8 @@ class Graph(models.Model):
         verbose_name='Link URL'
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         ordering = ('type', 'weight', 'name', 'pk')  # (type, weight, name) may be non-unique
 
@@ -299,6 +301,8 @@ class ExportTemplate(models.Model):
         help_text='Extension to append to the rendered filename'
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         ordering = ['content_type', 'name']
         unique_together = [

From 62224857f0784e5864e5ec81ecffa9a4da319b60 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 14:01:15 -0400
Subject: [PATCH 122/505] Standardize ObjectPermissionTest

---
 netbox/users/models.py          |  3 ++
 netbox/users/tests/test_api.py  | 83 ++++-----------------------------
 netbox/utilities/testing/api.py | 12 ++---
 3 files changed, 15 insertions(+), 83 deletions(-)

diff --git a/netbox/users/models.py b/netbox/users/models.py
index fa3277456..7987ccb7a 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -10,6 +10,7 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
 
+from utilities.querysets import RestrictedQuerySet
 from utilities.utils import flatten_dict
 
 
@@ -262,6 +263,8 @@ class ObjectPermission(models.Model):
         help_text="Queryset filter matching the applicable objects of the selected type(s)"
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         verbose_name = "Permission"
 
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index f507192ee..2494c8f31 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -1,10 +1,9 @@
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
-from rest_framework import status
 
 from users.models import ObjectPermission
-from utilities.testing import APITestCase
+from utilities.testing import APIViewTestCases, APITestCase
 
 
 class AppTest(APITestCase):
@@ -17,7 +16,12 @@ class AppTest(APITestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class ObjectPermissionTest(APITestCase):
+class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
+    model = ObjectPermission
+    brief_fields = []
+
+    # TODO: Add a nested serializer for ObjectPermission
+    test_list_objects_brief = None
 
     @classmethod
     def setUpTestData(cls):
@@ -48,43 +52,7 @@ class ObjectPermissionTest(APITestCase):
             objectpermission.groups.add(groups[i])
             objectpermission.users.add(users[i])
 
-    def test_get_objectpermission(self):
-        objectpermission = ObjectPermission.objects.first()
-        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['id'], objectpermission.pk)
-
-    def test_list_objectpermissions(self):
-        url = reverse('users-api:objectpermission-list')
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['count'], ObjectPermission.objects.count())
-
-    def test_create_objectpermission(self):
-        data = {
-            'object_types': ['dcim.site'],
-            'groups': [Group.objects.first().pk],
-            'users': [User.objects.first().pk],
-            'actions': ['view', 'add', 'change', 'delete'],
-            'constraints': {'name': 'TEST4'},
-        }
-
-        url = reverse('users-api:objectpermission-list')
-        response = self.client.post(url, data, format='json', **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(ObjectPermission.objects.count(), 4)
-        objectpermission = ObjectPermission.objects.get(pk=response.data['id'])
-        self.assertEqual(objectpermission.groups.first().pk, data['groups'][0])
-        self.assertEqual(objectpermission.users.first().pk, data['users'][0])
-        self.assertEqual(objectpermission.actions, data['actions'])
-        self.assertEqual(objectpermission.constraints, data['constraints'])
-
-    def test_create_objectpermission_bulk(self):
-        groups = Group.objects.all()[:3]
-        users = User.objects.all()[:3]
-        data = [
+        cls.create_data = [
             {
                 'object_types': ['dcim.site'],
                 'groups': [groups[0].pk],
@@ -107,38 +75,3 @@ class ObjectPermissionTest(APITestCase):
                 'constraints': {'name': 'TEST6'},
             },
         ]
-
-        url = reverse('users-api:objectpermission-list')
-        response = self.client.post(url, data, format='json', **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(ObjectPermission.objects.count(), 6)
-
-    def test_update_objectpermission(self):
-        objectpermission = ObjectPermission.objects.first()
-        data = {
-            'object_types': ['dcim.site', 'dcim.device'],
-            'groups': [g.pk for g in Group.objects.all()[:2]],
-            'users': [u.pk for u in User.objects.all()[:2]],
-            'actions': ['view'],
-            'constraints': {'name': 'TEST'},
-        }
-
-        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
-        response = self.client.put(url, data, format='json', **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(ObjectPermission.objects.count(), 3)
-        objectpermission = ObjectPermission.objects.get(pk=response.data['id'])
-        self.assertEqual(objectpermission.groups.first().pk, data['groups'][0])
-        self.assertEqual(objectpermission.users.first().pk, data['users'][0])
-        self.assertEqual(objectpermission.actions, data['actions'])
-        self.assertEqual(objectpermission.constraints, data['constraints'])
-
-    def test_delete_objectpermission(self):
-        objectpermission = ObjectPermission.objects.first()
-        url = reverse('users-api:objectpermission-detail', kwargs={'pk': objectpermission.pk})
-        response = self.client.delete(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(ObjectPermission.objects.count(), 2)
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index fb8b0d795..1e2063a6d 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -170,9 +170,6 @@ class APIViewTestCases:
             """
             POST a single object with permission.
             """
-            initial_count = self.model.objects.count()
-            url = self._get_list_url()
-
             # Add object-level permission
             obj_perm = ObjectPermission(
                 actions=['add']
@@ -181,7 +178,8 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            response = self.client.post(url, self.create_data[0], format='json', **self.header)
+            initial_count = self.model.objects.count()
+            response = self.client.post(self._get_list_url(), self.create_data[0], format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(self.model.objects.count(), initial_count + 1)
             self.assertInstanceEqual(self.model.objects.get(pk=response.data['id']), self.create_data[0], api=True)
@@ -190,9 +188,6 @@ class APIViewTestCases:
             """
             POST a set of objects in a single request.
             """
-            initial_count = self.model.objects.count()
-            url = self._get_list_url()
-
             # Add object-level permission
             obj_perm = ObjectPermission(
                 actions=['add']
@@ -201,7 +196,8 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            response = self.client.post(url, self.create_data, format='json', **self.header)
+            initial_count = self.model.objects.count()
+            response = self.client.post(self._get_list_url(), self.create_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
 

From a2955196affd341800bb843d5c5ec8beb7a36f51 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 15:21:11 -0400
Subject: [PATCH 123/505] Remove extraneous permission class from
 SecretRoleViewSet

---
 netbox/secrets/api/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py
index 1795e6c0a..9e330b782 100644
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -29,7 +29,6 @@ class SecretRoleViewSet(ModelViewSet):
         secret_count=Count('secrets')
     )
     serializer_class = serializers.SecretRoleSerializer
-    permission_classes = [IsAuthenticated]
     filterset_class = filters.SecretRoleFilterSet
 
 

From 047286f9c05b6d44a750c2136ee8aad43117708c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 15:27:55 -0400
Subject: [PATCH 124/505] Add a third initial object to VirtualChassisTest

---
 netbox/dcim/tests/test_api.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index c0e1de5c8..60a6dc122 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -1846,6 +1846,9 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
             Device(name='Device 7', device_type=devicetype, device_role=devicerole, site=site),
             Device(name='Device 8', device_type=devicetype, device_role=devicerole, site=site),
             Device(name='Device 9', device_type=devicetype, device_role=devicerole, site=site),
+            Device(name='Device 10', device_type=devicetype, device_role=devicerole, site=site),
+            Device(name='Device 11', device_type=devicetype, device_role=devicerole, site=site),
+            Device(name='Device 12', device_type=devicetype, device_role=devicerole, site=site),
         )
         Device.objects.bulk_create(devices)
 
@@ -1859,16 +1862,19 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
                 )
         Interface.objects.bulk_create(interfaces)
 
-        # Create two VirtualChassis with three members each
+        # Create three VirtualChassis with three members each
         virtual_chassis = (
             VirtualChassis(master=devices[0], domain='domain-1'),
             VirtualChassis(master=devices[3], domain='domain-2'),
+            VirtualChassis(master=devices[6], domain='domain-3'),
         )
         VirtualChassis.objects.bulk_create(virtual_chassis)
         Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
         Device.objects.filter(pk=devices[2].pk).update(virtual_chassis=virtual_chassis[0], vc_position=3)
         Device.objects.filter(pk=devices[4].pk).update(virtual_chassis=virtual_chassis[1], vc_position=2)
         Device.objects.filter(pk=devices[5].pk).update(virtual_chassis=virtual_chassis[1], vc_position=3)
+        Device.objects.filter(pk=devices[7].pk).update(virtual_chassis=virtual_chassis[2], vc_position=2)
+        Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
 
         cls.update_data = {
             'master': devices[1].pk,
@@ -1877,17 +1883,17 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
 
         cls.create_data = [
             {
-                'master': devices[6].pk,
-                'domain': 'domain-3',
-            },
-            {
-                'master': devices[7].pk,
+                'master': devices[9].pk,
                 'domain': 'domain-4',
             },
             {
-                'master': devices[8].pk,
+                'master': devices[10].pk,
                 'domain': 'domain-5',
             },
+            {
+                'master': devices[11].pk,
+                'domain': 'domain-6',
+            },
         ]
 
 

From 987414ed7b2d6d2dea0dadb3900699543a4293e1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 15:40:41 -0400
Subject: [PATCH 125/505] Introduce NestedObjectPermissionSerializer

---
 netbox/users/api/nested_serializers.py | 32 +++++++++++++++++++++-----
 netbox/users/api/serializers.py        |  1 +
 netbox/users/tests/test_api.py         |  5 +---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
index f7721cf94..f6e5cefbf 100644
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -1,16 +1,17 @@
 from django.contrib.auth.models import Group, User
+from django.contrib.contenttypes.models import ContentType
+from rest_framework import serializers
 
-from utilities.api import WritableNestedSerializer
+from users.models import ObjectPermission
+from utilities.api import ContentTypeField, WritableNestedSerializer
 
-_all_ = [
+__all__ = [
+    'NestedGroupSerializer',
+    'NestedObjectPermissionSerializer',
     'NestedUserSerializer',
 ]
 
 
-#
-# Groups and users
-#
-
 class NestedGroupSerializer(WritableNestedSerializer):
 
     class Meta:
@@ -23,3 +24,22 @@ class NestedUserSerializer(WritableNestedSerializer):
     class Meta:
         model = User
         fields = ['id', 'username']
+
+
+class NestedObjectPermissionSerializer(WritableNestedSerializer):
+    object_types = ContentTypeField(
+        queryset=ContentType.objects.all(),
+        many=True
+    )
+    groups = serializers.SerializerMethodField(read_only=True)
+    users = serializers.SerializerMethodField(read_only=True)
+
+    class Meta:
+        model = ObjectPermission
+        fields = ['id', 'object_types', 'groups', 'users', 'actions']
+
+    def get_groups(self, obj):
+        return [g.name for g in obj.groups.all()]
+
+    def get_users(self, obj):
+        return [u.username for u in obj.users.all()]
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index dc5301846..052567e47 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 
 from users.models import ObjectPermission
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 2494c8f31..166473710 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -18,10 +18,7 @@ class AppTest(APITestCase):
 
 class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
     model = ObjectPermission
-    brief_fields = []
-
-    # TODO: Add a nested serializer for ObjectPermission
-    test_list_objects_brief = None
+    brief_fields = ['actions', 'groups', 'id', 'object_types', 'users']
 
     @classmethod
     def setUpTestData(cls):

From 7a858cea23cee1d9ea1eb558b2f987338e16e841 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 15:58:54 -0400
Subject: [PATCH 126/505] Extend test_bulk_create_objects() to inspect created
 objects

---
 netbox/utilities/testing/api.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index 1e2063a6d..ce4f1d1e5 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -199,7 +199,10 @@ class APIViewTestCases:
             initial_count = self.model.objects.count()
             response = self.client.post(self._get_list_url(), self.create_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
+            self.assertEqual(len(response.data), len(self.create_data))
             self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
+            for i, obj in enumerate(response.data):
+                self.assertInstanceEqual(self.model.objects.get(pk=obj['id']), self.create_data[i], api=True)
 
     class UpdateObjectViewTestCase(APITestCase):
         update_data = {}

From 2f53411efcabec5651684715fa820e13a4a5e78b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 8 Jun 2020 16:32:50 -0400
Subject: [PATCH 127/505] Extend assertInstanceEqual() to handle M2M relations
 to ContentType

---
 netbox/utilities/testing/views.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 1ba96e395..b3c35ed87 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -1,6 +1,7 @@
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import ForeignKey, ManyToManyField
 from django.forms.models import model_to_dict
 from django.test import Client, TestCase as _TestCase, override_settings
 from django.urls import reverse, NoReverseMatch
@@ -83,12 +84,15 @@ class TestCase(_TestCase):
             if api:
 
                 # Replace ContentType numeric IDs with <app_label>.<model>
-                if type(getattr(instance, key)) is ContentType:
+                field = instance._meta.get_field(key)
+                if type(field) is ForeignKey and field.related_model is ContentType:
                     ct = ContentType.objects.get(pk=value)
                     model_dict[key] = f'{ct.app_label}.{ct.model}'
+                elif type(field) is ManyToManyField and field.related_model is ContentType:
+                    model_dict[key] = [f'{ct.app_label}.{ct.model}' for ct in value]
 
                 # Convert IPNetwork instances to strings
-                if type(value) is IPNetwork:
+                elif type(value) is IPNetwork:
                     model_dict[key] = str(value)
 
         # Omit any dictionary keys which are not instance attributes

From 892c0e3d8be75e7d7e31c97b7bd01bdd5f8e5c0f Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Mon, 8 Jun 2020 17:00:07 -0400
Subject: [PATCH 128/505] Leftover fix

---
 netbox/dcim/forms.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 0e9d9763e..736e129a3 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2296,9 +2296,9 @@ class DeviceBulkAddComponentForm(BootstrapMixin, forms.Form):
         label_pattern_count = len(self.cleaned_data['label_pattern'])
         if label_pattern_count and name_pattern_count != label_pattern_count:
             raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} {}}, however {} labels will '
+                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
                 'be generated. These counts must match.'.format(
-                    name_pattern_count, self.type, label_pattern_count)
+                    name_pattern_count, label_pattern_count)
             })
 
 

From 90bc1cd95162a2193ef1a470a85cd7b74a4e0634 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Mon, 8 Jun 2020 20:04:31 -0400
Subject: [PATCH 129/505] Test forms and views with labels

---
 netbox/dcim/tests/test_forms.py | 68 +++++++++++++++++++++++++++++++++
 netbox/dcim/tests/test_views.py |  4 ++
 2 files changed, 72 insertions(+)

diff --git a/netbox/dcim/tests/test_forms.py b/netbox/dcim/tests/test_forms.py
index 29e741560..116d9affc 100644
--- a/netbox/dcim/tests/test_forms.py
+++ b/netbox/dcim/tests/test_forms.py
@@ -116,3 +116,71 @@ class DeviceTestCase(TestCase):
 
         # Check that the initial value for the cluster group is set automatically when assigning the cluster
         self.assertEqual(test.initial['cluster_group'], cluster.group.pk)
+
+
+class LabelTestCase(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        site = Site.objects.create(name='Site 2', slug='site-2')
+        manufacturer = Manufacturer.objects.create(name='Manufacturer 2', slug='manufacturer-2')
+        cls.device_type = DeviceType.objects.create(
+            manufacturer=manufacturer, model='Device Type 2', slug='device-type-2', u_height=1
+        )
+        device_role = DeviceRole.objects.create(
+            name='Device Role 2', slug='device-role-2', color='ffff00'
+        )
+        cls.device = Device.objects.create(
+            name='Device 2', device_type=cls.device_type, device_role=device_role, site=site
+        )
+    
+    def test_interface_label_count_valid(self):
+        good_interface_data = {
+            'device': self.device.pk,
+            'name_pattern': 'eth[0-9]',
+            # Test that a label CAN be applied to each generated interfaces
+            'label_pattern': 'Interface[0-9]',
+            'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
+        }
+        form = InterfaceCreateForm(good_interface_data)
+        
+        print(form.errors)
+        self.assertTrue(form.is_valid())
+
+    def test_interface_label_count_mismatch(self):
+        bad_interface_data = {
+            'device': self.device.pk,
+            'name_pattern': 'eth[0-9]',
+            # Test that a label CANNOT be applied to each generated interfaces
+            'label_pattern': 'Interface[0-1]',
+            'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
+        }
+        form = InterfaceCreateForm(bad_interface_data)
+
+        self.assertFalse(form.is_valid())
+        self.assertIn('label_pattern', form.errors)
+    
+    def test_console_port_template_label_count_valid(self):
+        bad_console_port_template_data = {
+            'device_type': self.device_type,
+            'name_pattern': 'Console Port Template[4-6]',
+            # Test that a label CANNOT be applied to each generated console port templates
+            'label_pattern': 'Serial[4-6]',
+            'type': ConsolePortTypeChoices.TYPE_RJ45,
+        }
+        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
+
+        self.assertTrue(form.is_valid())
+
+    def test_console_port_template_label_count_mismatch(self):
+        bad_console_port_template_data = {
+            'device_type': self.device_type,
+            'name_pattern': 'Console Port Template[4-6]',
+            # Test that a label CANNOT be applied to each generated console port templates
+            'label_pattern': 'Serial[0-1]',
+            'type': ConsolePortTypeChoices.TYPE_RJ45,
+        }
+        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
+
+        self.assertFalse(form.is_valid())
+        self.assertIn('label_pattern', form.errors)
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 7ee5d7845..65179bf0c 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -699,6 +699,8 @@ class InterfaceTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas
         cls.bulk_create_data = {
             'device_type': devicetypes[1].pk,
             'name_pattern': 'Interface Template [4-6]',
+            # Test that a label can be applied to each generated interface templates
+            'label_pattern': 'Interface Template Label [3-5]',
             'type': InterfaceTypeChoices.TYPE_1GE_GBIC,
             'mgmt_only': True,
         }
@@ -995,6 +997,8 @@ class ConsolePortTestCase(ViewTestCases.DeviceComponentViewTestCase):
         cls.bulk_create_data = {
             'device': device.pk,
             'name_pattern': 'Console Port [4-6]',
+            # Test that a label can be applied to each generated console ports
+            'label_pattern': 'Serial[3-5]',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console port',
             'tags': 'Alpha,Bravo,Charlie',

From 4301c06d177439356d4f4da207f2af1128984293 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Mon, 8 Jun 2020 23:07:12 -0400
Subject: [PATCH 130/505] Refactorization into LabeledComponentForm

---
 netbox/dcim/forms.py      | 242 +++-----------------------------------
 netbox/utilities/forms.py |  27 +++++
 2 files changed, 44 insertions(+), 225 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 736e129a3..ca706d6f2 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -22,10 +22,10 @@ from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     APISelect, APISelectMultiple, add_blank_choice, ArrayFieldSelectMultiple, BootstrapMixin, BulkEditForm,
-    BulkEditNullBooleanSelect, ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField,
-    CSVModelForm, DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model,
-    JSONField, SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
-    BOOLEAN_WITH_BLANK_CHOICES,
+    BOOLEAN_WITH_BLANK_CHOICES, BulkEditNullBooleanSelect, ColorSelect, CommentField, ConfirmationForm, CSVChoiceField,
+    CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField,
+    form_from_model, JSONField, LabeledComponentForm, SelectWithPK, SmallTextarea, SlugField, StaticSelect2,
+    StaticSelect2Multiple, TagFilterField,
 )
 from virtualization.models import Cluster, ClusterGroup, VirtualMachine
 from .choices import *
@@ -1039,34 +1039,15 @@ class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class ConsolePortTemplateCreateForm(BootstrapMixin, forms.Form):
+class ConsolePortTemplateCreateForm(LabeledComponentForm):
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1095,34 +1076,15 @@ class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class ConsoleServerPortTemplateCreateForm(BootstrapMixin, forms.Form):
+class ConsoleServerPortTemplateCreateForm(LabeledComponentForm):
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1151,17 +1113,10 @@ class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class PowerPortTemplateCreateForm(BootstrapMixin, forms.Form):
+class PowerPortTemplateCreateForm(LabeledComponentForm):
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerPortTypeChoices),
         required=False
@@ -1177,18 +1132,6 @@ class PowerPortTemplateCreateForm(BootstrapMixin, forms.Form):
         help_text="Allocated power draw (watts)"
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1237,17 +1180,10 @@ class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
             )
 
 
-class PowerOutletTemplateCreateForm(BootstrapMixin, forms.Form):
+class PowerOutletTemplateCreateForm(LabeledComponentForm):
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerOutletTypeChoices),
         required=False
@@ -1273,18 +1209,6 @@ class PowerOutletTemplateCreateForm(BootstrapMixin, forms.Form):
             device_type=device_type
         )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -1319,17 +1243,10 @@ class InterfaceTemplateForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class InterfaceTemplateCreateForm(BootstrapMixin, forms.Form):
+class InterfaceTemplateCreateForm(LabeledComponentForm):
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=InterfaceTypeChoices,
         widget=StaticSelect2()
@@ -1339,18 +1256,6 @@ class InterfaceTemplateCreateForm(BootstrapMixin, forms.Form):
         label='Management only'
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} interfaces, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
@@ -2271,36 +2176,17 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
 # Bulk device component creation
 #
 
-class DeviceBulkAddComponentForm(BootstrapMixin, forms.Form):
+class DeviceBulkAddComponentForm(LabeledComponentForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Device.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
 
     def clean_tags(self):
         # Because we're feeding TagField data (on the bulk edit form) to another TagField (on the model form), we
         # must first convert the list of tags to a string.
         return ','.join(self.cleaned_data.get('tags'))
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 #
 # Console ports
@@ -2332,17 +2218,10 @@ class ConsolePortForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class ConsolePortCreateForm(BootstrapMixin, forms.Form):
+class ConsolePortCreateForm(LabeledComponentForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -2356,18 +2235,6 @@ class ConsolePortCreateForm(BootstrapMixin, forms.Form):
         required=False
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class ConsolePortBulkCreateForm(
     form_from_model(ConsolePort, ['type', 'description', 'tags']),
@@ -2434,17 +2301,10 @@ class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class ConsoleServerPortCreateForm(BootstrapMixin, forms.Form):
+class ConsoleServerPortCreateForm(LabeledComponentForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -2458,18 +2318,6 @@ class ConsoleServerPortCreateForm(BootstrapMixin, forms.Form):
         required=False
     )
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class ConsoleServerPortBulkCreateForm(
     form_from_model(ConsoleServerPort, ['type', 'description', 'tags']),
@@ -2550,17 +2398,10 @@ class PowerPortForm(BootstrapMixin, forms.ModelForm):
         }
 
 
-class PowerPortCreateForm(BootstrapMixin, forms.Form):
+class PowerPortCreateForm(LabeledComponentForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerPortTypeChoices),
         required=False,
@@ -2583,17 +2424,6 @@ class PowerPortCreateForm(BootstrapMixin, forms.Form):
     tags = TagField(
         required=False
     )
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
 
 
 class PowerPortBulkCreateForm(
@@ -2674,17 +2504,10 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm):
             )
 
 
-class PowerOutletCreateForm(BootstrapMixin, forms.Form):
+class PowerOutletCreateForm(LabeledComponentForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerOutletTypeChoices),
         required=False,
@@ -2715,18 +2538,6 @@ class PowerOutletCreateForm(BootstrapMixin, forms.Form):
         )
         self.fields['power_port'].queryset = PowerPort.objects.filter(device=device)
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} ports, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
 
 class PowerOutletBulkCreateForm(
     form_from_model(PowerOutlet, ['type', 'feed_leg', 'description', 'tags']),
@@ -2915,17 +2726,11 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
 
 
-class InterfaceCreateForm(BootstrapMixin, InterfaceCommonForm, forms.Form):
+class InterfaceCreateForm(InterfaceCommonForm, LabeledComponentForm):
+    component_type = 'interface'
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
     type = forms.ChoiceField(
         choices=InterfaceTypeChoices,
         widget=StaticSelect2(),
@@ -3006,25 +2811,12 @@ class InterfaceCreateForm(BootstrapMixin, InterfaceCommonForm, forms.Form):
         self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', device.site.pk)
         self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
 
-    def clean(self):
-
-        # Validate that the number of ports being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} interfaces, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            })
-
-
 
 class InterfaceBulkCreateForm(
     form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    component_type = 'interface'
 
 
 class InterfaceBulkEditForm(
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 3d8dbe33f..8e80168ab 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -804,6 +804,33 @@ class ImportForm(BootstrapMixin, forms.Form):
                 })
 
 
+class LabeledComponentForm(BootstrapMixin, forms.Form):
+    """
+    Base form for adding label pattern validation to `Create` forms
+    """
+    component_type = 'port'
+
+    name_pattern = ExpandableNameField(
+        label='Name'
+    )
+    label_pattern = ExpandableNameField(
+        label='Label',
+        required=False
+    )
+
+    def clean(self):
+
+        # Validate that the number of components being created from both the name_pattern and label_pattern are equal
+        name_pattern_count = len(self.cleaned_data['name_pattern'])
+        label_pattern_count = len(self.cleaned_data['label_pattern'])
+        if label_pattern_count and name_pattern_count != label_pattern_count:
+            raise forms.ValidationError({
+                'label_pattern': 'The provided name pattern will create {} {}s, however {} labels will '
+                'be generated. These counts must match.'.format(
+                    name_pattern_count, self.component_type, label_pattern_count)
+            }, code='label_pattern_mismatch')
+
+
 class TableConfigForm(BootstrapMixin, forms.Form):
     """
     Form for configuring user's table preferences.

From e0037c7f7045c264559db6a1fe73da151b5d3938 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Mon, 8 Jun 2020 23:07:53 -0400
Subject: [PATCH 131/505] pycodestyle

---
 netbox/dcim/api/serializers.py  | 14 +++++++-------
 netbox/dcim/tests/test_forms.py |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index a2f576aca..ffa027af6 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -261,7 +261,7 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label',  'type']
+        fields = ['id', 'device_type', 'name', 'label', 'type']
 
 
 class PowerPortTemplateSerializer(ValidatedModelSerializer):
@@ -274,7 +274,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label',  'type', 'maximum_draw', 'allocated_draw']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw']
 
 
 class PowerOutletTemplateSerializer(ValidatedModelSerializer):
@@ -295,7 +295,7 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
-        fields = ['id', 'device_type', 'name', 'label',  'type', 'power_port', 'feed_leg']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg']
 
 
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
@@ -446,7 +446,7 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer)
     class Meta:
         model = ConsoleServerPort
         fields = [
-            'id', 'device', 'name', 'label',  'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
+            'id', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
             'connection_status', 'cable', 'tags',
         ]
 
@@ -464,7 +464,7 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = ConsolePort
         fields = [
-            'id', 'device', 'name', 'label',  'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
+            'id', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
             'connection_status', 'cable', 'tags',
         ]
 
@@ -494,7 +494,7 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = PowerOutlet
         fields = [
-            'id', 'device', 'name', 'label',  'type', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type',
+            'id', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type',
             'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
@@ -512,7 +512,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = PowerPort
         fields = [
-            'id', 'device', 'name', 'label',  'type', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
+            'id', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
             'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
diff --git a/netbox/dcim/tests/test_forms.py b/netbox/dcim/tests/test_forms.py
index 116d9affc..1fc18c3d3 100644
--- a/netbox/dcim/tests/test_forms.py
+++ b/netbox/dcim/tests/test_forms.py
@@ -133,7 +133,7 @@ class LabelTestCase(TestCase):
         cls.device = Device.objects.create(
             name='Device 2', device_type=cls.device_type, device_role=device_role, site=site
         )
-    
+
     def test_interface_label_count_valid(self):
         good_interface_data = {
             'device': self.device.pk,
@@ -143,7 +143,7 @@ class LabelTestCase(TestCase):
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
         }
         form = InterfaceCreateForm(good_interface_data)
-        
+
         print(form.errors)
         self.assertTrue(form.is_valid())
 
@@ -159,7 +159,7 @@ class LabelTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertIn('label_pattern', form.errors)
-    
+
     def test_console_port_template_label_count_valid(self):
         bad_console_port_template_data = {
             'device_type': self.device_type,

From 5cdaaed311d605b91278fd3404a67fe12b7d0067 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 14:04:55 -0400
Subject: [PATCH 132/505] Use a single migration for `labels`

---
 ...port_label.py => 0107_component_labels.py} | 14 +++++++++--
 .../dcim/migrations/0107_interface_label.py   | 23 -------------------
 2 files changed, 12 insertions(+), 25 deletions(-)
 rename netbox/dcim/migrations/{0108_port_label.py => 0107_component_labels.py} (77%)
 delete mode 100644 netbox/dcim/migrations/0107_interface_label.py

diff --git a/netbox/dcim/migrations/0108_port_label.py b/netbox/dcim/migrations/0107_component_labels.py
similarity index 77%
rename from netbox/dcim/migrations/0108_port_label.py
rename to netbox/dcim/migrations/0107_component_labels.py
index af0aa1962..9aa496134 100644
--- a/netbox/dcim/migrations/0108_port_label.py
+++ b/netbox/dcim/migrations/0107_component_labels.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.7 on 2020-06-05 14:32
+# Generated by Django 3.0.7 on 2020-06-04 20:37
 
 from django.db import migrations, models
 
@@ -6,10 +6,20 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dcim', '0107_interface_label'),
+        ('dcim', '0106_role_default_color'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='interface',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='interfacetemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
         migrations.AddField(
             model_name='consoleport',
             name='label',
diff --git a/netbox/dcim/migrations/0107_interface_label.py b/netbox/dcim/migrations/0107_interface_label.py
deleted file mode 100644
index 48970d25d..000000000
--- a/netbox/dcim/migrations/0107_interface_label.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.0.7 on 2020-06-04 20:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0106_role_default_color'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='interface',
-            name='label',
-            field=models.CharField(blank=True, max_length=64),
-        ),
-        migrations.AddField(
-            model_name='interfacetemplate',
-            name='label',
-            field=models.CharField(blank=True, max_length=64),
-        ),
-    ]

From 88ae522c9a3be60ece80e13a02815f716458dbf8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 14:55:46 -0400
Subject: [PATCH 133/505] Closes #4742: Add tagging for cables, power panels,
 and rack reservations

---
 docs/release-notes/version-2.9.md             |  4 +++
 netbox/dcim/api/serializers.py                |  9 ++++--
 netbox/dcim/filters.py                        |  3 ++
 netbox/dcim/forms.py                          | 25 ++++++++++++----
 netbox/dcim/migrations/0107_add_tags.py       | 30 +++++++++++++++++++
 netbox/dcim/models/__init__.py                |  3 ++
 netbox/dcim/tables.py                         | 16 ++++++++--
 netbox/dcim/tests/test_views.py               |  3 ++
 netbox/templates/dcim/cable.html              |  1 +
 netbox/templates/dcim/inc/cable_form.html     |  1 +
 netbox/templates/dcim/powerpanel.html         |  1 +
 netbox/templates/dcim/rackreservation.html    |  1 +
 .../templates/dcim/rackreservation_edit.html  |  1 +
 13 files changed, 86 insertions(+), 12 deletions(-)
 create mode 100644 netbox/dcim/migrations/0107_add_tags.py

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 7c63af51c..ce480035e 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -8,6 +8,10 @@
 
 NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of constraints. The permission will apply only to objects which match the specified constraints. For example, assigning permission to modify devices with the constraint `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
 
+### Enhancements
+
+* [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
+
 ### Configuration Changes
 
 * `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`.
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 9ac58dc3a..9174085b8 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -165,10 +165,11 @@ class RackReservationSerializer(ValidatedModelSerializer):
     rack = NestedRackSerializer()
     user = NestedUserSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
+    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = RackReservation
-        fields = ['id', 'rack', 'units', 'created', 'user', 'tenant', 'description']
+        fields = ['id', 'rack', 'units', 'created', 'user', 'tenant', 'description', 'tags']
 
 
 class RackElevationDetailFilterSerializer(serializers.Serializer):
@@ -640,12 +641,13 @@ class CableSerializer(ValidatedModelSerializer):
     termination_b = serializers.SerializerMethodField(read_only=True)
     status = ChoiceField(choices=CableStatusChoices, required=False)
     length_unit = ChoiceField(choices=CableLengthUnitChoices, allow_blank=True, required=False)
+    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Cable
         fields = [
             'id', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type', 'termination_b_id',
-            'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit',
+            'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', 'tags',
         ]
 
     def _get_termination(self, obj, side):
@@ -729,11 +731,12 @@ class PowerPanelSerializer(ValidatedModelSerializer):
         allow_null=True,
         default=None
     )
+    tags = TagListSerializerField(required=False)
     powerfeed_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = PowerPanel
-        fields = ['id', 'site', 'rack_group', 'name', 'powerfeed_count']
+        fields = ['id', 'site', 'rack_group', 'name', 'tags', 'powerfeed_count']
 
 
 class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 8c24180bb..92f7f8241 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -298,6 +298,7 @@ class RackReservationFilterSet(BaseFilterSet, TenancyFilterSet):
         to_field_name='username',
         label='User (name)',
     )
+    tag = TagFilter()
 
     class Meta:
         model = RackReservation
@@ -1117,6 +1118,7 @@ class CableFilterSet(BaseFilterSet):
         method='filter_device',
         field_name='device__tenant__slug'
     )
+    tag = TagFilter()
 
     class Meta:
         model = Cable
@@ -1265,6 +1267,7 @@ class PowerPanelFilterSet(BaseFilterSet):
         lookup_expr='in',
         label='Rack group (ID)',
     )
+    tag = TagFilter()
 
     class Meta:
         model = PowerPanel
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 94cf51fcd..cd728cd19 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -750,11 +750,14 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
         ),
         widget=StaticSelect2()
     )
+    tags = TagField(
+        required=False
+    )
 
     class Meta:
         model = RackReservation
         fields = [
-            'rack', 'units', 'user', 'tenant_group', 'tenant', 'description',
+            'rack', 'units', 'user', 'tenant_group', 'tenant', 'description', 'tags',
         ]
 
     def __init__(self, *args, **kwargs):
@@ -825,7 +828,7 @@ class RackReservationCSVForm(CSVModelForm):
             self.fields['rack'].queryset = self.fields['rack'].queryset.filter(**params)
 
 
-class RackReservationBulkEditForm(BootstrapMixin, BulkEditForm):
+class RackReservationBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=RackReservation.objects.all(),
         widget=forms.MultipleHiddenInput()
@@ -851,6 +854,7 @@ class RackReservationBulkEditForm(BootstrapMixin, BulkEditForm):
 
 
 class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm):
+    model = RackReservation
     field_order = ['q', 'site', 'group_id', 'tenant_group', 'tenant']
     q = forms.CharField(
         required=False,
@@ -872,6 +876,7 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm):
             null_option=True,
         )
     )
+    tag = TagFilterField(model)
 
 
 #
@@ -3662,11 +3667,14 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
 
 
 class CableForm(BootstrapMixin, forms.ModelForm):
+    tags = TagField(
+        required=False
+    )
 
     class Meta:
         model = Cable
         fields = [
-            'type', 'status', 'label', 'color', 'length', 'length_unit',
+            'type', 'status', 'label', 'color', 'length', 'length_unit', 'tags',
         ]
         widgets = {
             'status': StaticSelect2,
@@ -3799,7 +3807,7 @@ class CableCSVForm(CSVModelForm):
         return length_unit if length_unit is not None else ''
 
 
-class CableBulkEditForm(BootstrapMixin, BulkEditForm):
+class CableBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Cable.objects.all(),
         widget=forms.MultipleHiddenInput
@@ -3912,6 +3920,7 @@ class CableFilterForm(BootstrapMixin, forms.Form):
         required=False,
         label='Device'
     )
+    tag = TagFilterField(model)
 
 
 #
@@ -4325,11 +4334,14 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm):
         queryset=RackGroup.objects.all(),
         required=False
     )
+    tags = TagField(
+        required=False
+    )
 
     class Meta:
         model = PowerPanel
         fields = [
-            'site', 'rack_group', 'name',
+            'site', 'rack_group', 'name', 'tags',
         ]
 
 
@@ -4359,7 +4371,7 @@ class PowerPanelCSVForm(CSVModelForm):
             self.fields['rack_group'].queryset = self.fields['rack_group'].queryset.filter(**params)
 
 
-class PowerPanelBulkEditForm(BootstrapMixin, BulkEditForm):
+class PowerPanelBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=PowerPanel.objects.all(),
         widget=forms.MultipleHiddenInput
@@ -4420,6 +4432,7 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
             null_option=True,
         )
     )
+    tag = TagFilterField(model)
 
 
 #
diff --git a/netbox/dcim/migrations/0107_add_tags.py b/netbox/dcim/migrations/0107_add_tags.py
new file mode 100644
index 000000000..2f7d29b96
--- /dev/null
+++ b/netbox/dcim/migrations/0107_add_tags.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.6 on 2020-06-10 18:32
+
+from django.db import migrations
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0042_customfield_manager'),
+        ('dcim', '0106_role_default_color'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cable',
+            name='tags',
+            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
+        ),
+        migrations.AddField(
+            model_name='powerpanel',
+            name='tags',
+            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
+        ),
+        migrations.AddField(
+            model_name='rackreservation',
+            name='tags',
+            field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'),
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 73220d1f0..f7411ca56 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -832,6 +832,7 @@ class RackReservation(ChangeLoggedModel):
     description = models.CharField(
         max_length=200
     )
+    tags = TaggableManager(through=TaggedItem)
 
     objects = RestrictedQuerySet.as_manager()
 
@@ -1832,6 +1833,7 @@ class PowerPanel(ChangeLoggedModel):
     name = models.CharField(
         max_length=50
     )
+    tags = TaggableManager(through=TaggedItem)
 
     objects = RestrictedQuerySet.as_manager()
 
@@ -2106,6 +2108,7 @@ class Cable(ChangeLoggedModel):
         blank=True,
         null=True
     )
+    tags = TaggableManager(through=TaggedItem)
 
     objects = RestrictedQuerySet.as_manager()
 
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 9018625a0..0d7b4bb7a 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -399,6 +399,9 @@ class RackReservationTable(BaseTable):
         orderable=False,
         verbose_name='Units'
     )
+    tags = TagColumn(
+        url_name='dcim:rackreservation_list'
+    )
     actions = tables.TemplateColumn(
         template_code=RACKRESERVATION_ACTIONS,
         attrs={'td': {'class': 'text-right noprint'}},
@@ -408,7 +411,8 @@ class RackReservationTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = RackReservation
         fields = (
-            'pk', 'reservation', 'site', 'rack', 'unit_list', 'user', 'created', 'tenant', 'description', 'actions',
+            'pk', 'reservation', 'site', 'rack', 'unit_list', 'user', 'created', 'tenant', 'description', 'tags',
+            'actions',
         )
         default_columns = (
             'pk', 'reservation', 'site', 'rack', 'unit_list', 'user', 'description', 'actions',
@@ -1086,12 +1090,15 @@ class CableTable(BaseTable):
         order_by='_abs_length'
     )
     color = ColorColumn()
+    tags = TagColumn(
+        url_name='dcim:cable_list'
+    )
 
     class Meta(BaseTable.Meta):
         model = Cable
         fields = (
             'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
-            'status', 'type', 'color', 'length',
+            'status', 'type', 'color', 'length', 'tags',
         )
         default_columns = (
             'pk', 'id', 'label', 'termination_a_parent', 'termination_a', 'termination_b_parent', 'termination_b',
@@ -1245,10 +1252,13 @@ class PowerPanelTable(BaseTable):
         template_code=POWERPANEL_POWERFEED_COUNT,
         verbose_name='Feeds'
     )
+    tags = TagColumn(
+        url_name='dcim:powerpanel_list'
+    )
 
     class Meta(BaseTable.Meta):
         model = PowerPanel
-        fields = ('pk', 'name', 'site', 'rack_group', 'powerfeed_count')
+        fields = ('pk', 'name', 'site', 'rack_group', 'powerfeed_count', 'tags')
         default_columns = ('pk', 'name', 'site', 'rack_group', 'powerfeed_count')
 
 
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index cfbb2b95f..82657afb9 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -202,6 +202,7 @@ class RackReservationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'user': user3.pk,
             'tenant': None,
             'description': 'Rack reservation',
+            'tags': 'Alpha,Bravo,Charlie',
         }
 
         cls.csv_data = (
@@ -1510,6 +1511,7 @@ class CableTestCase(
             'color': 'c0c0c0',
             'length': 100,
             'length_unit': CableLengthUnitChoices.UNIT_FOOT,
+            'tags': 'Alpha,Bravo,Charlie',
         }
 
         cls.csv_data = (
@@ -1609,6 +1611,7 @@ class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'site': sites[1].pk,
             'rack_group': rackgroups[1].pk,
             'name': 'Power Panel X',
+            'tags': 'Alpha,Bravo,Charlie',
         }
 
         cls.csv_data = (
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index e6a2fa008..91c7b1a94 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -81,6 +81,7 @@
                     </tr>
                 </table>
             </div>
+            {% include 'extras/inc/tags_panel.html' with tags=cable.tags.all url='dcim:cable_list' %}
             {% plugin_left_page cable %}
         </div>
         <div class="col-md-6">
diff --git a/netbox/templates/dcim/inc/cable_form.html b/netbox/templates/dcim/inc/cable_form.html
index a52cc302e..98eca17d2 100644
--- a/netbox/templates/dcim/inc/cable_form.html
+++ b/netbox/templates/dcim/inc/cable_form.html
@@ -29,5 +29,6 @@
                 {% endif %}
             </div>
         </div>
+        {% render_field form.tags %}
     </div>
 </div>
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 3ee8d80e0..90956d2a3 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -82,6 +82,7 @@
                 </tr>
             </table>
         </div>
+        {% include 'extras/inc/tags_panel.html' with tags=powerpanel.tags.all url='dcim:powerpanel_list' %}
         {% plugin_left_page powerpanel %}
     </div>
 	<div class="col-md-9">
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index d4bbbc97d..ab0fc0bba 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -124,6 +124,7 @@
                 </tr>
             </table>
         </div>
+        {% include 'extras/inc/tags_panel.html' with tags=rackreservation.tags.all url='dcim:rackreservation_list' %}
         {% plugin_left_page rackreservation %}
 	</div>
     <div class="col-md-6">
diff --git a/netbox/templates/dcim/rackreservation_edit.html b/netbox/templates/dcim/rackreservation_edit.html
index b2304974e..3db8f6d72 100644
--- a/netbox/templates/dcim/rackreservation_edit.html
+++ b/netbox/templates/dcim/rackreservation_edit.html
@@ -16,6 +16,7 @@
             {% render_field form.tenant_group %}
             {% render_field form.tenant %}
             {% render_field form.description %}
+            {% render_field form.tags %}
         </div>
     </div>
 {% endblock %}

From f041c762ac4f33153de34e32fc41485185dd9207 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <xxinfinityxx@gmail.com>
Date: Wed, 10 Jun 2020 14:59:23 -0400
Subject: [PATCH 134/505] Prevent the table cell from rendering empty for
 `interface.label`

Co-authored-by: Jeremy Stretch <jeremy.stretch@networktocode.com>
---
 netbox/templates/dcim/interface.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index d35504368..5714c8940 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -60,7 +60,7 @@
                 </tr>
                 <tr>
                     <td>Label</td>
-                    <td>{{ interface.label }}</td>
+                    <td>{{ interface.label|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Type</td>

From 58b4f6abca2f488dd47976f435466b6e60b4078f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 15:05:15 -0400
Subject: [PATCH 135/505] Update v2.9 release notes

---
 docs/release-notes/index.md       | 2 +-
 docs/release-notes/version-2.9.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
index 364b2cd9d..f314c5371 120000
--- a/docs/release-notes/index.md
+++ b/docs/release-notes/index.md
@@ -1 +1 @@
-version-2.8.md
\ No newline at end of file
+version-2.9.md
\ No newline at end of file
diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index ce480035e..a190662d2 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -14,6 +14,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 ### Configuration Changes
 
+* If in use, LDAP authentication must be enabled by setting `REMOTE_AUTH_BACKEND` to `'netbox.authentication.LDAPBackend'`. (LDAP configuration parameters in `ldap_config.py` remain unchanged.)
 * `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`.
 
 ### Other Changes

From 3b54d6f8e505211cd209a2332f12ff369b049b9c Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 15:11:47 -0400
Subject: [PATCH 136/505] No need to reference the model itself

---
 netbox/dcim/models/device_component_templates.py | 10 +++++-----
 netbox/dcim/models/device_components.py          | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index acb5f0d46..3530d77de 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -72,7 +72,7 @@ class ConsolePortTemplate(ComponentTemplateModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this console port"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -117,7 +117,7 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this console server port"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -162,7 +162,7 @@ class PowerPortTemplate(ComponentTemplateModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this power supply port"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -221,7 +221,7 @@ class PowerOutletTemplate(ComponentTemplateModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this power outlet"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -294,7 +294,7 @@ class InterfaceTemplate(ComponentTemplateModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this interface"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index b8331365d..5a79519a2 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -234,7 +234,7 @@ class ConsolePort(CableTermination, ComponentModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this console port"
+        help_text="Physical label"
     )
     _name = NaturalOrderingField(
         target_field='name',
@@ -308,7 +308,7 @@ class ConsoleServerPort(CableTermination, ComponentModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this console server port"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -370,7 +370,7 @@ class PowerPort(CableTermination, ComponentModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this power supply port"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -540,7 +540,7 @@ class PowerOutlet(CableTermination, ComponentModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this power outlet"
+        help_text="Physical label"
     )
     type = models.CharField(
         max_length=50,
@@ -636,7 +636,7 @@ class Interface(CableTermination, ComponentModel):
     label = models.CharField(
         max_length=64,
         blank=True,
-        help_text="The physical label for this interface"
+        help_text="Physical label"
     )
     _connected_interface = models.OneToOneField(
         to='self',

From 4078d9b66908e6af2c69740af4c1f5c7be6a1cfe Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 15:22:49 -0400
Subject: [PATCH 137/505] Remove extraneous test

---
 netbox/dcim/tests/test_api.py | 38 ++++++++++-------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 60a6dc122..e579f9cd0 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -242,31 +242,6 @@ class RackTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    # TODO: Document this test
-    def test_get_elevation_rack_units(self):
-        rack = Rack.objects.first()
-
-        self.add_permissions('dcim.view_rack')
-        url = '{}?q=3'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['count'], 13)
-
-        url = '{}?q=U3'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['count'], 11)
-
-        url = '{}?q=10'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['count'], 1)
-
-        url = '{}?q=U20'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
-        response = self.client.get(url, **self.header)
-
-        self.assertEqual(response.data['count'], 1)
-
     def test_get_rack_elevation(self):
         """
         GET a single rack elevation.
@@ -274,10 +249,19 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         rack = Rack.objects.first()
         self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk})
-        response = self.client.get(url, **self.header)
 
+        # Retrieve all units
+        response = self.client.get(url, **self.header)
         self.assertEqual(response.data['count'], 42)
 
+        # Search for specific units
+        response = self.client.get(f'{url}?q=3', **self.header)
+        self.assertEqual(response.data['count'], 13)
+        response = self.client.get(f'{url}?q=U3', **self.header)
+        self.assertEqual(response.data['count'], 11)
+        response = self.client.get(f'{url}?q=U10', **self.header)
+        self.assertEqual(response.data['count'], 1)
+
     def test_get_rack_elevation_svg(self):
         """
         GET a single rack elevation in SVG format.
@@ -285,8 +269,8 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         rack = Rack.objects.first()
         self.add_permissions('dcim.view_rack')
         url = '{}?render=svg'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
-        response = self.client.get(url, **self.header)
 
+        response = self.client.get(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.get('Content-Type'), 'image/svg+xml')
 

From 1f727f565f468c1ba67c5a3e5b01b25f7827b4d9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 16:11:28 -0400
Subject: [PATCH 138/505] Adopted fix from #4743 and updated API tests

---
 netbox/ipam/api/views.py      | 2 +-
 netbox/ipam/tests/test_api.py | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index dd3652b1f..69adc0c29 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -164,7 +164,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
             200: serializers.AvailableIPSerializer(many=True),
         }
     )
-    @action(detail=True, url_path='available-ips', methods=['get', 'post'])
+    @action(detail=True, url_path='available-ips', methods=['get', 'post'], queryset=IPAddress.objects.all())
     @advisory_lock(ADVISORY_LOCK_KEYS['available-ips'])
     def available_ips(self, request, pk=None):
         """
diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py
index 41f39703c..70ae738b5 100644
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -276,8 +276,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         vrf = VRF.objects.create(name='Test VRF 1', rd='1234')
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/30'), vrf=vrf, is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
-        # TODO: ipam.add_prefix should not be required
-        self.add_permissions('ipam.add_prefix', 'ipam.add_ipaddress')
+        self.add_permissions('ipam.add_ipaddress')
 
         # Create all four available IPs with individual requests
         for i in range(1, 5):
@@ -300,8 +299,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
-        # TODO: ipam.add_prefix, ipam.view_prefix should not be required
-        self.add_permissions('ipam.add_prefix', 'ipam.view_prefix', 'ipam.view_ipaddress', 'ipam.add_ipaddress')
+        self.add_permissions('ipam.view_ipaddress', 'ipam.add_ipaddress')
 
         # Try to create nine IPs (only eight are available)
         data = [{'description': 'Test IP {}'.format(i)} for i in range(1, 10)]  # 9 IPs

From e13320f58d5060e9bdd9958cbbf50d07d0a156f1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 16:37:35 -0400
Subject: [PATCH 139/505] Fix permissions enforcement for
 VirtualChassisEditView

---
 netbox/dcim/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index de2bf80e5..846cec506 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2233,7 +2233,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
 
     def get(self, request, pk):
 
-        virtual_chassis = get_object_or_404(VirtualChassis, pk=pk)
+        virtual_chassis = get_object_or_404(self.queryset, pk=pk)
         VCMemberFormSet = modelformset_factory(
             model=Device,
             form=forms.DeviceVCMembershipForm,
@@ -2254,7 +2254,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
 
     def post(self, request, pk):
 
-        virtual_chassis = get_object_or_404(VirtualChassis, pk=pk)
+        virtual_chassis = get_object_or_404(self.queryset, pk=pk)
         VCMemberFormSet = modelformset_factory(
             model=Device,
             form=forms.DeviceVCMembershipForm,

From 81d08ac50bd4425c728bcb4de41922738f657014 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 16:41:52 -0400
Subject: [PATCH 140/505] Stay consistent with codebase: i vs pos

---
 netbox/utilities/views.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 462e45819..1fe407dad 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -921,13 +921,13 @@ class ComponentCreateView(GetReturnURLMixin, View):
 
             names = form.cleaned_data['name_pattern']
             labels = form.cleaned_data.get('label_pattern')
-            for pos, name in enumerate(names):
-                label = labels[pos] if labels else None
+            for i, name in enumerate(names):
+                label = labels[i] if labels else None
                 # Initialize the individual component form
                 data['name'] = name
                 data['label'] = label
                 if hasattr(form, 'get_iterative_data'):
-                    data.update(form.get_iterative_data(pos))
+                    data.update(form.get_iterative_data(i))
                 component_form = self.model_form(data)
 
                 if component_form.is_valid():
@@ -1009,8 +1009,8 @@ class BulkComponentCreateView(GetReturnURLMixin, View):
 
                             names = data['name_pattern']
                             labels = data['label_pattern']
-                            for pos, name in enumerate(names):
-                                label = labels[pos] if labels else None
+                            for i, name in enumerate(names):
+                                label = labels[i] if labels else None
 
                                 component_data = {
                                     self.parent_field: obj.pk,

From 8e9dc9f20e801fb5263274550717049407ad9ff5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 16:51:35 -0400
Subject: [PATCH 141/505] Add EditObjectViewTestCase for VirtualChassis

---
 netbox/dcim/tests/test_views.py | 58 ++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 82657afb9..cc7b8aa60 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -323,6 +323,7 @@ class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 
 
 # TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by absence of bulk import view for DeviceTypes
 class DeviceTypeTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.CreateObjectViewTestCase,
@@ -803,6 +804,7 @@ class RearPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase
 
 
 # TODO: Change base class to DeviceComponentTemplateViewTestCase
+# Blocked by absence of bulk edit view for DeviceBays
 class DeviceBayTemplateTestCase(
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
@@ -1451,6 +1453,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
 
 
 # TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by lack of common creation view for cables (termination A must be initialized)
 class CableTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
@@ -1532,8 +1535,10 @@ class CableTestCase(
 
 
 # TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by standard creation, bulk creation views for VirtualChassis (member devices must be selected in bulk)
 class VirtualChassisTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkEditObjectsViewTestCase,
@@ -1554,32 +1559,39 @@ class VirtualChassisTestCase(
         )
 
         # Create 9 member Devices
-        device1 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 1', site=site
-        )
-        device2 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 2', site=site
-        )
-        device3 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 3', site=site
-        )
-        device4 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 4', site=site
-        )
-        device5 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 5', site=site
-        )
-        device6 = Device.objects.create(
-            device_type=device_type, device_role=device_role, name='Device 6', site=site
+        devices = (
+            Device(device_type=device_type, device_role=device_role, name='Device 1', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 2', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 3', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 4', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 5', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 6', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 7', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 8', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 9', site=site),
         )
+        Device.objects.bulk_create(devices)
 
         # Create three VirtualChassis with two members each
-        vc1 = VirtualChassis.objects.create(master=device1, domain='test-domain-1')
-        Device.objects.filter(pk=device2.pk).update(virtual_chassis=vc1, vc_position=2)
-        vc2 = VirtualChassis.objects.create(master=device3, domain='test-domain-2')
-        Device.objects.filter(pk=device4.pk).update(virtual_chassis=vc2, vc_position=2)
-        vc3 = VirtualChassis.objects.create(master=device5, domain='test-domain-3')
-        Device.objects.filter(pk=device6.pk).update(virtual_chassis=vc3, vc_position=2)
+        vc1 = VirtualChassis.objects.create(master=devices[0], domain='domain-1')
+        Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=vc1, vc_position=2)
+        Device.objects.filter(pk=devices[2].pk).update(virtual_chassis=vc1, vc_position=3)
+        vc2 = VirtualChassis.objects.create(master=devices[3], domain='domain-2')
+        Device.objects.filter(pk=devices[4].pk).update(virtual_chassis=vc2, vc_position=2)
+        Device.objects.filter(pk=devices[5].pk).update(virtual_chassis=vc2, vc_position=3)
+        vc3 = VirtualChassis.objects.create(master=devices[6], domain='domain-3')
+        Device.objects.filter(pk=devices[7].pk).update(virtual_chassis=vc3, vc_position=2)
+        Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=vc3, vc_position=3)
+
+        cls.form_data = {
+            'master': devices[1].pk,
+            'domain': 'domain-x',
+            # Management form data for VC members
+            'form-TOTAL_FORMS': 0,
+            'form-INITIAL_FORMS': 3,
+            'form-MIN_NUM_FORMS': 0,
+            'form-MAX_NUM_FORMS': 1000,
+        }
 
 
 class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):

From d26fcc991862251c8756a0c6e543fada8d6ca7a4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 10 Jun 2020 16:56:24 -0400
Subject: [PATCH 142/505] Annotated blocked TODO items

---
 netbox/extras/tests/test_views.py         | 2 ++
 netbox/ipam/tests/test_views.py           | 1 +
 netbox/virtualization/tests/test_views.py | 1 +
 3 files changed, 4 insertions(+)

diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index 6d41886fc..9ad29fd80 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -11,6 +11,7 @@ from utilities.testing import ViewTestCases, TestCase
 
 
 # TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by #3703
 class TagTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
@@ -43,6 +44,7 @@ class TagTestCase(
 
 
 # TODO: Change base class to PrimaryObjectViewTestCase
+# Blocked by absence of standard create/edit, bulk create views
 class ConfigContextTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index 794284dba..43ac565ad 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -334,6 +334,7 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 
 # TODO: Update base class to PrimaryObjectViewTestCase
+# Blocked by absence of standard creation view
 class ServiceTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 9fde12186..b6f5be8b2 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -186,6 +186,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 
 # TODO: Update base class to DeviceComponentViewTestCase
+# Blocked by #4721
 class InterfaceTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,

From e3a8638471a0fd7ea33788e4bd047ead31751c81 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 22:04:45 -0400
Subject: [PATCH 143/505] Move `__str__()` to the abstract class

---
 .../dcim/models/device_component_templates.py | 30 ++++---------------
 netbox/dcim/models/device_components.py       | 30 ++++---------------
 2 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 3530d77de..53080d8f6 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -30,6 +30,11 @@ class ComponentTemplateModel(models.Model):
     class Meta:
         abstract = True
 
+    def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
+        return self.name
+
     def instantiate(self, device):
         """
         Instantiate a new component on the specified Device.
@@ -84,11 +89,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def instantiate(self, device):
         return ConsolePort(
             device=device,
@@ -129,11 +129,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def instantiate(self, device):
         return ConsoleServerPort(
             device=device,
@@ -186,11 +181,6 @@ class PowerPortTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def instantiate(self, device):
         return PowerPort(
             device=device,
@@ -246,11 +236,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def clean(self):
 
         # Validate power port assignment
@@ -309,11 +294,6 @@ class InterfaceTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def instantiate(self, device):
         return Interface(
             device=device,
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 5a79519a2..022b2733d 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -44,6 +44,11 @@ class ComponentModel(models.Model):
     class Meta:
         abstract = True
 
+    def __str__(self):
+        if self.label:
+            return f"{self.name} ({self.label})"
+        return self.name
+
     def to_objectchange(self, action):
         # Annotate the parent Device/VM
         try:
@@ -266,11 +271,6 @@ class ConsolePort(CableTermination, ComponentModel):
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
@@ -328,11 +328,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
@@ -416,11 +411,6 @@ class PowerPort(CableTermination, ComponentModel):
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
@@ -573,11 +563,6 @@ class PowerOutlet(CableTermination, ComponentModel):
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def get_absolute_url(self):
         return self.device.get_absolute_url()
 
@@ -718,11 +703,6 @@ class Interface(CableTermination, ComponentModel):
         ordering = ('device', CollateAsChar('_name'))
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return f"{self.name} ({self.label})"
-        return self.name
-
     def get_absolute_url(self):
         return reverse('dcim:interface', kwargs={'pk': self.pk})
 

From cf81a8979f13b0481156bc8f9b0037d02ffa82e5 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 22:10:45 -0400
Subject: [PATCH 144/505] Avoid `component_type` on subclasses

---
 netbox/dcim/forms.py      | 3 +--
 netbox/utilities/forms.py | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index ca706d6f2..81f8775ec 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2727,7 +2727,6 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
 
 
 class InterfaceCreateForm(InterfaceCommonForm, LabeledComponentForm):
-    component_type = 'interface'
     device = DynamicModelChoiceField(
         queryset=Device.objects.prefetch_related('device_type__manufacturer')
     )
@@ -2816,7 +2815,7 @@ class InterfaceBulkCreateForm(
     form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
-    component_type = 'interface'
+    pass
 
 
 class InterfaceBulkEditForm(
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 8e80168ab..1dfa3d608 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -808,8 +808,6 @@ class LabeledComponentForm(BootstrapMixin, forms.Form):
     """
     Base form for adding label pattern validation to `Create` forms
     """
-    component_type = 'port'
-
     name_pattern = ExpandableNameField(
         label='Name'
     )
@@ -825,9 +823,9 @@ class LabeledComponentForm(BootstrapMixin, forms.Form):
         label_pattern_count = len(self.cleaned_data['label_pattern'])
         if label_pattern_count and name_pattern_count != label_pattern_count:
             raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} {}s, however {} labels will '
+                'label_pattern': 'The provided name pattern will create {} components, however {} labels will '
                 'be generated. These counts must match.'.format(
-                    name_pattern_count, self.component_type, label_pattern_count)
+                    name_pattern_count, label_pattern_count)
             }, code='label_pattern_mismatch')
 
 

From 25cbab2ea4b5c8a9b79ed67759bf9ad155aad595 Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <xxinfinityxx@gmail.com>
Date: Wed, 10 Jun 2020 22:16:46 -0400
Subject: [PATCH 145/505] Avoid checking `field` twice on all iterations

Yields a small performance improvement

Co-authored-by: Jeremy Stretch <jeremy.stretch@networktocode.com>
---
 netbox/utilities/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 1fe407dad..ee39707e8 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -937,7 +937,7 @@ class ComponentCreateView(GetReturnURLMixin, View):
                         # Assign errors on the child form's name/label field to name_pattern/label_pattern on the parent form
                         if field == 'name':
                             field = 'name_pattern'
-                        if field == 'label':
+                        elif field == 'label':
                             field = 'label_pattern'
                         for e in errors:
                             form.add_error(field, '{}: {}'.format(name, ', '.join(e)))

From c1eea166c9ed76dfafdce87feefd1857ea3ae5dc Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Wed, 10 Jun 2020 22:58:52 -0400
Subject: [PATCH 146/505] Fix tests for LabeledComponentForm * Added docstring
 * Removed redundant tests since refactoration

---
 netbox/dcim/tests/test_forms.py | 34 ++++-----------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/netbox/dcim/tests/test_forms.py b/netbox/dcim/tests/test_forms.py
index 1fc18c3d3..aadc2cbfc 100644
--- a/netbox/dcim/tests/test_forms.py
+++ b/netbox/dcim/tests/test_forms.py
@@ -135,23 +135,22 @@ class LabelTestCase(TestCase):
         )
 
     def test_interface_label_count_valid(self):
-        good_interface_data = {
+        """Test that a `label` can be generated for each generated `name` from `name_pattern` on InterfaceCreateForm"""
+        interface_data = {
             'device': self.device.pk,
             'name_pattern': 'eth[0-9]',
-            # Test that a label CAN be applied to each generated interfaces
             'label_pattern': 'Interface[0-9]',
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
         }
-        form = InterfaceCreateForm(good_interface_data)
+        form = InterfaceCreateForm(interface_data)
 
-        print(form.errors)
         self.assertTrue(form.is_valid())
 
     def test_interface_label_count_mismatch(self):
+        """Test that a `label` cannot be generated for each generated `name` from `name_pattern` due to invalid `label_pattern` on InterfaceCreateForm"""
         bad_interface_data = {
             'device': self.device.pk,
             'name_pattern': 'eth[0-9]',
-            # Test that a label CANNOT be applied to each generated interfaces
             'label_pattern': 'Interface[0-1]',
             'type': InterfaceTypeChoices.TYPE_100ME_FIXED,
         }
@@ -159,28 +158,3 @@ class LabelTestCase(TestCase):
 
         self.assertFalse(form.is_valid())
         self.assertIn('label_pattern', form.errors)
-
-    def test_console_port_template_label_count_valid(self):
-        bad_console_port_template_data = {
-            'device_type': self.device_type,
-            'name_pattern': 'Console Port Template[4-6]',
-            # Test that a label CANNOT be applied to each generated console port templates
-            'label_pattern': 'Serial[4-6]',
-            'type': ConsolePortTypeChoices.TYPE_RJ45,
-        }
-        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
-
-        self.assertTrue(form.is_valid())
-
-    def test_console_port_template_label_count_mismatch(self):
-        bad_console_port_template_data = {
-            'device_type': self.device_type,
-            'name_pattern': 'Console Port Template[4-6]',
-            # Test that a label CANNOT be applied to each generated console port templates
-            'label_pattern': 'Serial[0-1]',
-            'type': ConsolePortTypeChoices.TYPE_RJ45,
-        }
-        form = ConsolePortTemplateCreateForm(bad_console_port_template_data)
-
-        self.assertFalse(form.is_valid())
-        self.assertIn('label_pattern', form.errors)

From a37d06064a9a2200fa6007d4000c68dd8fe81bec Mon Sep 17 00:00:00 2001
From: Jonathan Senecal <contact@jonathansenecal.com>
Date: Thu, 11 Jun 2020 10:19:53 -0400
Subject: [PATCH 147/505] Add `label` to DeviceBay models and serializers

---
 netbox/dcim/api/serializers.py                   |  4 ++--
 netbox/dcim/migrations/0107_component_labels.py  | 10 ++++++++++
 netbox/dcim/models/device_component_templates.py |  8 +++++---
 netbox/dcim/models/device_components.py          |  7 +++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index ffa027af6..3c360c4a1 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -331,7 +331,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = DeviceBayTemplate
-        fields = ['id', 'device_type', 'name']
+        fields = ['id', 'device_type', 'name', 'label']
 
 
 #
@@ -603,7 +603,7 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
 
     class Meta:
         model = DeviceBay
-        fields = ['id', 'device', 'name', 'description', 'installed_device', 'tags']
+        fields = ['id', 'device', 'name', 'label', 'description', 'installed_device', 'tags']
 
 
 #
diff --git a/netbox/dcim/migrations/0107_component_labels.py b/netbox/dcim/migrations/0107_component_labels.py
index 9aa496134..8e5ab8156 100644
--- a/netbox/dcim/migrations/0107_component_labels.py
+++ b/netbox/dcim/migrations/0107_component_labels.py
@@ -60,4 +60,14 @@ class Migration(migrations.Migration):
             name='label',
             field=models.CharField(blank=True, max_length=64),
         ),
+        migrations.AddField(
+            model_name='devicebay',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='devicebaytemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
     ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 53080d8f6..f966b0616 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -433,14 +433,16 @@ class DeviceBayTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="Physical label"
+    )
 
     class Meta:
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        return self.name
-
     def instantiate(self, device):
         return DeviceBay(
             device=device,
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 022b2733d..a542b0197 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1009,6 +1009,11 @@ class DeviceBay(ComponentModel):
         max_length=100,
         blank=True
     )
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="Physical label"
+    )
     installed_device = models.OneToOneField(
         to='dcim.Device',
         on_delete=models.SET_NULL,
@@ -1025,6 +1030,8 @@ class DeviceBay(ComponentModel):
         unique_together = ('device', 'name')
 
     def __str__(self):
+        if self.label:
+            return '{} - {} ({})'.format(self.device.name, self.name, self.label)
         return '{} - {}'.format(self.device.name, self.name)
 
     def get_absolute_url(self):

From 7a54bd9f2a31aaa45cb1c4661f3278a62447bc26 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 11 Jun 2020 13:42:20 -0400
Subject: [PATCH 148/505] Changelog and migrations fix for #4615

---
 docs/release-notes/version-2.9.md                             | 1 +
 netbox/dcim/migrations/{0107_add_tags.py => 0108_add_tags.py} | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename netbox/dcim/migrations/{0107_add_tags.py => 0108_add_tags.py} (94%)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index a190662d2..60f554f4d 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -10,6 +10,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 ### Enhancements
 
+* [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 
 ### Configuration Changes
diff --git a/netbox/dcim/migrations/0107_add_tags.py b/netbox/dcim/migrations/0108_add_tags.py
similarity index 94%
rename from netbox/dcim/migrations/0107_add_tags.py
rename to netbox/dcim/migrations/0108_add_tags.py
index 2f7d29b96..670f1f0e9 100644
--- a/netbox/dcim/migrations/0107_add_tags.py
+++ b/netbox/dcim/migrations/0108_add_tags.py
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('extras', '0042_customfield_manager'),
-        ('dcim', '0106_role_default_color'),
+        ('dcim', '0107_component_labels'),
     ]
 
     operations = [

From 057a02220568f8f50de66d31c0d292616fc7fbb7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 11 Jun 2020 16:12:50 -0400
Subject: [PATCH 149/505] Clean up and improve UI view tests

---
 netbox/dcim/tests/test_views.py   |  17 ++-
 netbox/ipam/tests/test_views.py   |  11 +-
 netbox/utilities/testing/views.py | 204 +++++++++++++++++++++---------
 3 files changed, 160 insertions(+), 72 deletions(-)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index eb1e47a66..e9201e8fa 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1062,8 +1062,7 @@ class ConsoleServerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
         }
 
         cls.bulk_edit_data = {
-            'device': device.pk,
-            'type': ConsolePortTypeChoices.TYPE_RJ45,
+            'type': ConsolePortTypeChoices.TYPE_RJ11,
             'description': 'New description',
         }
 
@@ -1163,8 +1162,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
         }
 
         cls.bulk_edit_data = {
-            'device': device.pk,
-            'type': PowerOutletTypeChoices.TYPE_IEC_C13,
+            'type': PowerOutletTypeChoices.TYPE_IEC_C15,
             'power_port': powerports[1].pk,
             'feed_leg': PowerOutletFeedLegChoices.FEED_LEG_B,
             'description': 'New description',
@@ -1238,9 +1236,8 @@ class InterfaceTestCase(
         }
 
         cls.bulk_edit_data = {
-            'device': device.pk,
-            'type': InterfaceTypeChoices.TYPE_1GE_GBIC,
-            'enabled': False,
+            'type': InterfaceTypeChoices.TYPE_1GE_FIXED,
+            'enabled': True,
             'lag': interfaces[3].pk,
             'mac_address': EUI('01:02:03:04:05:06'),
             'mtu': 2000,
@@ -1442,8 +1439,6 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
         }
 
         cls.bulk_edit_data = {
-            'device': device.pk,
-            'manufacturer': manufacturer.pk,
             'part_id': '123456',
             'description': 'New description',
         }
@@ -1597,6 +1592,10 @@ class VirtualChassisTestCase(
             'form-MAX_NUM_FORMS': 1000,
         }
 
+        cls.bulk_edit_data = {
+            'domain': 'domain-x',
+        }
+
 
 class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = PowerPanel
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index 43ac565ad..d4d5a857c 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -5,6 +5,7 @@ from netaddr import IPNetwork
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
 from ipam.choices import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
+from tenancy.models import Tenant
 from utilities.testing import ViewTestCases
 
 
@@ -14,6 +15,12 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     @classmethod
     def setUpTestData(cls):
 
+        tenants = (
+            Tenant(name='Tenant A', slug='tenant-a'),
+            Tenant(name='Tenant B', slug='tenant-b'),
+        )
+        Tenant.objects.bulk_create(tenants)
+
         VRF.objects.bulk_create([
             VRF(name='VRF 1', rd='65000:1'),
             VRF(name='VRF 2', rd='65000:2'),
@@ -23,7 +30,7 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.form_data = {
             'name': 'VRF X',
             'rd': '65000:999',
-            'tenant': None,
+            'tenant': tenants[0].pk,
             'enforce_unique': True,
             'description': 'A new VRF',
             'tags': 'Alpha,Bravo,Charlie',
@@ -37,7 +44,7 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         )
 
         cls.bulk_edit_data = {
-            'tenant': None,
+            'tenant': tenants[1].pk,
             'enforce_unique': False,
             'description': 'New description',
         }
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index b3c35ed87..62a982eba 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -178,7 +178,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_get_object_with_model_permission(self):
+        def test_get_object_with_permission(self):
             instance = self.model.objects.first()
 
             # Add model-level permission
@@ -193,7 +193,7 @@ class ViewTestCases:
             self.assertHttpStatus(self.client.get(instance.get_absolute_url()), 200)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_get_object_with_object_permission(self):
+        def test_get_object_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
             # Add object-level permission
@@ -214,6 +214,8 @@ class ViewTestCases:
     class CreateObjectViewTestCase(ModelViewTestCase):
         """
         Create a single new instance.
+
+        :form_data: Data to be used when creating a new object.
         """
         form_data = {}
 
@@ -234,10 +236,10 @@ class ViewTestCases:
                 self.assertHttpStatus(response, 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_create_object_with_model_permission(self):
+        def test_create_object_with_permission(self):
             initial_count = self.model.objects.count()
 
-            # Assign model-level permission
+            # Assign unconstrained permission
             obj_perm = ObjectPermission(
                 actions=['add']
             )
@@ -258,12 +260,12 @@ class ViewTestCases:
             self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_create_object_with_object_permission(self):
+        def test_create_object_with_constrained_permission(self):
             initial_count = self.model.objects.count()
 
-            # Assign object-level permission
+            # Assign constrained permission
             obj_perm = ObjectPermission(
-                constraints={'pk__gt': 0},  # Dummy permission to allow all
+                constraints={'pk': 0},  # Dummy permission to deny all
                 actions=['add']
             )
             obj_perm.save()
@@ -273,7 +275,19 @@ class ViewTestCases:
             # Try GET with object-level permission
             self.assertHttpStatus(self.client.get(self._get_url('add')), 200)
 
-            # Try to create permitted object
+            # Try to create an object (not permitted)
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.form_data),
+            }
+            self.assertHttpStatus(self.client.post(**request), 200)
+            self.assertEqual(initial_count, self.model.objects.count())  # Check that no object was created
+
+            # Update the ObjectPermission to allow creation
+            obj_perm.constraints = {'pk__gt': 0}
+            obj_perm.save()
+
+            # Try to create an object (permitted)
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.form_data),
@@ -282,22 +296,11 @@ class ViewTestCases:
             self.assertEqual(initial_count + 1, self.model.objects.count())
             self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
-            # Nullify ObjectPermission to disallow new object creation
-            obj_perm.constraints = {'pk': 0}
-            obj_perm.save()
-
-            # Try to create a non-permitted object
-            initial_count = self.model.objects.count()
-            request = {
-                'path': self._get_url('add'),
-                'data': post_data(self.form_data),
-            }
-            self.assertHttpStatus(self.client.post(**request), 200)
-            self.assertEqual(initial_count, self.model.objects.count())  # Check that no object was created
-
     class EditObjectViewTestCase(ModelViewTestCase):
         """
         Edit a single existing instance.
+
+        :form_data: Data to be used when updating the first existing object.
         """
         form_data = {}
 
@@ -318,7 +321,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(**request), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_edit_object_with_model_permission(self):
+        def test_edit_object_with_permission(self):
             instance = self.model.objects.first()
 
             # Assign model-level permission
@@ -341,10 +344,10 @@ class ViewTestCases:
             self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_edit_object_with_object_permission(self):
+        def test_edit_object_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
-            # Assign object-level permission
+            # Assign constrained permission
             obj_perm = ObjectPermission(
                 constraints={'pk': instance1.pk},
                 actions=['change']
@@ -395,7 +398,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(**request), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_delete_object_with_model_permission(self):
+        def test_delete_object_with_permission(self):
             instance = self.model.objects.first()
 
             # Assign model-level permission
@@ -419,7 +422,7 @@ class ViewTestCases:
                 self.model.objects.get(pk=instance.pk)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_delete_object_with_object_permission(self):
+        def test_delete_object_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
             # Assign object-level permission
@@ -473,7 +476,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.get(self._get_url('list')), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_list_objects_with_model_permission(self):
+        def test_list_objects_with_permission(self):
 
             # Add model-level permission
             obj_perm = ObjectPermission(
@@ -493,7 +496,7 @@ class ViewTestCases:
                 self.assertEqual(response.get('Content-Type'), 'text/csv')
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_list_objects_with_object_permission(self):
+        def test_list_objects_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
             # Add object-level permission
@@ -506,38 +509,87 @@ class ViewTestCases:
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
             # Try GET with object-level permission
-            self.assertHttpStatus(self.client.get(self._get_url('list')), 200)
-
-            # TODO: Verify that only the permitted object is returned
+            response = self.client.get(self._get_url('list'))
+            self.assertHttpStatus(response, 200)
+            content = str(response.content)
+            if hasattr(self.model, 'name'):
+                self.assertIn(instance1.name, content)
+                self.assertNotIn(instance2.name, content)
+            else:
+                self.assertIn(instance1.get_absolute_url(), content)
+                self.assertNotIn(instance2.get_absolute_url(), content)
 
     class BulkCreateObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances using a single form. Expects the creation of three new instances by default.
+
+        :bulk_create_count: The number of objects expected to be created (default: 3).
+        :bulk_create_data: A dictionary of data to be used for bulk object creation.
         """
         bulk_create_count = 3
         bulk_create_data = {}
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_create_objects(self):
+        def test_bulk_create_objects_without_permission(self):
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.bulk_create_data),
+            }
+
+            # Try POST without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(**request), 403)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_create_objects_with_permission(self):
             initial_count = self.model.objects.count()
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.bulk_create_data),
             }
 
-            # Attempt to make the request without required permissions
-            with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(**request), 403)
-
-            # Assign object-level permission
-            obj_perm = ObjectPermission(actions=['add'])
+            # Assign non-constrained permission
+            obj_perm = ObjectPermission(
+                actions=['add'],
+            )
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
+            # Bulk create objects
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
+            self.assertEqual(initial_count + self.bulk_create_count, self.model.objects.count())
+            for instance in self.model.objects.order_by('-pk')[:self.bulk_create_count]:
+                self.assertInstanceEqual(instance, self.bulk_create_data)
 
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        def test_bulk_create_objects_with_constrained_permission(self):
+            initial_count = self.model.objects.count()
+            request = {
+                'path': self._get_url('add'),
+                'data': post_data(self.bulk_create_data),
+            }
+
+            # Assign constrained permission
+            obj_perm = ObjectPermission(
+                actions=['add'],
+                constraints={'pk': 0}  # Dummy constraint to deny all
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            # Attempt to make the request with unmet constraints
+            self.assertHttpStatus(self.client.post(**request), 200)
+            self.assertEqual(self.model.objects.count(), initial_count)
+
+            # Update the ObjectPermission to allow creation
+            obj_perm.constraints = {'pk__gt': 0}  # Dummy constraint to allow all
+            obj_perm.save()
+
+            response = self.client.post(**request)
+            self.assertHttpStatus(response, 302)
             self.assertEqual(initial_count + self.bulk_create_count, self.model.objects.count())
             for instance in self.model.objects.order_by('-pk')[:self.bulk_create_count]:
                 self.assertInstanceEqual(instance, self.bulk_create_data)
@@ -545,6 +597,8 @@ class ViewTestCases:
     class BulkImportObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances from imported data.
+
+        :csv_data: A list of CSV-formatted lines (starting with the headers) to be used for bulk object import.
         """
         csv_data = ()
 
@@ -567,7 +621,7 @@ class ViewTestCases:
                 self.assertHttpStatus(response, 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_import_objects_with_model_permission(self):
+        def test_bulk_import_objects_with_permission(self):
             initial_count = self.model.objects.count()
             data = {
                 'csv': self._get_csv_data(),
@@ -589,30 +643,39 @@ class ViewTestCases:
             self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_import_objects_with_object_permission(self):
+        def test_bulk_import_objects_with_constrained_permission(self):
             initial_count = self.model.objects.count()
             data = {
                 'csv': self._get_csv_data(),
             }
 
-            # Assign object-level permission
+            # Assign constrained permission
             obj_perm = ObjectPermission(
-                constraints={'pk__gt': 0},  # Dummy permission to allow all
+                constraints={'pk': 0},  # Dummy permission to deny all
                 actions=['add']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            # Test import with object-level permission
+            # Attempt to import non-permitted objects
+            self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
+            self.assertEqual(self.model.objects.count(), initial_count)
+
+            # Update permission constraints
+            obj_perm.constraints = {'pk__gt': 0}  # Dummy permission to allow all
+            obj_perm.save()
+
+            # Import permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
             self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
-            # TODO: Test importing non-permitted objects
-
     class BulkEditObjectsViewTestCase(ModelViewTestCase):
         """
         Edit multiple instances.
+
+        :bulk_edit_data: A dictionary of data to be used when bulk editing a set of objects. This data should differ
+                         from that used for initial object creation within setUpTestData().
         """
         bulk_edit_data = {}
 
@@ -633,7 +696,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_edit_objects_with_model_permission(self):
+        def test_bulk_edit_objects_with_permission(self):
             pk_list = self.model.objects.values_list('pk', flat=True)[:3]
             data = {
                 'pk': pk_list,
@@ -657,8 +720,9 @@ class ViewTestCases:
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_edit_objects_with_object_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+        def test_bulk_edit_objects_with_constrained_permission(self):
+            initial_instances = self.model.objects.all()[:3]
+            pk_list = list(self.model.objects.values_list('pk', flat=True)[:3])
             data = {
                 'pk': pk_list,
                 '_apply': True,  # Form button
@@ -667,22 +731,33 @@ class ViewTestCases:
             # Append the form data to the request
             data.update(post_data(self.bulk_edit_data))
 
-            # Assign object-level permission
+            # Dynamically determine a constraint that will *not* be matched by the updated objects.
+            attr_name = list(self.bulk_edit_data.keys())[0]
+            field = self.model._meta.get_field(attr_name)
+            value = field.value_from_object(self.model.objects.first())
+
+            # Assign constrained permission
             obj_perm = ObjectPermission(
-                constraints={'pk__in': list(pk_list)},
+                constraints={attr_name: value},
                 actions=['change']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            # Try POST with model-level permission
+            # Attempt to bulk edit permitted objects into a non-permitted state
+            response = self.client.post(self._get_url('bulk_edit'), data)
+            self.assertHttpStatus(response, 200)
+
+            # Update permission constraints
+            obj_perm.constraints = {'pk__gt': 0}
+            obj_perm.save()
+
+            # Bulk edit permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
             for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
-            # TODO: Test editing non-permitted objects
-
     class BulkDeleteObjectsViewTestCase(ModelViewTestCase):
         """
         Delete multiple instances.
@@ -705,7 +780,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_delete_objects_with_model_permission(self):
+        def test_bulk_delete_objects_with_permission(self):
             pk_list = self.model.objects.values_list('pk', flat=True)
             data = {
                 'pk': pk_list,
@@ -713,7 +788,7 @@ class ViewTestCases:
                 '_confirm': True,  # Form button
             }
 
-            # Assign model-level permission
+            # Assign unconstrained permission
             obj_perm = ObjectPermission(
                 actions=['delete']
             )
@@ -726,7 +801,8 @@ class ViewTestCases:
             self.assertEqual(self.model.objects.count(), 0)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_delete_objects_with_object_permission(self):
+        def test_bulk_delete_objects_with_constrained_permission(self):
+            initial_count = self.model.objects.count()
             pk_list = self.model.objects.values_list('pk', flat=True)
             data = {
                 'pk': pk_list,
@@ -734,21 +810,27 @@ class ViewTestCases:
                 '_confirm': True,  # Form button
             }
 
-            # Assign object-level permission
+            # Assign constrained permission
             obj_perm = ObjectPermission(
-                constraints={'pk__in': list(pk_list)},
+                constraints={'pk': 0},  # Dummy permission to deny all
                 actions=['delete']
             )
             obj_perm.save()
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            # Try POST with object-level permission
+            # Attempt to bulk delete non-permitted objects
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
+            self.assertEqual(self.model.objects.count(), initial_count)
+
+            # Update permission constraints
+            obj_perm.constraints = {'pk__gt': 0}  # Dummy permission to allow all
+            obj_perm.save()
+
+            # Bulk delete permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
             self.assertEqual(self.model.objects.count(), 0)
 
-            # TODO: Test deleting non-permitted objects
-
     class PrimaryObjectViewTestCase(
         GetObjectViewTestCase,
         CreateObjectViewTestCase,

From da906f48d90161af90703e1cd49bad9f769b8bf7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 12 Jun 2020 09:48:23 -0400
Subject: [PATCH 150/505] Standardize add, import, and export functionality for
 tags

---
 netbox/extras/forms.py             | 12 +++++++++++
 netbox/extras/models/tags.py       | 10 +++++++++
 netbox/extras/tests/test_views.py  | 18 ++++++++--------
 netbox/extras/urls.py              |  2 ++
 netbox/extras/views.py             | 33 +++++++++++++++++-------------
 netbox/templates/extras/tag.html   |  2 +-
 netbox/templates/inc/nav_menu.html |  6 ++++++
 7 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index cb9930ae2..217f55b70 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -1,6 +1,7 @@
 from django import forms
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
+from django.utils.safestring import mark_safe
 from mptt.forms import TreeNodeMultipleChoiceField
 from taggit.forms import TagField as TagField_
 
@@ -161,6 +162,17 @@ class TagForm(BootstrapMixin, forms.ModelForm):
         ]
 
 
+class TagCSVForm(CSVModelForm):
+    slug = SlugField()
+
+    class Meta:
+        model = Tag
+        fields = Tag.csv_headers
+        help_texts = {
+            'color': mark_safe('RGB color in hexadecimal (e.g. <code>00ff00</code>)'),
+        }
+
+
 class AddRemoveTagsForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index d5792ebda..9bb90f21e 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -24,6 +24,8 @@ class Tag(TagBase, ChangeLoggedModel):
 
     objects = RestrictedQuerySet.as_manager()
 
+    csv_headers = ['name', 'slug', 'color', 'description']
+
     def get_absolute_url(self):
         return reverse('extras:tag', args=[self.slug])
 
@@ -34,6 +36,14 @@ class Tag(TagBase, ChangeLoggedModel):
             slug += "_%d" % i
         return slug
 
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.color,
+            self.description
+        )
+
 
 class TaggedItem(GenericTaggedItemBase):
     tag = models.ForeignKey(
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index 9ad29fd80..b3abf5b22 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -10,16 +10,7 @@ from extras.models import ConfigContext, ObjectChange, Tag
 from utilities.testing import ViewTestCases, TestCase
 
 
-# TODO: Change base class to PrimaryObjectViewTestCase
-# Blocked by #3703
-class TagTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase
-):
+class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = Tag
 
     @classmethod
@@ -38,6 +29,13 @@ class TagTestCase(
             'comments': 'Some comments',
         }
 
+        cls.csv_data = (
+            "name,slug,color,description",
+            "Tag 4,tag-4,ff0000,Fourth tag",
+            "Tag 5,tag-5,00ff00,Fifth tag",
+            "Tag 6,tag-6,0000ff,Sixth tag",
+        )
+
         cls.bulk_edit_data = {
             'color': '00ff00',
         }
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index 3eee303a3..3007e6524 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -9,6 +9,8 @@ urlpatterns = [
 
     # Tags
     path('tags/', views.TagListView.as_view(), name='tag_list'),
+    path('tags/add/', views.TagEditView.as_view(), name='tag_add'),
+    path('tags/import/', views.TagBulkImportView.as_view(), name='tag_import'),
     path('tags/edit/', views.TagBulkEditView.as_view(), name='tag_bulk_edit'),
     path('tags/delete/', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'),
     path('tags/<str:slug>/', views.TagView.as_view(), name='tag'),
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index e80aa1d62..0e6700f06 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -13,14 +13,13 @@ from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import shallow_compare_dict
 from utilities.views import (
-    BulkDeleteView, BulkEditView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
     ObjectPermissionRequiredMixin,
 )
-from . import filters, forms
+from . import filters, forms, tables
 from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem
 from .reports import get_report, get_reports
 from .scripts import get_scripts, run_script
-from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemTable
 
 
 #
@@ -35,8 +34,7 @@ class TagListView(ObjectListView):
     )
     filterset = filters.TagFilterSet
     filterset_form = forms.TagFilterForm
-    table = TagTable
-    action_buttons = ()
+    table = tables.TagTable
 
 
 class TagView(ObjectView):
@@ -52,7 +50,7 @@ class TagView(ObjectView):
         )
 
         # Generate a table of all items tagged with this Tag
-        items_table = TaggedItemTable(tagged_items)
+        items_table = tables.TaggedItemTable(tagged_items)
         paginate = {
             'paginator_class': EnhancedPaginator,
             'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
@@ -78,13 +76,20 @@ class TagDeleteView(ObjectDeleteView):
     default_return_url = 'extras:tag_list'
 
 
+class TagBulkImportView(BulkImportView):
+    queryset = Tag.objects.all()
+    model_form = forms.TagCSVForm
+    table = tables.TagTable
+    default_return_url = 'extras:tag_list'
+
+
 class TagBulkEditView(BulkEditView):
     queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
     )
-    table = TagTable
+    table = tables.TagTable
     form = forms.TagBulkEditForm
     default_return_url = 'extras:tag_list'
 
@@ -95,7 +100,7 @@ class TagBulkDeleteView(BulkDeleteView):
     ).order_by(
         'name'
     )
-    table = TagTable
+    table = tables.TagTable
     default_return_url = 'extras:tag_list'
 
 
@@ -107,7 +112,7 @@ class ConfigContextListView(ObjectListView):
     queryset = ConfigContext.objects.all()
     filterset = filters.ConfigContextFilterSet
     filterset_form = forms.ConfigContextFilterForm
-    table = ConfigContextTable
+    table = tables.ConfigContextTable
     action_buttons = ('add',)
 
 
@@ -143,7 +148,7 @@ class ConfigContextEditView(ObjectEditView):
 class ConfigContextBulkEditView(BulkEditView):
     queryset = ConfigContext.objects.all()
     filterset = filters.ConfigContextFilterSet
-    table = ConfigContextTable
+    table = tables.ConfigContextTable
     form = forms.ConfigContextBulkEditForm
     default_return_url = 'extras:configcontext_list'
 
@@ -155,7 +160,7 @@ class ConfigContextDeleteView(ObjectDeleteView):
 
 class ConfigContextBulkDeleteView(BulkDeleteView):
     queryset = ConfigContext.objects.all()
-    table = ConfigContextTable
+    table = tables.ConfigContextTable
     default_return_url = 'extras:configcontext_list'
 
 
@@ -197,7 +202,7 @@ class ObjectChangeListView(ObjectListView):
     queryset = ObjectChange.objects.prefetch_related('user', 'changed_object_type')
     filterset = filters.ObjectChangeFilterSet
     filterset_form = forms.ObjectChangeFilterForm
-    table = ObjectChangeTable
+    table = tables.ObjectChangeTable
     template_name = 'extras/objectchange_list.html'
     action_buttons = ('export',)
 
@@ -214,7 +219,7 @@ class ObjectChangeView(ObjectView):
         ).exclude(
             pk=objectchange.pk
         )
-        related_changes_table = ObjectChangeTable(
+        related_changes_table = tables.ObjectChangeTable(
             data=related_changes[:50],
             orderable=False
         )
@@ -267,7 +272,7 @@ class ObjectChangeLogView(View):
             Q(changed_object_type=content_type, changed_object_id=obj.pk) |
             Q(related_object_type=content_type, related_object_id=obj.pk)
         )
-        objectchanges_table = ObjectChangeTable(
+        objectchanges_table = tables.ObjectChangeTable(
             data=objectchanges,
             orderable=False
         )
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 0c20bcbdc..ff54a4800 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -85,7 +85,7 @@
                     <tr>
                         <td>Description</td>
                         <td>
-                            {{ tag.description }}
+                            {{ tag.description|placeholder }}
                         </td>
                 </table>
             </div>
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 765df31cc..0e0e2b981 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -101,6 +101,12 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Tags</li>
                         <li{% if not perms.extras.view_tag %} class="disabled"{% endif %}>
+                            {% if perms.extras.add_tag %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'extras:tag_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                    <a href="{% url 'extras:tag_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
                             <a href="{% url 'extras:tag_list' %}">Tags</a>
                         </li>
                     </ul>

From 7dc4f8d5ccf0b941c0fae0b5c16e486f16ae4038 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 12 Jun 2020 09:58:59 -0400
Subject: [PATCH 151/505] Remove TagField

---
 netbox/circuits/forms.py       |  8 ++--
 netbox/dcim/forms.py           | 80 +++++++++++++++++++++++-----------
 netbox/extras/forms.py         | 20 ++++-----
 netbox/ipam/forms.py           | 24 +++++++---
 netbox/secrets/forms.py        |  5 ++-
 netbox/tenancy/forms.py        |  5 ++-
 netbox/virtualization/forms.py | 18 +++++---
 7 files changed, 101 insertions(+), 59 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 2185d1eab..341a7a9b7 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -3,8 +3,8 @@ from django import forms
 from dcim.models import Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldFilterForm, CustomFieldModelForm, CustomFieldModelCSVForm,
-    TagField,
 )
+from extras.models import Tag
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
@@ -23,7 +23,8 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider
 class ProviderForm(BootstrapMixin, CustomFieldModelForm):
     slug = SlugField()
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -165,7 +166,8 @@ class CircuitForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=CircuitType.objects.all()
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 831f7be9e..534097cb2 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -14,8 +14,9 @@ from timezone_field import TimeZoneFormField
 from circuits.models import Circuit, Provider
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldFilterForm, CustomFieldModelForm,
-    LocalConfigContextFilterForm, TagField,
+    LocalConfigContextFilterForm,
 )
+from extras.models import Tag
 from ipam.constants import BGP_ASN_MAX, BGP_ASN_MIN
 from ipam.models import IPAddress, VLAN
 from tenancy.forms import TenancyFilterForm, TenancyForm
@@ -225,7 +226,8 @@ class SiteForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     )
     slug = SlugField()
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -481,7 +483,8 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         required=False
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -750,7 +753,8 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
         ),
         widget=StaticSelect2()
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -912,7 +916,8 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldModelForm):
         slug_source='model'
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -1716,11 +1721,14 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         required=False
     )
     comments = CommentField()
-    tags = TagField(required=False)
     local_context_data = JSONField(
         required=False,
         label=''
     )
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
 
     class Meta:
         model = Device
@@ -2209,7 +2217,8 @@ class ConsolePortFilterForm(DeviceComponentFilterForm):
 
 
 class ConsolePortForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2236,7 +2245,8 @@ class ConsolePortCreateForm(LabeledComponentForm):
         max_length=100,
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2292,7 +2302,8 @@ class ConsoleServerPortFilterForm(DeviceComponentFilterForm):
 
 
 class ConsoleServerPortForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2319,7 +2330,8 @@ class ConsoleServerPortCreateForm(LabeledComponentForm):
         max_length=100,
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2389,7 +2401,8 @@ class PowerPortFilterForm(DeviceComponentFilterForm):
 
 
 class PowerPortForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2426,7 +2439,8 @@ class PowerPortCreateForm(LabeledComponentForm):
         max_length=100,
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2486,7 +2500,8 @@ class PowerOutletForm(BootstrapMixin, forms.ModelForm):
         queryset=PowerPort.objects.all(),
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2530,7 +2545,8 @@ class PowerOutletCreateForm(LabeledComponentForm):
         max_length=100,
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2689,7 +2705,8 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
             },
         )
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -2773,7 +2790,8 @@ class InterfaceCreateForm(InterfaceCommonForm, LabeledComponentForm):
         required=False,
         widget=StaticSelect2(),
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
     untagged_vlan = DynamicModelChoiceField(
@@ -2985,7 +3003,8 @@ class FrontPortFilterForm(DeviceComponentFilterForm):
 
 
 class FrontPortForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3176,7 +3195,8 @@ class RearPortFilterForm(DeviceComponentFilterForm):
 
 
 class RearPortForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3279,7 +3299,8 @@ class DeviceBayFilterForm(DeviceComponentFilterForm):
 
 
 class DeviceBayForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3300,7 +3321,8 @@ class DeviceBayCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3330,7 +3352,8 @@ class DeviceBayBulkCreateForm(
     form_from_model(DeviceBay, ['description', 'tags']),
     DeviceBulkAddComponentForm
 ):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3634,7 +3657,8 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
 
 
 class CableForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -3963,7 +3987,8 @@ class InventoryItemForm(BootstrapMixin, forms.ModelForm):
         queryset=Manufacturer.objects.all(),
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -4111,7 +4136,8 @@ class DeviceSelectionForm(forms.Form):
 
 
 class VirtualChassisForm(BootstrapMixin, forms.ModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -4301,7 +4327,8 @@ class PowerPanelForm(BootstrapMixin, forms.ModelForm):
         queryset=RackGroup.objects.all(),
         required=False
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -4425,7 +4452,8 @@ class PowerFeedForm(BootstrapMixin, CustomFieldModelForm):
         required=False
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index 217f55b70..24dfe33ba 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -3,7 +3,6 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.utils.safestring import mark_safe
 from mptt.forms import TreeNodeMultipleChoiceField
-from taggit.forms import TagField as TagField_
 
 from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
@@ -143,15 +142,6 @@ class CustomFieldFilterForm(forms.Form):
 # Tags
 #
 
-class TagField(TagField_):
-
-    def widget_attrs(self, widget):
-        # Apply the "tagfield" CSS class to trigger the special API-based selection widget for tags
-        return {
-            'class': 'tagfield'
-        }
-
-
 class TagForm(BootstrapMixin, forms.ModelForm):
     slug = SlugField()
 
@@ -179,8 +169,14 @@ class AddRemoveTagsForm(forms.Form):
         super().__init__(*args, **kwargs)
 
         # Add add/remove tags fields
-        self.fields['add_tags'] = TagField(required=False)
-        self.fields['remove_tags'] = TagField(required=False)
+        self.fields['add_tags'] = DynamicModelMultipleChoiceField(
+            queryset=Tag.objects.all(),
+            required=False
+        )
+        self.fields['remove_tags'] = DynamicModelMultipleChoiceField(
+            queryset=Tag.objects.all(),
+            required=False
+        )
 
 
 class TagFilterForm(BootstrapMixin, forms.Form):
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index fc1352ec9..e27041724 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -4,8 +4,8 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from dcim.models import Device, Interface, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
-    TagField,
 )
+from extras.models import Tag
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
@@ -33,7 +33,8 @@ IPADDRESS_MASK_LENGTH_CHOICES = add_blank_choice([
 #
 
 class VRFForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -141,7 +142,8 @@ class AggregateForm(BootstrapMixin, CustomFieldModelForm):
     rir = DynamicModelChoiceField(
         queryset=RIR.objects.all()
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -292,7 +294,10 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=Role.objects.all(),
         required=False
     )
-    tags = TagField(required=False)
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
 
     class Meta:
         model = Prefix
@@ -584,7 +589,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         required=False,
         label='Make this the primary IP for the device/VM'
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -990,7 +996,10 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=Role.objects.all(),
         required=False
     )
-    tags = TagField(required=False)
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
 
     class Meta:
         model = VLAN
@@ -1157,7 +1166,8 @@ class ServiceForm(BootstrapMixin, CustomFieldModelForm):
         min_value=SERVICE_PORT_MIN,
         max_value=SERVICE_PORT_MAX
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index 296469900..f62c72293 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -5,8 +5,8 @@ from django import forms
 from dcim.models import Device
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldFilterForm, CustomFieldModelForm, CustomFieldModelCSVForm,
-    TagField,
 )
+from extras.models import Tag
 from utilities.forms import (
     APISelectMultiple, BootstrapMixin, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
     DynamicModelMultipleChoiceField, SlugField, StaticSelect2Multiple, TagFilterField,
@@ -90,7 +90,8 @@ class SecretForm(BootstrapMixin, CustomFieldModelForm):
     role = DynamicModelChoiceField(
         queryset=SecretRole.objects.all()
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index bf100f43a..5bd0657b6 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -2,8 +2,8 @@ from django import forms
 
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldModelForm, CustomFieldBulkEditForm, CustomFieldFilterForm, CustomFieldModelCSVForm,
-    TagField,
 )
+from extras.models import Tag
 from utilities.forms import (
     APISelect, APISelectMultiple, BootstrapMixin, CommentField, CSVModelChoiceField, CSVModelForm,
     DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField, TagFilterField,
@@ -57,7 +57,8 @@ class TenantForm(BootstrapMixin, CustomFieldModelForm):
         required=False
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 2f2ee4950..942368f19 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -7,8 +7,8 @@ from dcim.forms import INTERFACE_MODE_HELP_TEXT
 from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
-    TagField,
 )
+from extras.models import Tag
 from ipam.models import IPAddress, VLAN
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
@@ -83,7 +83,8 @@ class ClusterForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         required=False
     )
     comments = CommentField()
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -312,13 +313,14 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=Platform.objects.all(),
         required=False
     )
-    tags = TagField(
-        required=False
-    )
     local_context_data = JSONField(
         required=False,
         label=''
     )
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
 
     class Meta:
         model = VirtualMachine
@@ -590,7 +592,8 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
             },
         )
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 
@@ -697,7 +700,8 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
             },
         )
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 

From e905a36fb2be1a2d4867d96fc7c44b83002d2fba Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 12 Jun 2020 11:33:23 -0400
Subject: [PATCH 152/505] Update tests for tag changes

---
 netbox/circuits/tests/test_views.py       |  5 +-
 netbox/dcim/tests/test_views.py           | 70 ++++++++++++++---------
 netbox/ipam/tests/test_views.py           | 12 ++--
 netbox/tenancy/tests/test_views.py        |  2 +-
 netbox/utilities/testing/utils.py         |  9 ++-
 netbox/utilities/testing/views.py         | 19 +++++-
 netbox/virtualization/tests/test_views.py | 10 ++--
 7 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index 9cc7af6ae..38365521a 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -26,7 +26,7 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'noc_contact': 'noc@example.com',
             'admin_contact': 'admin@example.com',
             'comments': 'Another provider',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -106,7 +106,7 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'commit_rate': 1000,
             'description': 'A new circuit',
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -124,5 +124,4 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'commit_rate': 2000,
             'description': 'New description',
             'comments': 'New comments',
-
         }
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index e9201e8fa..49f6f67b0 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -94,7 +94,7 @@ class SiteTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'contact_phone': '123-555-9999',
             'contact_email': 'hank@stricklandpropane.com',
             'comments': 'Test site',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -202,7 +202,7 @@ class RackReservationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'user': user3.pk,
             'tenant': None,
             'description': 'Rack reservation',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -268,7 +268,7 @@ class RackTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'outer_depth': 500,
             'outer_unit': RackDimensionUnitChoices.UNIT_MILLIMETER,
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -359,7 +359,7 @@ class DeviceTypeTestCase(
             'is_full_depth': True,
             'subdevice_role': '',  # CharField
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.bulk_edit_data = {
@@ -967,7 +967,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'vc_position': None,
             'vc_priority': None,
             'comments': 'A new device',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
             'local_context_data': None,
         }
 
@@ -1001,12 +1001,14 @@ class ConsolePortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             ConsolePort(device=device, name='Console Port 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Console Port X',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1016,7 +1018,7 @@ class ConsolePortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'label_pattern': 'Serial[3-5]',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1045,12 +1047,14 @@ class ConsoleServerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             ConsoleServerPort(device=device, name='Console Server Port 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Console Server Port X',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console server port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1058,7 +1062,7 @@ class ConsoleServerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'name_pattern': 'Console Server Port [4-6]',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console server port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1087,6 +1091,8 @@ class PowerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             PowerPort(device=device, name='Power Port 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Power Port X',
@@ -1094,7 +1100,7 @@ class PowerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'maximum_draw': 100,
             'allocated_draw': 50,
             'description': 'A power port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1104,7 +1110,7 @@ class PowerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'maximum_draw': 100,
             'allocated_draw': 50,
             'description': 'A power port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1141,6 +1147,8 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
             PowerOutlet(device=device, name='Power Outlet 3', power_port=powerports[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Power Outlet X',
@@ -1148,7 +1156,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'power_port': powerports[1].pk,
             'feed_leg': PowerOutletFeedLegChoices.FEED_LEG_B,
             'description': 'A power outlet',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1158,7 +1166,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'power_port': powerports[1].pk,
             'feed_leg': PowerOutletFeedLegChoices.FEED_LEG_B,
             'description': 'A power outlet',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1202,6 +1210,8 @@ class InterfaceTestCase(
         )
         VLAN.objects.bulk_create(vlans)
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'virtual_machine': None,
@@ -1216,7 +1226,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1232,7 +1242,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1279,6 +1289,8 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             FrontPort(device=device, name='Front Port 3', rear_port=rearports[2]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Front Port X',
@@ -1286,7 +1298,7 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'rear_port': rearports[3].pk,
             'rear_port_position': 1,
             'description': 'New description',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1297,7 +1309,7 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
                 '{}:1'.format(rp.pk) for rp in rearports[3:6]
             ],
             'description': 'New description',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1326,13 +1338,15 @@ class RearPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             RearPort(device=device, name='Rear Port 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Rear Port X',
             'type': PortTypeChoices.TYPE_8P8C,
             'positions': 3,
             'description': 'A rear port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1341,7 +1355,7 @@ class RearPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'type': PortTypeChoices.TYPE_8P8C,
             'positions': 3,
             'description': 'A rear port',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1373,18 +1387,20 @@ class DeviceBayTestCase(ViewTestCases.DeviceComponentViewTestCase):
             DeviceBay(device=device, name='Device Bay 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'name': 'Device Bay X',
             'description': 'A device bay',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
             'device': device.pk,
             'name_pattern': 'Device Bay [4-6]',
             'description': 'A device bay',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1413,6 +1429,8 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             InventoryItem(device=device, name='Inventory Item 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'manufacturer': manufacturer.pk,
@@ -1423,7 +1441,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'serial': '123ABC',
             'asset_tag': 'ABC123',
             'description': 'An inventory item',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -1435,7 +1453,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'part_id': '123456',
             'serial': '123ABC',
             'description': 'An inventory item',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {
@@ -1513,7 +1531,7 @@ class CableTestCase(
             'color': 'c0c0c0',
             'length': 100,
             'length_unit': CableLengthUnitChoices.UNIT_FOOT,
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -1626,7 +1644,7 @@ class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'site': sites[1].pk,
             'rack_group': rackgroups[1].pk,
             'name': 'Power Panel X',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -1680,7 +1698,7 @@ class PowerFeedTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'amperage': 100,
             'max_utilization': 50,
             'comments': 'New comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
 
             # Connection
             'cable': None,
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index d4d5a857c..b704664c1 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -33,7 +33,7 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'tenant': tenants[0].pk,
             'enforce_unique': True,
             'description': 'A new VRF',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -100,7 +100,7 @@ class AggregateTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'rir': rirs[1].pk,
             'date_added': datetime.date(2020, 1, 1),
             'description': 'A new aggregate',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -183,7 +183,7 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'role': roles[1].pk,
             'is_pool': True,
             'description': 'A new prefix',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -232,7 +232,7 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'nat_inside': None,
             'dns_name': 'example',
             'description': 'A new IP address',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -320,7 +320,7 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'status': VLANStatusChoices.STATUS_RESERVED,
             'role': roles[1].pk,
             'description': 'A new VLAN',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -376,7 +376,7 @@ class ServiceTestCase(
             'port': 999,
             'ipaddresses': [],
             'description': 'A new service',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py
index ca2c2633f..4e00b648c 100644
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -55,7 +55,7 @@ class TenantTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'group': tenant_groups[1].pk,
             'description': 'A new tenant',
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
diff --git a/netbox/utilities/testing/utils.py b/netbox/utilities/testing/utils.py
index fd8c70f05..d763012f0 100644
--- a/netbox/utilities/testing/utils.py
+++ b/netbox/utilities/testing/utils.py
@@ -14,7 +14,14 @@ def post_data(data):
         if value is None:
             ret[key] = ''
         elif type(value) in (list, tuple):
-            ret[key] = value
+            if value and hasattr(value[0], 'pk'):
+                # Value is a list of instances
+                ret[key] = [v.pk for v in value]
+            else:
+                ret[key] = value
+        elif hasattr(value, 'pk'):
+            # Value is an instance
+            ret[key] = value.pk
         else:
             ret[key] = str(value)
 
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 62a982eba..7c9631686 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -5,8 +5,10 @@ from django.db.models import ForeignKey, ManyToManyField
 from django.forms.models import model_to_dict
 from django.test import Client, TestCase as _TestCase, override_settings
 from django.urls import reverse, NoReverseMatch
+from django.utils.text import slugify
 from netaddr import IPNetwork
 
+from extras.models import Tag
 from users.models import ObjectPermission
 from utilities.permissions import resolve_permission_ct
 from .utils import disable_warnings, post_data
@@ -48,7 +50,7 @@ class TestCase(_TestCase):
             obj_perm.object_types.add(ct)
 
     #
-    # Convenience methods
+    # Custom assertions
     #
 
     def assertHttpStatus(self, response, expected_status):
@@ -75,7 +77,7 @@ class TestCase(_TestCase):
 
             # TODO: Differentiate between tags assigned to the instance and a M2M field for tags (ex: ConfigContext)
             if key == 'tags':
-                model_dict[key] = ','.join(sorted([tag.name for tag in value]))
+                model_dict[key] = sorted(value)
 
             # Convert ManyToManyField to list of instance PKs
             elif model_dict[key] and type(value) in (list, tuple) and hasattr(value[0], 'pk'):
@@ -102,6 +104,19 @@ class TestCase(_TestCase):
 
         self.assertDictEqual(model_dict, relevant_data)
 
+    #
+    # Convenience methods
+    #
+
+    @classmethod
+    def create_tags(cls, *names):
+        """
+        Create and return a Tag instance for each name given.
+        """
+        tags = [Tag(name=name, slug=slugify(name)) for name in names]
+        Tag.objects.bulk_create(tags)
+        return tags
+
 
 #
 # UI Tests
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index b6f5be8b2..0ccf8a9b1 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -97,7 +97,7 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'tenant': None,
             'site': sites[1].pk,
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
         }
 
         cls.csv_data = (
@@ -161,7 +161,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'memory': 32768,
             'disk': 4000,
             'comments': 'Some comments',
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
             'local_context_data': None,
         }
 
@@ -228,6 +228,8 @@ class InterfaceTestCase(
         )
         VLAN.objects.bulk_create(vlans)
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'virtual_machine': virtualmachines[1].pk,
             'name': 'Interface X',
@@ -240,7 +242,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_create_data = {
@@ -255,7 +257,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': 'Alpha,Bravo,Charlie',
+            'tags': tags,
         }
 
         cls.bulk_edit_data = {

From ce5fd7955fa4e8a32b3e78442bcd09b8cc9c4d8c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 10:25:37 -0400
Subject: [PATCH 153/505] Catch and log evaluation of RestrictedQuerySet
 without calling restrict()

---
 netbox/utilities/querysets.py | 51 +++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 1ac79e90a..32fa0ddfa 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -1,3 +1,5 @@
+import logging
+
 from django.db.models import Q, QuerySet
 
 from utilities.permissions import permission_is_exempt
@@ -16,6 +18,34 @@ class DummyQuerySet:
 
 class RestrictedQuerySet(QuerySet):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Initialize the is_restricted flag to False. This indicates that the QuerySet has not yet been restricted.
+        self.is_restricted = False
+
+    def _check_restriction(self):
+        # Raise a warning if the QuerySet is evaluated without first calling restrict().
+        if not getattr(self, 'is_restricted', False):
+            logger = logging.getLogger('netbox.RestrictedQuerySet')
+            logger.warning(f'Evaluation of RestrictedQuerySet prior to calling restrict(): {self.model}')
+
+    def _clone(self):
+
+        # Persist the is_restricted flag when cloning the QuerySet.
+        c = super()._clone()
+        c.is_restricted = self.is_restricted
+
+        return c
+
+    def _fetch_all(self):
+        self._check_restriction()
+        return super()._fetch_all()
+
+    def count(self):
+        self._check_restriction()
+        return super().count()
+
     def restrict(self, user, action):
         """
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
@@ -31,16 +61,21 @@ class RestrictedQuerySet(QuerySet):
 
         # Bypass restriction for superusers and exempt views
         if user.is_superuser or permission_is_exempt(permission_required):
-            return self
+            qs = self
 
         # User is anonymous or has not been granted the requisite permission
-        if not user.is_authenticated or permission_required not in user.get_all_permissions():
-            return self.none()
+        elif not user.is_authenticated or permission_required not in user.get_all_permissions():
+            qs = self.none()
 
         # Filter the queryset to include only objects with allowed attributes
-        attrs = Q()
-        for perm_attrs in user._object_perm_cache[permission_required]:
-            if perm_attrs:
-                attrs |= Q(**perm_attrs)
+        else:
+            attrs = Q()
+            for perm_attrs in user._object_perm_cache[permission_required]:
+                if perm_attrs:
+                    attrs |= Q(**perm_attrs)
+            qs = self.filter(attrs)
 
-        return self.filter(attrs)
+        # Mark the QuerySet as having been restricted
+        qs.is_restricted = True
+
+        return qs

From ffb43a8534cc7680cce07a8b67bcb2cd5a44eee9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 12:20:21 -0400
Subject: [PATCH 154/505] Introduce unrestricted() method on RestrictedQuerySet

---
 netbox/utilities/querysets.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 32fa0ddfa..558e926a9 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -21,20 +21,22 @@ class RestrictedQuerySet(QuerySet):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # Initialize the is_restricted flag to False. This indicates that the QuerySet has not yet been restricted.
-        self.is_restricted = False
+        # Initialize the allow_evaluation flag to False. This indicates that the QuerySet has not yet been restricted.
+        self.allow_evaluation = False
 
     def _check_restriction(self):
-        # Raise a warning if the QuerySet is evaluated without first calling restrict().
-        if not getattr(self, 'is_restricted', False):
+        # Raise a warning if the QuerySet is evaluated without first calling restrict() or unrestricted().
+        if not getattr(self, 'allow_evaluation', False):
             logger = logging.getLogger('netbox.RestrictedQuerySet')
-            logger.warning(f'Evaluation of RestrictedQuerySet prior to calling restrict(): {self.model}')
+            logger.warning(
+                f'Evaluation of RestrictedQuerySet prior to calling restrict() or unrestricted(): {self.model}'
+            )
 
     def _clone(self):
 
-        # Persist the is_restricted flag when cloning the QuerySet.
+        # Persist the allow_evaluation flag when cloning the QuerySet.
         c = super()._clone()
-        c.is_restricted = self.is_restricted
+        c.allow_evaluation = self.allow_evaluation
 
         return c
 
@@ -46,6 +48,14 @@ class RestrictedQuerySet(QuerySet):
         self._check_restriction()
         return super().count()
 
+    def unrestricted(self):
+        """
+        Bypass restriction for the QuerySet. This is necessary in cases where we are not interacting with the objects
+        directly (e.g. when filtering by related object).
+        """
+        self.allow_evaluation = True
+        return self
+
     def restrict(self, user, action):
         """
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
@@ -75,7 +85,7 @@ class RestrictedQuerySet(QuerySet):
                     attrs |= Q(**perm_attrs)
             qs = self.filter(attrs)
 
-        # Mark the QuerySet as having been restricted
-        qs.is_restricted = True
+        # Allow QuerySet evaluation
+        qs.allow_evaluation = True
 
         return qs

From 5d724f6b840e28dee5305d8a8fae4334e50dd7cb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 13:03:38 -0400
Subject: [PATCH 155/505] Fix up permissions enforcement for home view, global
 search

---
 netbox/netbox/views.py | 43 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 7ac5f550b..b7cdf0131 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -13,11 +13,12 @@ from circuits.filters import CircuitFilterSet, ProviderFilterSet
 from circuits.models import Circuit, Provider
 from circuits.tables import CircuitTable, ProviderTable
 from dcim.filters import (
-    CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, PowerFeedFilterSet, RackFilterSet, RackGroupFilterSet, SiteFilterSet,
-    VirtualChassisFilterSet,
+    CableFilterSet, DeviceFilterSet, DeviceTypeFilterSet, PowerFeedFilterSet, RackFilterSet, RackGroupFilterSet,
+    SiteFilterSet, VirtualChassisFilterSet,
 )
 from dcim.models import (
-    Cable, ConsolePort, Device, DeviceType, Interface, PowerPanel, PowerFeed, PowerPort, Rack, RackGroup, Site, VirtualChassis
+    Cable, ConsolePort, Device, DeviceType, Interface, PowerPanel, PowerFeed, PowerPort, Rack, RackGroup, Site,
+    VirtualChassis,
 )
 from dcim.tables import (
     CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, RackGroupTable, SiteTable,
@@ -43,14 +44,12 @@ SEARCH_MAX_RESULTS = 15
 SEARCH_TYPES = OrderedDict((
     # Circuits
     ('provider', {
-        'permission': 'circuits.view_provider',
         'queryset': Provider.objects.annotate(count_circuits=Count('circuits')),
         'filterset': ProviderFilterSet,
         'table': ProviderTable,
         'url': 'circuits:provider_list',
     }),
     ('circuit', {
-        'permission': 'circuits.view_circuit',
         'queryset': Circuit.objects.prefetch_related(
             'type', 'provider', 'tenant', 'terminations__site'
         ).annotate_sites(),
@@ -60,35 +59,30 @@ SEARCH_TYPES = OrderedDict((
     }),
     # DCIM
     ('site', {
-        'permission': 'dcim.view_site',
         'queryset': Site.objects.prefetch_related('region', 'tenant'),
         'filterset': SiteFilterSet,
         'table': SiteTable,
         'url': 'dcim:site_list',
     }),
     ('rack', {
-        'permission': 'dcim.view_rack',
         'queryset': Rack.objects.prefetch_related('site', 'group', 'tenant', 'role'),
         'filterset': RackFilterSet,
         'table': RackTable,
         'url': 'dcim:rack_list',
     }),
     ('rackgroup', {
-        'permission': 'dcim.view_rackgroup',
         'queryset': RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks')),
         'filterset': RackGroupFilterSet,
         'table': RackGroupTable,
         'url': 'dcim:rackgroup_list',
     }),
     ('devicetype', {
-        'permission': 'dcim.view_devicetype',
         'queryset': DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')),
         'filterset': DeviceTypeFilterSet,
         'table': DeviceTypeTable,
         'url': 'dcim:devicetype_list',
     }),
     ('device', {
-        'permission': 'dcim.view_device',
         'queryset': Device.objects.prefetch_related(
             'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6',
         ),
@@ -97,21 +91,18 @@ SEARCH_TYPES = OrderedDict((
         'url': 'dcim:device_list',
     }),
     ('virtualchassis', {
-        'permission': 'dcim.view_virtualchassis',
         'queryset': VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members')),
         'filterset': VirtualChassisFilterSet,
         'table': VirtualChassisTable,
         'url': 'dcim:virtualchassis_list',
     }),
     ('cable', {
-        'permission': 'dcim.view_cable',
         'queryset': Cable.objects.all(),
         'filterset': CableFilterSet,
         'table': CableTable,
         'url': 'dcim:cable_list',
     }),
     ('powerfeed', {
-        'permission': 'dcim.view_powerfeed',
         'queryset': PowerFeed.objects.all(),
         'filterset': PowerFeedFilterSet,
         'table': PowerFeedTable,
@@ -119,14 +110,12 @@ SEARCH_TYPES = OrderedDict((
     }),
     # Virtualization
     ('cluster', {
-        'permission': 'virtualization.view_cluster',
         'queryset': Cluster.objects.prefetch_related('type', 'group'),
         'filterset': ClusterFilterSet,
         'table': ClusterTable,
         'url': 'virtualization:cluster_list',
     }),
     ('virtualmachine', {
-        'permission': 'virtualization.view_virtualmachine',
         'queryset': VirtualMachine.objects.prefetch_related(
             'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
         ),
@@ -136,35 +125,30 @@ SEARCH_TYPES = OrderedDict((
     }),
     # IPAM
     ('vrf', {
-        'permission': 'ipam.view_vrf',
         'queryset': VRF.objects.prefetch_related('tenant'),
         'filterset': VRFFilterSet,
         'table': VRFTable,
         'url': 'ipam:vrf_list',
     }),
     ('aggregate', {
-        'permission': 'ipam.view_aggregate',
         'queryset': Aggregate.objects.prefetch_related('rir'),
         'filterset': AggregateFilterSet,
         'table': AggregateTable,
         'url': 'ipam:aggregate_list',
     }),
     ('prefix', {
-        'permission': 'ipam.view_prefix',
         'queryset': Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role'),
         'filterset': PrefixFilterSet,
         'table': PrefixTable,
         'url': 'ipam:prefix_list',
     }),
     ('ipaddress', {
-        'permission': 'ipam.view_ipaddress',
         'queryset': IPAddress.objects.prefetch_related('vrf__tenant', 'tenant'),
         'filterset': IPAddressFilterSet,
         'table': IPAddressTable,
         'url': 'ipam:ipaddress_list',
     }),
     ('vlan', {
-        'permission': 'ipam.view_vlan',
         'queryset': VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role'),
         'filterset': VLANFilterSet,
         'table': VLANTable,
@@ -172,7 +156,6 @@ SEARCH_TYPES = OrderedDict((
     }),
     # Secrets
     ('secret', {
-        'permission': 'secrets.view_secret',
         'queryset': Secret.objects.prefetch_related('role', 'device'),
         'filterset': SecretFilterSet,
         'table': SecretTable,
@@ -180,7 +163,6 @@ SEARCH_TYPES = OrderedDict((
     }),
     # Tenancy
     ('tenant', {
-        'permission': 'tenancy.view_tenant',
         'queryset': Tenant.objects.prefetch_related('group'),
         'filterset': TenantFilterSet,
         'table': TenantTable,
@@ -242,6 +224,8 @@ class HomeView(View):
 
         }
 
+        changelog = ObjectChange.objects.restrict(request.user, 'view').prefetch_related('user', 'changed_object_type')
+
         # Check whether a new release is available. (Only for staff/superusers.)
         new_release = None
         if request.user.is_staff or request.user.is_superuser:
@@ -258,7 +242,7 @@ class HomeView(View):
             'search_form': SearchForm(),
             'stats': stats,
             'report_results': ReportResult.objects.order_by('-created')[:10],
-            'changelog': ObjectChange.objects.prefetch_related('user', 'changed_object_type')[:15],
+            'changelog': changelog[:15],
             'new_release': new_release,
         })
 
@@ -278,17 +262,12 @@ class SearchView(View):
 
         if form.is_valid():
 
-            # Searching for a single type of object
-            obj_types = []
             if form.cleaned_data['obj_type']:
-                obj_type = form.cleaned_data['obj_type']
-                if request.user.has_perm(SEARCH_TYPES[obj_type]['permission']):
-                    obj_types.append(form.cleaned_data['obj_type'])
-            # Searching all object types
+                # Searching for a single type of object
+                obj_types = [form.cleaned_data['obj_type']]
             else:
-                for obj_type in SEARCH_TYPES.keys():
-                    if request.user.has_perm(SEARCH_TYPES[obj_type]['permission']):
-                        obj_types.append(obj_type)
+                # Searching all object types
+                obj_types = SEARCH_TYPES.keys()
 
             for obj_type in obj_types:
 

From fa0ff8be39caa8c0d73668efea32ff60ec5b34d4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 13:06:03 -0400
Subject: [PATCH 156/505] Restrict ExportTemplates available via export button

---
 netbox/utilities/templatetags/buttons.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py
index 85f75f79e..da40ce9d5 100644
--- a/netbox/utilities/templatetags/buttons.py
+++ b/netbox/utilities/templatetags/buttons.py
@@ -97,7 +97,8 @@ def import_button(url):
 @register.inclusion_tag('buttons/export.html', takes_context=True)
 def export_button(context, content_type=None):
     if content_type is not None:
-        export_templates = ExportTemplate.objects.filter(content_type=content_type)
+        user = context['request'].user
+        export_templates = ExportTemplate.objects.restrict(user, 'view').filter(content_type=content_type)
     else:
         export_templates = []
 

From ed0b38c7a7cdbcbc843582f640a59cecd1a601fc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 13:15:58 -0400
Subject: [PATCH 157/505] Bypass restriction for querysets used for filtering
 by related object

---
 netbox/circuits/filters.py       |  30 +++---
 netbox/dcim/filters.py           | 154 +++++++++++++++----------------
 netbox/extras/filters.py         |  32 +++----
 netbox/ipam/filters.py           |  66 ++++++-------
 netbox/secrets/filters.py        |   8 +-
 netbox/tenancy/filters.py        |  16 ++--
 netbox/utilities/filters.py      |   2 +-
 netbox/virtualization/filters.py |  46 ++++-----
 8 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py
index 206dcc305..a81d6acca 100644
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -24,13 +24,13 @@ class ProviderFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilte
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='circuits__terminations__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='circuits__terminations__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -38,12 +38,12 @@ class ProviderFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilte
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='circuits__terminations__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='circuits__terminations__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
@@ -78,22 +78,22 @@ class CircuitFilterSet(BaseFilterSet, CustomFieldFilterSet, TenancyFilterSet, Cr
         label='Search',
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Provider.objects.all(),
+        queryset=Provider.objects.unrestricted(),
         label='Provider (ID)',
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
-        queryset=Provider.objects.all(),
+        queryset=Provider.objects.unrestricted(),
         to_field_name='slug',
         label='Provider (slug)',
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=CircuitType.objects.all(),
+        queryset=CircuitType.objects.unrestricted(),
         label='Circuit type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
-        queryset=CircuitType.objects.all(),
+        queryset=CircuitType.objects.unrestricted(),
         to_field_name='slug',
         label='Circuit type (slug)',
     )
@@ -103,23 +103,23 @@ class CircuitFilterSet(BaseFilterSet, CustomFieldFilterSet, TenancyFilterSet, Cr
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='terminations__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='terminations__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='terminations__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='terminations__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -150,16 +150,16 @@ class CircuitTerminationFilterSet(BaseFilterSet):
         label='Search',
     )
     circuit_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Circuit.objects.all(),
+        queryset=Circuit.objects.unrestricted(),
         label='Circuit',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 92f7f8241..d22511ede 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -62,12 +62,12 @@ __all__ = (
 
 class RegionFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         label='Parent region (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         to_field_name='slug',
         label='Parent region (slug)',
     )
@@ -87,13 +87,13 @@ class SiteFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         null_value=None
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='region',
         lookup_expr='in',
         to_field_name='slug',
@@ -131,35 +131,35 @@ class SiteFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
 
 class RackGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         label='Rack group (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Rack group (slug)',
     )
@@ -182,36 +182,36 @@ class RackFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='group',
         lookup_expr='in',
         to_field_name='slug',
@@ -222,12 +222,12 @@ class RackFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         null_value=None
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RackRole.objects.all(),
+        queryset=RackRole.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=RackRole.objects.all(),
+        queryset=RackRole.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -261,28 +261,28 @@ class RackReservationFilterSet(BaseFilterSet, TenancyFilterSet):
         label='Search',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Rack.objects.all(),
+        queryset=Rack.objects.unrestricted(),
         label='Rack (ID)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='rack__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='rack__group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='rack__group',
         lookup_expr='in',
         to_field_name='slug',
@@ -328,12 +328,12 @@ class DeviceTypeFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFil
         label='Search',
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -410,7 +410,7 @@ class DeviceTypeFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFil
 
 class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet):
     devicetype_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceType.objects.all(),
+        queryset=DeviceType.objects.unrestricted(),
         field_name='device_type_id',
         label='Device type (ID)',
     )
@@ -482,12 +482,12 @@ class DeviceRoleFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
 class PlatformFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -510,81 +510,81 @@ class DeviceFilterSet(
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__manufacturer',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__manufacturer__slug',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
     device_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceType.objects.all(),
+        queryset=DeviceType.objects.unrestricted(),
         label='Device type (ID)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role_id',
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role__slug',
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         label='Platform (ID)',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platform__slug',
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         to_field_name='slug',
         label='Platform (slug)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     rack_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='rack__group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack',
-        queryset=Rack.objects.all(),
+        queryset=Rack.objects.unrestricted(),
         label='Rack (ID)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Cluster.objects.all(),
+        queryset=Cluster.objects.unrestricted(),
         label='VM cluster (ID)',
     )
     model = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__slug',
-        queryset=DeviceType.objects.all(),
+        queryset=DeviceType.objects.unrestricted(),
         to_field_name='slug',
         label='Device model (slug)',
     )
@@ -609,7 +609,7 @@ class DeviceFilterSet(
     )
     virtual_chassis_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_chassis',
-        queryset=VirtualChassis.objects.all(),
+        queryset=VirtualChassis.objects.unrestricted(),
         label='Virtual chassis (ID)',
     )
     virtual_chassis_member = django_filters.BooleanFilter(
@@ -707,13 +707,13 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='device__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='device__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -721,22 +721,22 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         to_field_name='name',
         label='Device (name)',
     )
@@ -843,7 +843,7 @@ class InterfaceFilterSet(BaseFilterSet, DeviceComponentFilterSet):
     )
     lag_id = django_filters.ModelMultipleChoiceFilter(
         field_name='lag',
-        queryset=Interface.objects.all(),
+        queryset=Interface.objects.unrestricted(),
         label='LAG interface (ID)',
     )
     mac_address = MultiValueMACAddressFilter()
@@ -950,13 +950,13 @@ class InventoryItemFilterSet(BaseFilterSet, DeviceComponentFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='device__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='device__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -964,35 +964,35 @@ class InventoryItemFilterSet(BaseFilterSet, DeviceComponentFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     device_id = django_filters.ModelChoiceFilter(
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         label='Device (ID)',
     )
     device = django_filters.ModelChoiceFilter(
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         to_field_name='name',
         label='Device (name)',
     )
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=InventoryItem.objects.all(),
+        queryset=InventoryItem.objects.unrestricted(),
         label='Parent inventory item (ID)',
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.all(),
+        queryset=Manufacturer.objects.unrestricted(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -1023,13 +1023,13 @@ class VirtualChassisFilterSet(BaseFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='master__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='master__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -1037,23 +1037,23 @@ class VirtualChassisFilterSet(BaseFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='master__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='master__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
         field_name='master__tenant',
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
         field_name='master__tenant__slug',
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         to_field_name='slug',
         label='Tenant (slug)',
     )
@@ -1239,30 +1239,30 @@ class PowerPanelFilterSet(BaseFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     rack_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.all(),
+        queryset=RackGroup.objects.unrestricted(),
         field_name='rack_group',
         lookup_expr='in',
         label='Rack group (ID)',
@@ -1288,13 +1288,13 @@ class PowerFeedFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='power_panel__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='power_panel__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -1302,22 +1302,22 @@ class PowerFeedFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='power_panel__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='power_panel__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     power_panel_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=PowerPanel.objects.all(),
+        queryset=PowerPanel.objects.unrestricted(),
         label='Power panel (ID)',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack',
-        queryset=Rack.objects.all(),
+        queryset=Rack.objects.unrestricted(),
         label='Rack (ID)',
     )
     tag = TagFilter()
diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index 7ccdb1d86..46db6d032 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -130,89 +130,89 @@ class ConfigContextFilterSet(BaseFilterSet):
     )
     region_id = django_filters.ModelMultipleChoiceFilter(
         field_name='regions',
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         label='Region',
     )
     region = django_filters.ModelMultipleChoiceFilter(
         field_name='regions__slug',
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='sites',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='sites__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='roles',
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         label='Role',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='roles__slug',
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
         field_name='platforms',
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         label='Platform',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platforms__slug',
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         to_field_name='slug',
         label='Platform (slug)',
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster_groups',
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         label='Cluster group',
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster_groups__slug',
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Cluster group (slug)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
         field_name='clusters',
-        queryset=Cluster.objects.all(),
+        queryset=Cluster.objects.unrestricted(),
         label='Cluster',
     )
     tenant_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='tenant_groups',
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         label='Tenant group',
     )
     tenant_group = django_filters.ModelMultipleChoiceFilter(
         field_name='tenant_groups__slug',
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Tenant group (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
         field_name='tenants',
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         label='Tenant',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
         field_name='tenants__slug',
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         to_field_name='slug',
         label='Tenant (slug)',
     )
     tag = django_filters.ModelMultipleChoiceFilter(
         field_name='tags__slug',
-        queryset=Tag.objects.all(),
+        queryset=Tag.objects.unrestricted(),
         to_field_name='slug',
         label='Tag (slug)',
     )
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 6641d1c8b..7662d5825 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -71,12 +71,12 @@ class AggregateFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
         label='Prefix',
     )
     rir_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RIR.objects.all(),
+        queryset=RIR.objects.unrestricted(),
         label='RIR (ID)',
     )
     rir = django_filters.ModelMultipleChoiceFilter(
         field_name='rir__slug',
-        queryset=RIR.objects.all(),
+        queryset=RIR.objects.unrestricted(),
         to_field_name='slug',
         label='RIR (slug)',
     )
@@ -148,40 +148,40 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         label='Mask length',
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VRF.objects.all(),
+        queryset=VRF.objects.unrestricted(),
         label='VRF',
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
-        queryset=VRF.objects.all(),
+        queryset=VRF.objects.unrestricted(),
         to_field_name='rd',
         label='VRF (RD)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     vlan_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VLAN.objects.all(),
+        queryset=VLAN.objects.unrestricted(),
         label='VLAN (ID)',
     )
     vlan_vid = django_filters.NumberFilter(
@@ -189,12 +189,12 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         label='VLAN number (1-4095)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Role.objects.all(),
+        queryset=Role.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=Role.objects.all(),
+        queryset=Role.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -290,12 +290,12 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         label='Mask length',
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VRF.objects.all(),
+        queryset=VRF.objects.unrestricted(),
         label='VRF',
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
-        queryset=VRF.objects.all(),
+        queryset=VRF.objects.unrestricted(),
         to_field_name='rd',
         label='VRF (RD)',
     )
@@ -311,23 +311,23 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='interface__virtual_machine',
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='interface__virtual_machine__name',
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         to_field_name='name',
         label='Virtual machine (name)',
     )
     interface = django_filters.ModelMultipleChoiceFilter(
         field_name='interface__name',
-        queryset=Interface.objects.all(),
+        queryset=Interface.objects.unrestricted(),
         to_field_name='name',
         label='Interface (ID)',
     )
     interface_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Interface.objects.all(),
+        queryset=Interface.objects.unrestricted(),
         label='Interface (ID)',
     )
     assigned_to_interface = django_filters.BooleanFilter(
@@ -394,25 +394,25 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
 
 class VLANGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
@@ -428,45 +428,45 @@ class VLANFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VLANGroup.objects.all(),
+        queryset=VLANGroup.objects.unrestricted(),
         label='Group (ID)',
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
-        queryset=VLANGroup.objects.all(),
+        queryset=VLANGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Group',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Role.objects.all(),
+        queryset=Role.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=Role.objects.all(),
+        queryset=Role.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -497,22 +497,22 @@ class ServiceFilterSet(BaseFilterSet, CreatedUpdatedFilterSet):
         label='Search',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         to_field_name='name',
         label='Device (name)',
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         to_field_name='name',
         label='Virtual machine (name)',
     )
diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py
index 78f25952a..fee9b4981 100644
--- a/netbox/secrets/filters.py
+++ b/netbox/secrets/filters.py
@@ -26,22 +26,22 @@ class SecretFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS
         label='Search',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=SecretRole.objects.all(),
+        queryset=SecretRole.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=SecretRole.objects.all(),
+        queryset=SecretRole.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.all(),
+        queryset=Device.objects.unrestricted(),
         to_field_name='name',
         label='Device (name)',
     )
diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py
index af5ee0b2c..42137d7ca 100644
--- a/netbox/tenancy/filters.py
+++ b/netbox/tenancy/filters.py
@@ -15,12 +15,12 @@ __all__ = (
 
 class TenantGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         label='Tenant group (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Tenant group group (slug)',
     )
@@ -36,13 +36,13 @@ class TenantFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS
         label='Search',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         field_name='group',
         lookup_expr='in',
         label='Tenant group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         field_name='group',
         lookup_expr='in',
         to_field_name='slug',
@@ -70,24 +70,24 @@ class TenancyFilterSet(django_filters.FilterSet):
     An inheritable FilterSet for models which support Tenant assignment.
     """
     tenant_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         field_name='tenant__group',
         lookup_expr='in',
         label='Tenant Group (ID)',
     )
     tenant_group = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.all(),
+        queryset=TenantGroup.objects.unrestricted(),
         field_name='tenant__group',
         to_field_name='slug',
         lookup_expr='in',
         label='Tenant Group (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.all(),
+        queryset=Tenant.objects.unrestricted(),
         field_name='tenant__slug',
         to_field_name='slug',
         label='Tenant (slug)',
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index f628ca917..b13c55f40 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -102,7 +102,7 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter):
         kwargs.setdefault('field_name', 'tags__slug')
         kwargs.setdefault('to_field_name', 'slug')
         kwargs.setdefault('conjoined', True)
-        kwargs.setdefault('queryset', Tag.objects.all())
+        kwargs.setdefault('queryset', Tag.objects.unrestricted())
 
         super().__init__(*args, **kwargs)
 
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index a54b6ab28..7e8349cf1 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -40,45 +40,45 @@ class ClusterFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cr
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         label='Parent group (ID)',
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Parent group (slug)',
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ClusterType.objects.all(),
+        queryset=ClusterType.objects.unrestricted(),
         label='Cluster type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
-        queryset=ClusterType.objects.all(),
+        queryset=ClusterType.objects.unrestricted(),
         to_field_name='slug',
         label='Cluster type (slug)',
     )
@@ -114,38 +114,38 @@ class VirtualMachineFilterSet(
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group',
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         label='Cluster group (ID)',
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group__slug',
-        queryset=ClusterGroup.objects.all(),
+        queryset=ClusterGroup.objects.unrestricted(),
         to_field_name='slug',
         label='Cluster group (slug)',
     )
     cluster_type_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type',
-        queryset=ClusterType.objects.all(),
+        queryset=ClusterType.objects.unrestricted(),
         label='Cluster type (ID)',
     )
     cluster_type = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type__slug',
-        queryset=ClusterType.objects.all(),
+        queryset=ClusterType.objects.unrestricted(),
         to_field_name='slug',
         label='Cluster type (slug)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Cluster.objects.all(),
+        queryset=Cluster.objects.unrestricted(),
         label='Cluster (ID)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='cluster__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.all(),
+        queryset=Region.objects.unrestricted(),
         field_name='cluster__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -153,32 +153,32 @@ class VirtualMachineFilterSet(
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__site',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__site__slug',
-        queryset=Site.objects.all(),
+        queryset=Site.objects.unrestricted(),
         to_field_name='slug',
         label='Site (slug)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=DeviceRole.objects.all(),
+        queryset=DeviceRole.objects.unrestricted(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         label='Platform (ID)',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platform__slug',
-        queryset=Platform.objects.all(),
+        queryset=Platform.objects.unrestricted(),
         to_field_name='slug',
         label='Platform (slug)',
     )
@@ -208,12 +208,12 @@ class InterfaceFilterSet(BaseFilterSet):
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine',
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
-        queryset=VirtualMachine.objects.all(),
+        queryset=VirtualMachine.objects.unrestricted(),
         to_field_name='name',
         label='Virtual machine',
     )

From 0f8df8c985c3a22a25afbf32c16804b41f025854 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 13:31:51 -0400
Subject: [PATCH 158/505] Add unrestricted() to Rack methods

---
 netbox/dcim/models/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index f7411ca56..236979b4a 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -695,7 +695,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         return [u for u in elevation.values()]
 
-    def get_available_units(self, u_height=1, rack_face=None, exclude=list()):
+    def get_available_units(self, u_height=1, rack_face=None, exclude=None):
         """
         Return a list of units within the rack available to accommodate a device of a given U height (default 1).
         Optionally exclude one or more devices when calculating empty units (needed when moving a device from one
@@ -705,9 +705,10 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         :param rack_face: The face of the rack (front or rear) required; 'None' if device is full depth
         :param exclude: List of devices IDs to exclude (useful when moving a device within a rack)
         """
-
         # Gather all devices which consume U space within the rack
-        devices = self.devices.prefetch_related('device_type').filter(position__gte=1).exclude(pk__in=exclude)
+        devices = self.devices.unrestricted().prefetch_related('device_type').filter(position__gte=1)
+        if exclude is not None:
+            devices = devices.exclude(pk__in=exclude)
 
         # Initialize the rack unit skeleton
         units = list(range(1, self.u_height + 1))
@@ -735,7 +736,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         Return a dictionary mapping all reserved units within the rack to their reservation.
         """
         reserved_units = {}
-        for r in self.reservations.all():
+        for r in self.reservations.unrestricted():
             for u in r.units:
                 reserved_units[u] = r
         return reserved_units
@@ -789,7 +790,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         """
         Determine the utilization rate of power in the rack and return it as a percentage.
         """
-        power_stats = PowerFeed.objects.filter(
+        power_stats = PowerFeed.objects.unrestricted().filter(
             rack=self
         ).annotate(
             allocated_draw_total=Sum('connected_endpoint__poweroutlets__connected_endpoint__allocated_draw'),

From ffa3a229b505dcc68f1c195c991092461079eab0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 14:00:43 -0400
Subject: [PATCH 159/505] Fix restriction violations for provider, circuit
 models

---
 netbox/circuits/views.py                               | 7 ++++++-
 netbox/templates/circuits/inc/circuit_termination.html | 2 +-
 netbox/templates/circuits/provider.html                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 5da912f0a..f100dd3c7 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -136,18 +136,23 @@ class CircuitView(ObjectView):
     queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant__group')
 
     def get(self, request, pk):
-
         circuit = get_object_or_404(self.queryset, pk=pk)
+
         termination_a = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_A
         ).first()
+        if termination_a and termination_a.connected_endpoint:
+            termination_a.ip_addresses = termination_a.connected_endpoint.ip_addresses.restrict(request.user, 'view')
+
         termination_z = CircuitTermination.objects.restrict(request.user, 'view').prefetch_related(
             'site__region', 'connected_endpoint__device'
         ).filter(
             circuit=circuit, term_side=CircuitTerminationSideChoices.SIDE_Z
         ).first()
+        if termination_z and termination_z.connected_endpoint:
+            termination_z.ip_addresses = termination_z.connected_endpoint.ip_addresses.restrict(request.user, 'view')
 
         return render(request, 'circuits/circuit.html', {
             'circuit': circuit,
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 8db715711..30d875657 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -90,7 +90,7 @@
                 <td>IP Addressing</td>
                 <td>
                     {% if termination.connected_endpoint %}
-                        {% for ip in termination.connected_endpoint.ip_addresses.all %}
+                        {% for ip in termination.ip_addresses %}
                             {% if not forloop.first %}<br />{% endif %}
                             <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a> ({{ ip.vrf|default:"Global" }})
                         {% empty %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index c02637e8e..42c322ce2 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -99,7 +99,7 @@
                 <tr>
                     <td>Circuits</td>
                     <td>
-                        <a href="{% url 'circuits:circuit_list' %}?provider={{ provider.slug }}">{{ provider.circuits.count }}</a>
+                        <a href="{% url 'circuits:circuit_list' %}?provider={{ provider.slug }}">{{ circuits_table.rows|length }}</a>
                     </td>
                 </tr>
             </table>

From 1e259f30439799b2e5aaaa5bce745b6b9742efb0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 14:10:56 -0400
Subject: [PATCH 160/505] Allow unrestricted retrieval of MPTT ancestors

---
 netbox/templates/dcim/site.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index f5823f721..d6c21bf92 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -12,7 +12,7 @@
             <ol class="breadcrumb">
                 <li><a href="{% url 'dcim:site_list' %}">Sites</a></li>
                 {% if site.region %}
-                    {% for region in site.region.get_ancestors %}
+                    {% for region in site.region.get_ancestors.unrestricted %}
                         <li><a href="{{ region.get_absolute_url }}">{{ region }}</a></li>
                     {% endfor %}
                     <li><a href="{{ site.region.get_absolute_url }}">{{ site.region }}</a></li>
@@ -86,7 +86,7 @@
                     <td>Region</td>
                     <td>
                         {% if site.region %}
-                            {% for region in site.region.get_ancestors %}
+                            {% for region in site.region.get_ancestors.unrestricted %}
                                 <a href="{{ region.get_absolute_url }}">{{ region }}</a>
                                 <i class="fa fa-angle-right"></i>
                             {% endfor %}

From adf0255bdf3ffdf30825debd92353f4e44cbc5bb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 14:17:40 -0400
Subject: [PATCH 161/505] Allow unrestricted access to assigned tags

---
 netbox/templates/extras/inc/tags_panel.html | 2 +-
 netbox/utilities/utils.py                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
index 257a1fc22..7eeab8ec9 100644
--- a/netbox/templates/extras/inc/tags_panel.html
+++ b/netbox/templates/extras/inc/tags_panel.html
@@ -4,7 +4,7 @@
         <strong>Tags</strong>
     </div>
     <div class="panel-body">
-        {% for tag in tags %}
+        {% for tag in tags.unrestricted %}
             {% tag tag url %}
         {% empty %}
             <span class="text-muted">No tags assigned</span>
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 351b1fd68..d5b28c811 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -215,7 +215,7 @@ def prepare_cloned_fields(instance):
 
         # Copy tags
         if is_taggable(instance):
-            params['tags'] = ','.join([t.name for t in instance.tags.all()])
+            params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
 
     # Concatenate parameters into a URL query string
     param_string = '&'.join(

From efed2bc26223234cd8d57e3287e9a410dcb40455 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 14:53:51 -0400
Subject: [PATCH 162/505] Fix restriction violations for rack model

---
 netbox/dcim/views.py            | 8 +++++---
 netbox/templates/dcim/rack.html | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 846cec506..6aad18bd3 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -370,7 +370,6 @@ class RackView(ObjectView):
     queryset = Rack.objects.prefetch_related('site__region', 'tenant__group', 'group', 'role')
 
     def get(self, request, pk):
-
         rack = get_object_or_404(self.queryset, pk=pk)
 
         nonracked_devices = Device.objects.restrict(request.user, 'view').filter(
@@ -378,10 +377,12 @@ class RackView(ObjectView):
             position__isnull=True,
             parent_bay__isnull=True
         ).prefetch_related('device_type__manufacturer')
+
+        peer_racks = Rack.objects.restrict(request.user, 'view').filter(site=rack.site)
         if rack.group:
-            peer_racks = Rack.objects.filter(site=rack.site, group=rack.group)
+            peer_racks = peer_racks.filter(group=rack.group)
         else:
-            peer_racks = Rack.objects.filter(site=rack.site, group__isnull=True)
+            peer_racks = peer_racks.filter(group__isnull=True)
         next_rack = peer_racks.filter(name__gt=rack.name).order_by('name').first()
         prev_rack = peer_racks.filter(name__lt=rack.name).order_by('-name').first()
 
@@ -390,6 +391,7 @@ class RackView(ObjectView):
 
         return render(request, 'dcim/rack.html', {
             'rack': rack,
+            'device_count': Device.objects.restrict(request.user, 'view').filter(rack=rack).count(),
             'reservations': reservations,
             'power_feeds': power_feeds,
             'nonracked_devices': nonracked_devices,
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 2c7452ba2..8d63a7095 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -138,7 +138,7 @@
                 <tr>
                     <td>Devices</td>
                     <td>
-                        <a href="{% url 'dcim:device_list' %}?rack_id={{ rack.id }}">{{ rack.devices.count }}</a>
+                        <a href="{% url 'dcim:device_list' %}?rack_id={{ rack.id }}">{{ device_count }}</a>
                     </td>
                 </tr>
                     <tr>

From 067e89f6a0aec0ac1badcc3c7d6993921fda5802 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 14:59:22 -0400
Subject: [PATCH 163/505] Allow unrestricted access to assigned tags

---
 netbox/utilities/forms.py  | 8 ++++++--
 netbox/utilities/tables.py | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 9c54e5cb5..875ee72fd 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -585,8 +585,12 @@ class TagFilterField(forms.MultipleChoiceField):
 
     def __init__(self, model, *args, **kwargs):
         def get_choices():
-            tags = model.tags.annotate(count=Count('extras_taggeditem_items')).order_by('name')
-            return [(str(tag.slug), '{} ({})'.format(tag.name, tag.count)) for tag in tags]
+            tags = model.tags.all().unrestricted().annotate(
+                count=Count('extras_taggeditem_items')
+            ).order_by('name')
+            return [
+                (str(tag.slug), '{} ({})'.format(tag.name, tag.count)) for tag in tags
+            ]
 
         # Choices are fetched each time the form is initialized
         super().__init__(label='Tags', choices=get_choices, required=False, *args, **kwargs)
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 10e408b43..5e277e633 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -151,7 +151,7 @@ class TagColumn(tables.TemplateColumn):
     Display a list of tags assigned to the object.
     """
     template_code = """
-    {% for tag in value.all %}
+    {% for tag in value.all.unrestricted %}
         {% include 'utilities/templatetags/tag.html' %}
     {% empty %}
         <span class="text-muted">&mdash;</span>

From 58f4e3756c627a75d7d5ffe14dbe3ec35b96872f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 15:04:34 -0400
Subject: [PATCH 164/505] Fix ObjectChangeLogView

---
 netbox/extras/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 31702727e..667b1c0d5 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -257,7 +257,8 @@ class ObjectChangeLogView(View):
     def get(self, request, model, **kwargs):
 
         # Get object my model and kwargs (e.g. slug='foo')
-        obj = get_object_or_404(model, **kwargs)
+        queryset = model.objects.restrict(request.user, 'view')
+        obj = get_object_or_404(queryset, **kwargs)
 
         # Gather all changes for this object (and its related objects)
         content_type = ContentType.objects.get_for_model(model)

From c7aa0a2321378d96b686a07c4b6ae112a3507852 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 15:08:14 -0400
Subject: [PATCH 165/505] Fix prepare_cloned_fields() inefficiency

---
 netbox/utilities/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index d5b28c811..d1b4abb44 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -213,9 +213,9 @@ def prepare_cloned_fields(instance):
         if field_value not in (None, ''):
             params[field_name] = field_value
 
-        # Copy tags
-        if is_taggable(instance):
-            params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
+    # Copy tags
+    if is_taggable(instance):
+        params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
 
     # Concatenate parameters into a URL query string
     param_string = '&'.join(

From b318bde76c9baf9c08c58d3a0246b46d2ef2d256 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 16:40:16 -0400
Subject: [PATCH 166/505] Fix queryset reference under BulkDeleteView

---
 netbox/utilities/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 59b659582..6da516171 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1006,7 +1006,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 logger.debug("Form validation was successful")
 
                 # Delete objects
-                queryset = model.objects.filter(pk__in=pk_list)
+                queryset = self.queryset.filter(pk__in=pk_list)
                 try:
                     deleted_count = queryset.delete()[1][model._meta.label]
                 except ProtectedError as e:

From 4ae05dddebf507f8d679feaf98f2468c63df75a7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 16 Jun 2020 16:57:32 -0400
Subject: [PATCH 167/505] Tag should use a stock manager by default

---
 netbox/extras/api/views.py   |  2 +-
 netbox/extras/filters.py     |  2 +-
 netbox/extras/models/tags.py |  3 ++-
 netbox/extras/views.py       | 12 ++++++------
 netbox/utilities/filters.py  |  2 +-
 netbox/utilities/forms.py    |  2 +-
 netbox/utilities/utils.py    |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 7e547dafd..b40cb4459 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -108,7 +108,7 @@ class ExportTemplateViewSet(ModelViewSet):
 #
 
 class TagViewSet(ModelViewSet):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted.annotate(
         tagged_items=Count('extras_taggeditem_items', distinct=True)
     )
     serializer_class = serializers.TagSerializer
diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index 46db6d032..eac55ad69 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -212,7 +212,7 @@ class ConfigContextFilterSet(BaseFilterSet):
     )
     tag = django_filters.ModelMultipleChoiceFilter(
         field_name='tags__slug',
-        queryset=Tag.objects.unrestricted(),
+        queryset=Tag.objects.all(),
         to_field_name='slug',
         label='Tag (slug)',
     )
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index d5792ebda..a2d43a93b 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -22,7 +22,8 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
-    objects = RestrictedQuerySet.as_manager()
+    objects = models.Manager()
+    restricted = RestrictedQuerySet.as_manager()
 
     def get_absolute_url(self):
         return reverse('extras:tag', args=[self.slug])
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 667b1c0d5..98b82edb9 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -28,7 +28,7 @@ from .tables import ConfigContextTable, ObjectChangeTable, TagTable, TaggedItemT
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -40,7 +40,7 @@ class TagListView(ObjectListView):
 
 
 class TagView(ObjectView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted.all()
 
     def get(self, request, slug):
 
@@ -67,19 +67,19 @@ class TagView(ObjectView):
 
 
 class TagEditView(ObjectEditView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted.all()
     model_form = forms.TagForm
     default_return_url = 'extras:tag_list'
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted.all()
     default_return_url = 'extras:tag_list'
 
 
 class TagBulkEditView(BulkEditView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -90,7 +90,7 @@ class TagBulkEditView(BulkEditView):
 
 
 class TagBulkDeleteView(BulkDeleteView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
         'name'
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index b13c55f40..f628ca917 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -102,7 +102,7 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter):
         kwargs.setdefault('field_name', 'tags__slug')
         kwargs.setdefault('to_field_name', 'slug')
         kwargs.setdefault('conjoined', True)
-        kwargs.setdefault('queryset', Tag.objects.unrestricted())
+        kwargs.setdefault('queryset', Tag.objects.all())
 
         super().__init__(*args, **kwargs)
 
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 875ee72fd..3ac954a82 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -585,7 +585,7 @@ class TagFilterField(forms.MultipleChoiceField):
 
     def __init__(self, model, *args, **kwargs):
         def get_choices():
-            tags = model.tags.all().unrestricted().annotate(
+            tags = model.tags.annotate(
                 count=Count('extras_taggeditem_items')
             ).order_by('name')
             return [
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index d1b4abb44..4c07f5520 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -215,7 +215,7 @@ def prepare_cloned_fields(instance):
 
     # Copy tags
     if is_taggable(instance):
-        params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
+        params['tags'] = ','.join([t.name for t in instance.tags.all()])
 
     # Concatenate parameters into a URL query string
     param_string = '&'.join(

From 448dc1442cf002480f4bb3cac19b9aee790e0e41 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 09:57:17 -0400
Subject: [PATCH 168/505] Replace TaggitSerializer and TagListSerializerField
 with TaggedObjectSerializer

---
 netbox/circuits/api/serializers.py       |  8 ++--
 netbox/dcim/api/serializers.py           | 60 ++++++++----------------
 netbox/extras/api/nested_serializers.py  |  3 +-
 netbox/extras/api/serializers.py         | 22 +++++++++
 netbox/ipam/api/serializers.py           | 20 +++-----
 netbox/netbox/settings.py                |  1 -
 netbox/secrets/api/serializers.py        |  5 +-
 netbox/tenancy/api/serializers.py        |  5 +-
 netbox/utilities/custom_inspectors.py    | 16 +------
 netbox/virtualization/api/serializers.py | 13 ++---
 10 files changed, 62 insertions(+), 91 deletions(-)

diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py
index 6bac48a59..e8171e2fb 100644
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -1,11 +1,11 @@
 from rest_framework import serializers
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from circuits.choices import CircuitStatusChoices
 from circuits.models import Provider, Circuit, CircuitTermination, CircuitType
 from dcim.api.nested_serializers import NestedCableSerializer, NestedInterfaceSerializer, NestedSiteSerializer
 from dcim.api.serializers import ConnectedEndpointSerializer
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import ChoiceField, ValidatedModelSerializer, WritableNestedSerializer
 from .nested_serializers import *
@@ -15,8 +15,7 @@ from .nested_serializers import *
 # Providers
 #
 
-class ProviderSerializer(TaggitSerializer, CustomFieldModelSerializer):
-    tags = TagListSerializerField(required=False)
+class ProviderSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -49,14 +48,13 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'site', 'connected_endpoint', 'port_speed', 'upstream_speed', 'xconnect_id']
 
 
-class CircuitSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class CircuitSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     provider = NestedProviderSerializer()
     status = ChoiceField(choices=CircuitStatusChoices, required=False)
     type = NestedCircuitTypeSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     termination_a = CircuitCircuitTerminationSerializer(read_only=True)
     termination_z = CircuitCircuitTerminationSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Circuit
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 5250045c5..c684b8041 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -2,7 +2,6 @@ from django.contrib.contenttypes.models import ContentType
 from drf_yasg.utils import swagger_serializer_method
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from dcim.choices import *
 from dcim.constants import *
@@ -14,6 +13,7 @@ from dcim.models import (
     VirtualChassis,
 )
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer
 from ipam.models import VLAN
 from tenancy.api.nested_serializers import NestedTenantSerializer
@@ -67,12 +67,11 @@ class RegionSerializer(serializers.ModelSerializer):
         fields = ['id', 'name', 'slug', 'parent', 'description', 'site_count']
 
 
-class SiteSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class SiteSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=SiteStatusChoices, required=False)
     region = NestedRegionSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     time_zone = TimeZoneField(required=False)
-    tags = TagListSerializerField(required=False)
     circuit_count = serializers.IntegerField(read_only=True)
     device_count = serializers.IntegerField(read_only=True)
     prefix_count = serializers.IntegerField(read_only=True)
@@ -112,7 +111,7 @@ class RackRoleSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'color', 'description', 'rack_count']
 
 
-class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class RackSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     site = NestedSiteSerializer()
     group = NestedRackGroupSerializer(required=False, allow_null=True, default=None)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -121,7 +120,6 @@ class RackSerializer(TaggitSerializer, CustomFieldModelSerializer):
     type = ChoiceField(choices=RackTypeChoices, allow_blank=True, required=False)
     width = ChoiceField(choices=RackWidthChoices, required=False)
     outer_unit = ChoiceField(choices=RackDimensionUnitChoices, allow_blank=True, required=False)
-    tags = TagListSerializerField(required=False)
     device_count = serializers.IntegerField(read_only=True)
     powerfeed_count = serializers.IntegerField(read_only=True)
 
@@ -161,11 +159,10 @@ class RackUnitSerializer(serializers.Serializer):
     device = NestedDeviceSerializer(read_only=True)
 
 
-class RackReservationSerializer(ValidatedModelSerializer):
+class RackReservationSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     rack = NestedRackSerializer()
     user = NestedUserSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = RackReservation
@@ -224,10 +221,9 @@ class ManufacturerSerializer(ValidatedModelSerializer):
         ]
 
 
-class DeviceTypeSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class DeviceTypeSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     manufacturer = NestedManufacturerSerializer()
     subdevice_role = ChoiceField(choices=SubdeviceRoleChoices, allow_blank=True, required=False)
-    tags = TagListSerializerField(required=False)
     device_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -363,7 +359,7 @@ class PlatformSerializer(ValidatedModelSerializer):
         ]
 
 
-class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class DeviceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     device_type = NestedDeviceTypeSerializer()
     device_role = NestedDeviceRoleSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -378,7 +374,6 @@ class DeviceSerializer(TaggitSerializer, CustomFieldModelSerializer):
     parent_device = serializers.SerializerMethodField()
     cluster = NestedClusterSerializer(required=False, allow_null=True)
     virtual_chassis = NestedVirtualChassisSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Device
@@ -434,7 +429,7 @@ class DeviceNAPALMSerializer(serializers.Serializer):
     method = serializers.DictField()
 
 
-class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+class ConsoleServerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -442,7 +437,6 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer)
         required=False
     )
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = ConsoleServerPort
@@ -452,7 +446,7 @@ class ConsoleServerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer)
         ]
 
 
-class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+class ConsolePortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -460,7 +454,6 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         required=False
     )
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = ConsolePort
@@ -470,7 +463,7 @@ class ConsolePortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         ]
 
 
-class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+class PowerOutletSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=PowerOutletTypeChoices,
@@ -488,9 +481,6 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
     cable = NestedCableSerializer(
         read_only=True
     )
-    tags = TagListSerializerField(
-        required=False
-    )
 
     class Meta:
         model = PowerOutlet
@@ -500,7 +490,7 @@ class PowerOutletSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         ]
 
 
-class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+class PowerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=PowerPortTypeChoices,
@@ -508,7 +498,6 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         required=False
     )
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = PowerPort
@@ -518,7 +507,7 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         ]
 
 
-class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
+class InterfaceSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=InterfaceTypeChoices)
     lag = NestedInterfaceSerializer(required=False, allow_null=True)
@@ -531,7 +520,6 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         many=True
     )
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
     count_ipaddresses = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -563,11 +551,10 @@ class InterfaceSerializer(TaggitSerializer, ConnectedEndpointSerializer):
         return super().validate(data)
 
 
-class RearPortSerializer(TaggitSerializer, ValidatedModelSerializer):
+class RearPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=PortTypeChoices)
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = RearPort
@@ -585,22 +572,20 @@ class FrontPortRearPortSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'name']
 
 
-class FrontPortSerializer(TaggitSerializer, ValidatedModelSerializer):
+class FrontPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=PortTypeChoices)
     rear_port = FrontPortRearPortSerializer()
     cable = NestedCableSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = FrontPort
         fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'tags']
 
 
-class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
+class DeviceBaySerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     device = NestedDeviceSerializer()
     installed_device = NestedDeviceSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = DeviceBay
@@ -611,12 +596,11 @@ class DeviceBaySerializer(TaggitSerializer, ValidatedModelSerializer):
 # Inventory items
 #
 
-class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer):
+class InventoryItemSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     device = NestedDeviceSerializer()
     # Provide a default value to satisfy UniqueTogetherValidator
     parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None)
     manufacturer = NestedManufacturerSerializer(required=False, allow_null=True, default=None)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = InventoryItem
@@ -630,7 +614,7 @@ class InventoryItemSerializer(TaggitSerializer, ValidatedModelSerializer):
 # Cables
 #
 
-class CableSerializer(ValidatedModelSerializer):
+class CableSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     termination_a_type = ContentTypeField(
         queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS)
     )
@@ -641,7 +625,6 @@ class CableSerializer(ValidatedModelSerializer):
     termination_b = serializers.SerializerMethodField(read_only=True)
     status = ChoiceField(choices=CableStatusChoices, required=False)
     length_unit = ChoiceField(choices=CableLengthUnitChoices, allow_blank=True, required=False)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Cable
@@ -710,9 +693,8 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer):
 # Virtual chassis
 #
 
-class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer):
+class VirtualChassisSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     master = NestedDeviceSerializer()
-    tags = TagListSerializerField(required=False)
     member_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -724,14 +706,13 @@ class VirtualChassisSerializer(TaggitSerializer, ValidatedModelSerializer):
 # Power panels
 #
 
-class PowerPanelSerializer(ValidatedModelSerializer):
+class PowerPanelSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     site = NestedSiteSerializer()
     rack_group = NestedRackGroupSerializer(
         required=False,
         allow_null=True,
         default=None
     )
-    tags = TagListSerializerField(required=False)
     powerfeed_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -739,7 +720,7 @@ class PowerPanelSerializer(ValidatedModelSerializer):
         fields = ['id', 'site', 'rack_group', 'name', 'tags', 'powerfeed_count']
 
 
-class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class PowerFeedSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     power_panel = NestedPowerPanelSerializer()
     rack = NestedRackSerializer(
         required=False,
@@ -762,9 +743,6 @@ class PowerFeedSerializer(TaggitSerializer, CustomFieldModelSerializer):
         choices=PowerFeedPhaseChoices,
         default=PowerFeedPhaseChoices.PHASE_SINGLE
     )
-    tags = TagListSerializerField(
-        required=False
-    )
 
     class Meta:
         model = PowerFeed
diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py
index 672b10a78..4e95b389b 100644
--- a/netbox/extras/api/nested_serializers.py
+++ b/netbox/extras/api/nested_serializers.py
@@ -38,11 +38,10 @@ class NestedGraphSerializer(WritableNestedSerializer):
 
 class NestedTagSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detail')
-    tagged_items = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = models.Tag
-        fields = ['id', 'url', 'name', 'slug', 'color', 'tagged_items']
+        fields = ['id', 'url', 'name', 'slug', 'color']
 
 
 class NestedReportResultSerializer(serializers.ModelSerializer):
diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 54c0650da..5bf664b2f 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -95,6 +95,28 @@ class TagSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'color', 'description', 'tagged_items']
 
 
+class TaggedObjectSerializer(serializers.Serializer):
+    tags = NestedTagSerializer(many=True, required=False)
+
+    def create(self, validated_data):
+        tags = validated_data.pop('tags', [])
+        instance = super().create(validated_data)
+
+        return self._save_tags(instance, tags)
+
+    def update(self, instance, validated_data):
+        tags = validated_data.pop('tags', [])
+        instance = super().update(instance, validated_data)
+
+        return self._save_tags(instance, tags)
+
+    def _save_tags(self, instance, tags):
+        if tags:
+            instance.tags.set(*[t.name for t in tags])
+
+        return instance
+
+
 #
 # Image attachments
 #
diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py
index f5de2f509..e92006096 100644
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -3,11 +3,11 @@ from collections import OrderedDict
 from rest_framework import serializers
 from rest_framework.reverse import reverse
 from rest_framework.validators import UniqueTogetherValidator
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from dcim.api.nested_serializers import NestedDeviceSerializer, NestedSiteSerializer
 from dcim.models import Interface
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from ipam.choices import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 from tenancy.api.nested_serializers import NestedTenantSerializer
@@ -22,9 +22,8 @@ from .nested_serializers import *
 # VRFs
 #
 
-class VRFSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class VRFSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     tenant = NestedTenantSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
     ipaddress_count = serializers.IntegerField(read_only=True)
     prefix_count = serializers.IntegerField(read_only=True)
 
@@ -48,10 +47,9 @@ class RIRSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'is_private', 'description', 'aggregate_count']
 
 
-class AggregateSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class AggregateSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     rir = NestedRIRSerializer()
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Aggregate
@@ -98,13 +96,12 @@ class VLANGroupSerializer(ValidatedModelSerializer):
         return data
 
 
-class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class VLANSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     site = NestedSiteSerializer(required=False, allow_null=True)
     group = NestedVLANGroupSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     status = ChoiceField(choices=VLANStatusChoices, required=False)
     role = NestedRoleSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
     prefix_count = serializers.IntegerField(read_only=True)
 
     class Meta:
@@ -133,7 +130,7 @@ class VLANSerializer(TaggitSerializer, CustomFieldModelSerializer):
 # Prefixes
 #
 
-class PrefixSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class PrefixSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     site = NestedSiteSerializer(required=False, allow_null=True)
     vrf = NestedVRFSerializer(required=False, allow_null=True)
@@ -141,7 +138,6 @@ class PrefixSerializer(TaggitSerializer, CustomFieldModelSerializer):
     vlan = NestedVLANSerializer(required=False, allow_null=True)
     status = ChoiceField(choices=PrefixStatusChoices, required=False)
     role = NestedRoleSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Prefix
@@ -226,7 +222,7 @@ class IPAddressInterfaceSerializer(WritableNestedSerializer):
         return reverse(url_name, kwargs={'pk': obj.pk}, request=self.context['request'])
 
 
-class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class IPAddressSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     vrf = NestedVRFSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -235,7 +231,6 @@ class IPAddressSerializer(TaggitSerializer, CustomFieldModelSerializer):
     interface = IPAddressInterfaceSerializer(required=False, allow_null=True)
     nat_inside = NestedIPAddressSerializer(required=False, allow_null=True)
     nat_outside = NestedIPAddressSerializer(read_only=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = IPAddress
@@ -270,7 +265,7 @@ class AvailableIPSerializer(serializers.Serializer):
 # Services
 #
 
-class ServiceSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class ServiceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     device = NestedDeviceSerializer(required=False, allow_null=True)
     virtual_machine = NestedVirtualMachineSerializer(required=False, allow_null=True)
     protocol = ChoiceField(choices=ServiceProtocolChoices, required=False)
@@ -280,7 +275,6 @@ class ServiceSerializer(TaggitSerializer, CustomFieldModelSerializer):
         required=False,
         many=True
     )
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Service
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index bc1a8c2e7..30ad82bda 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -486,7 +486,6 @@ SWAGGER_SETTINGS = {
         'utilities.custom_inspectors.JSONFieldInspector',
         'utilities.custom_inspectors.NullableBooleanFieldInspector',
         'utilities.custom_inspectors.CustomChoiceFieldInspector',
-        'utilities.custom_inspectors.TagListFieldInspector',
         'utilities.custom_inspectors.SerializedPKRelatedFieldInspector',
         'drf_yasg.inspectors.CamelCaseJSONFilter',
         'drf_yasg.inspectors.ReferencingSerializerInspector',
diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py
index 0b73f0002..54132dd34 100644
--- a/netbox/secrets/api/serializers.py
+++ b/netbox/secrets/api/serializers.py
@@ -1,8 +1,8 @@
 from rest_framework import serializers
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from dcim.api.nested_serializers import NestedDeviceSerializer
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from secrets.models import Secret, SecretRole
 from utilities.api import ValidatedModelSerializer
 from .nested_serializers import *
@@ -20,11 +20,10 @@ class SecretRoleSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'description', 'secret_count']
 
 
-class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class SecretSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     device = NestedDeviceSerializer()
     role = NestedSecretRoleSerializer()
     plaintext = serializers.CharField()
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Secret
diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py
index 9c7a099e4..4454ac776 100644
--- a/netbox/tenancy/api/serializers.py
+++ b/netbox/tenancy/api/serializers.py
@@ -1,7 +1,7 @@
 from rest_framework import serializers
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from tenancy.models import Tenant, TenantGroup
 from utilities.api import ValidatedModelSerializer
 from .nested_serializers import *
@@ -20,9 +20,8 @@ class TenantGroupSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'parent', 'description', 'tenant_count']
 
 
-class TenantSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class TenantSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     group = NestedTenantGroupSerializer(required=False)
-    tags = TagListSerializerField(required=False)
     circuit_count = serializers.IntegerField(read_only=True)
     device_count = serializers.IntegerField(read_only=True)
     ipaddress_count = serializers.IntegerField(read_only=True)
diff --git a/netbox/utilities/custom_inspectors.py b/netbox/utilities/custom_inspectors.py
index 2cbe1cfc5..14463de23 100644
--- a/netbox/utilities/custom_inspectors.py
+++ b/netbox/utilities/custom_inspectors.py
@@ -1,10 +1,9 @@
 from django.contrib.postgres.fields import JSONField
 from drf_yasg import openapi
-from drf_yasg.inspectors import FieldInspector, NotHandled, PaginatorInspector, FilterInspector, SwaggerAutoSchema
+from drf_yasg.inspectors import FieldInspector, NotHandled, PaginatorInspector, SwaggerAutoSchema
 from drf_yasg.utils import get_serializer_ref_name
 from rest_framework.fields import ChoiceField
 from rest_framework.relations import ManyRelatedField
-from taggit_serializer.serializers import TagListSerializerField
 
 from dcim.api.serializers import InterfaceSerializer as DeviceInterfaceSerializer
 from extras.api.customfields import CustomFieldsSerializer
@@ -56,19 +55,6 @@ class SerializedPKRelatedFieldInspector(FieldInspector):
         return NotHandled
 
 
-class TagListFieldInspector(FieldInspector):
-    def field_to_swagger_object(self, field, swagger_object_type, use_references, **kwargs):
-        SwaggerType, ChildSwaggerType = self._get_partial_types(field, swagger_object_type, use_references, **kwargs)
-        if isinstance(field, TagListSerializerField):
-            child_schema = self.probe_field_inspectors(field.child, ChildSwaggerType, use_references)
-            return SwaggerType(
-                type=openapi.TYPE_ARRAY,
-                items=child_schema,
-            )
-
-        return NotHandled
-
-
 class CustomChoiceFieldInspector(FieldInspector):
     def field_to_swagger_object(self, field, swagger_object_type, use_references, **kwargs):
         # this returns a callable which extracts title, description and other stuff
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 3cca95b22..008c6dd88 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -1,11 +1,11 @@
 from drf_yasg.utils import swagger_serializer_method
 from rest_framework import serializers
-from taggit_serializer.serializers import TaggitSerializer, TagListSerializerField
 
 from dcim.api.nested_serializers import NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedSiteSerializer
-from dcim.choices import InterfaceModeChoices, InterfaceTypeChoices
+from dcim.choices import InterfaceModeChoices
 from dcim.models import Interface
 from extras.api.customfields import CustomFieldModelSerializer
+from extras.api.serializers import TaggedObjectSerializer
 from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer
 from ipam.models import VLAN
 from tenancy.api.nested_serializers import NestedTenantSerializer
@@ -35,12 +35,11 @@ class ClusterGroupSerializer(ValidatedModelSerializer):
         fields = ['id', 'name', 'slug', 'description', 'cluster_count']
 
 
-class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class ClusterSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     type = NestedClusterTypeSerializer()
     group = NestedClusterGroupSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     site = NestedSiteSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
     device_count = serializers.IntegerField(read_only=True)
     virtualmachine_count = serializers.IntegerField(read_only=True)
 
@@ -56,7 +55,7 @@ class ClusterSerializer(TaggitSerializer, CustomFieldModelSerializer):
 # Virtual machines
 #
 
-class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer):
+class VirtualMachineSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     status = ChoiceField(choices=VirtualMachineStatusChoices, required=False)
     site = NestedSiteSerializer(read_only=True)
     cluster = NestedClusterSerializer()
@@ -66,7 +65,6 @@ class VirtualMachineSerializer(TaggitSerializer, CustomFieldModelSerializer):
     primary_ip = NestedIPAddressSerializer(read_only=True)
     primary_ip4 = NestedIPAddressSerializer(required=False, allow_null=True)
     primary_ip6 = NestedIPAddressSerializer(required=False, allow_null=True)
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = VirtualMachine
@@ -97,7 +95,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 # VM interfaces
 #
 
-class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):
+class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     virtual_machine = NestedVirtualMachineSerializer()
     type = ChoiceField(choices=VMInterfaceTypeChoices, default=VMInterfaceTypeChoices.TYPE_VIRTUAL, required=False)
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
@@ -108,7 +106,6 @@ class InterfaceSerializer(TaggitSerializer, ValidatedModelSerializer):
         required=False,
         many=True
     )
-    tags = TagListSerializerField(required=False)
 
     class Meta:
         model = Interface

From d0f0aef2efdeeb54bd8b1104c6a5c708efca99d7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 10:00:21 -0400
Subject: [PATCH 169/505] Remove django-taggit-serializer

---
 base_requirements.txt     | 4 ----
 netbox/netbox/settings.py | 1 -
 requirements.txt          | 1 -
 3 files changed, 6 deletions(-)

diff --git a/base_requirements.txt b/base_requirements.txt
index caf7ba5f3..a57e88604 100644
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -42,10 +42,6 @@ django-tables2
 # https://github.com/alex/django-taggit
 django-taggit
 
-# A Django REST Framework serializer which represents tags
-# https://github.com/glemmaPaul/django-taggit-serializer
-django-taggit-serializer
-
 # A Django field for representing time zones
 # https://github.com/mfogel/django-timezone-field/
 django-timezone-field
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 30ad82bda..666f08276 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -282,7 +282,6 @@ INSTALLED_APPS = [
     'mptt',
     'rest_framework',
     'taggit',
-    'taggit_serializer',
     'timezone_field',
     'circuits',
     'dcim',
diff --git a/requirements.txt b/requirements.txt
index 79e4fdd9f..eac5ca9d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,6 @@ django-prometheus==2.0.0
 django-rq==2.3.2
 django-tables2==2.3.1
 django-taggit==1.2.0
-django-taggit-serializer==0.1.7
 django-timezone-field==4.0
 djangorestframework==3.11.0
 drf-yasg[validation]==1.17.1

From ef978b2ebfbb6131a83b7f6326f45acbf7ac3085 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 10:50:37 -0400
Subject: [PATCH 170/505] Update TaggedItemTest

---
 netbox/extras/tests/test_tags.py | 39 ++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/netbox/extras/tests/test_tags.py b/netbox/extras/tests/test_tags.py
index 8991c58e7..694cd77d9 100644
--- a/netbox/extras/tests/test_tags.py
+++ b/netbox/extras/tests/test_tags.py
@@ -9,42 +9,53 @@ class TaggedItemTest(APITestCase):
     """
     Test the application of Tags to and item (a Site, for example) upon creation (POST) and modification (PATCH).
     """
-
-    def setUp(self):
-
-        super().setUp()
-
     def test_create_tagged_item(self):
+        tags = self.create_tags("Foo", "Bar", "Baz")
         data = {
             'name': 'Test Site',
             'slug': 'test-site',
-            'tags': ['Foo', 'Bar', 'Baz']
+            'tags': [t.pk for t in tags]
         }
         url = reverse('dcim-api:site-list')
         self.add_permissions('dcim.add_site')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(sorted(response.data['tags']), sorted(data['tags']))
+        self.assertListEqual(
+            sorted([t['id'] for t in response.data['tags']]),
+            sorted(data['tags'])
+        )
         site = Site.objects.get(pk=response.data['id'])
-        tags = [tag.name for tag in site.tags.all()]
-        self.assertEqual(sorted(tags), sorted(data['tags']))
+        self.assertListEqual(
+            sorted([t.name for t in site.tags.all()]),
+            sorted(["Foo", "Bar", "Baz"])
+        )
 
     def test_update_tagged_item(self):
         site = Site.objects.create(
             name='Test Site',
             slug='test-site'
         )
-        site.tags.add('Foo', 'Bar', 'Baz')
+        site.tags.add("Foo", "Bar", "Baz")
+        self.create_tags("New Tag")
         data = {
-            'tags': ['Foo', 'Bar', 'New Tag']
+            'tags': [
+                {"name": "Foo"},
+                {"name": "Bar"},
+                {"name": "New Tag"},
+            ]
         }
         self.add_permissions('dcim.change_site')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
 
         response = self.client.patch(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(sorted(response.data['tags']), sorted(data['tags']))
+        self.assertListEqual(
+            sorted([t['name'] for t in response.data['tags']]),
+            sorted([t['name'] for t in data['tags']])
+        )
         site = Site.objects.get(pk=response.data['id'])
-        tags = [tag.name for tag in site.tags.all()]
-        self.assertEqual(sorted(tags), sorted(data['tags']))
+        self.assertListEqual(
+            sorted([t.name for t in site.tags.all()]),
+            sorted(["Foo", "Bar", "New Tag"])
+        )

From bb755daf8b8cdb7f326107b73c465364efccb556 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 11:14:41 -0400
Subject: [PATCH 171/505] Update tests

---
 netbox/extras/tests/test_api.py       |  2 +-
 netbox/extras/tests/test_changelog.py | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 0c1fcd91c..5d7951e54 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -102,7 +102,7 @@ class ExportTemplateTest(APIViewTestCases.APIViewTestCase):
 
 class TagTest(APIViewTestCases.APIViewTestCase):
     model = Tag
-    brief_fields = ['color', 'id', 'name', 'slug', 'tagged_items', 'url']
+    brief_fields = ['color', 'id', 'name', 'slug', 'url']
     create_data = [
         {
             'name': 'Tag 4',
diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 50d9c5be6..0c35e0f1a 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -11,7 +11,6 @@ from utilities.testing import APITestCase
 class ChangeLogTest(APITestCase):
 
     def setUp(self):
-
         super().setUp()
 
         # Create a custom field on the Site model
@@ -31,9 +30,6 @@ class ChangeLogTest(APITestCase):
             'custom_fields': {
                 'my_field': 'ABC'
             },
-            'tags': [
-                'bar', 'foo'
-            ],
         }
         self.assertEqual(ObjectChange.objects.count(), 0)
         url = reverse('dcim-api:site-list')
@@ -50,7 +46,6 @@ class ChangeLogTest(APITestCase):
         self.assertEqual(oc.changed_object, site)
         self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_CREATE)
         self.assertEqual(oc.object_data['custom_fields'], data['custom_fields'])
-        self.assertListEqual(sorted(oc.object_data['tags']), data['tags'])
 
     def test_update_object(self):
         site = Site(name='Test Site 1', slug='test-site-1')
@@ -62,9 +57,6 @@ class ChangeLogTest(APITestCase):
             'custom_fields': {
                 'my_field': 'DEF'
             },
-            'tags': [
-                'abc', 'xyz'
-            ],
         }
         self.assertEqual(ObjectChange.objects.count(), 0)
         self.add_permissions('dcim.change_site')
@@ -81,7 +73,6 @@ class ChangeLogTest(APITestCase):
         self.assertEqual(oc.changed_object, site)
         self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_UPDATE)
         self.assertEqual(oc.object_data['custom_fields'], data['custom_fields'])
-        self.assertListEqual(sorted(oc.object_data['tags']), data['tags'])
 
     def test_delete_object(self):
         site = Site(
@@ -89,7 +80,6 @@ class ChangeLogTest(APITestCase):
             slug='test-site-1'
         )
         site.save()
-        site.tags.add('foo', 'bar')
         CustomFieldValue.objects.create(
             field=CustomField.objects.get(name='my_field'),
             obj=site,
@@ -108,4 +98,3 @@ class ChangeLogTest(APITestCase):
         self.assertEqual(oc.object_repr, site.name)
         self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_DELETE)
         self.assertEqual(oc.object_data['custom_fields'], {'my_field': 'ABC'})
-        self.assertListEqual(sorted(oc.object_data['tags']), ['bar', 'foo'])

From d1adc5ea9b36db46d425ef9dae357291bcf9a256 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 11:29:59 -0400
Subject: [PATCH 172/505] Update release notes for #3703

---
 docs/release-notes/version-2.9.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 60f554f4d..552859d4d 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -10,6 +10,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 ### Enhancements
 
+* [#3703](https://github.com/netbox-community/netbox/issues/3703) - Tags must be created administratively before being assigned to an object
 * [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 
@@ -18,6 +19,20 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * If in use, LDAP authentication must be enabled by setting `REMOTE_AUTH_BACKEND` to `'netbox.authentication.LDAPBackend'`. (LDAP configuration parameters in `ldap_config.py` remain unchanged.)
 * `REMOTE_AUTH_DEFAULT_PERMISSIONS` now takes a dictionary rather than a list. This is a mapping of permission names to a dictionary of constraining attributes, or `None`. For example, `['dcim.add_site', 'dcim.change_site']` would become `{'dcim.add_site': None, 'dcim.change_site': None}`.
 
+### REST API Changes
+
+* The count of `tagged_items` is no longer included when viewing the tags list when `brief` is passed.
+* The assignment of tags to an object is now achieved in the same manner as specifying any other related device. The `tags` field accepts a list of JSON objects each matching a desired tag. (Alternatively, a list of numeric primary keys corresponding to tags may be passed instead.) For example:
+
+```json
+"tags": [
+  {"name": "First Tag"},
+  {"name": "Second Tag"}
+]
+```
+
+* The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
+
 ### Other Changes
 
 * The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.

From 5e71bad5cf68dbaa737b8a4f5b85bbce0c80987a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 12:00:50 -0400
Subject: [PATCH 173/505] Fix serialization of tags upon object deletion

---
 netbox/extras/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index c8be8755f..6abd28bf6 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -46,7 +46,7 @@ def handle_deleted_object(sender, instance, **kwargs):
 
     # Preserve tags
     if is_taggable(instance):
-        copy.tags = DummyQuerySet(instance.tags.all())
+        copy.tags = list(instance.tags.all())
 
     # Queue the copy of the object for processing once the request completes
     _thread_locals.changed_objects.append(

From 54ece346bc1ad58589a734517778cb954ed653b6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 12:20:56 -0400
Subject: [PATCH 174/505] DummyQuerySet should be iterable to allow for
 serialization

---
 netbox/extras/middleware.py   | 2 +-
 netbox/utilities/querysets.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index 6abd28bf6..c8be8755f 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -46,7 +46,7 @@ def handle_deleted_object(sender, instance, **kwargs):
 
     # Preserve tags
     if is_taggable(instance):
-        copy.tags = list(instance.tags.all())
+        copy.tags = DummyQuerySet(instance.tags.all())
 
     # Queue the copy of the object for processing once the request completes
     _thread_locals.changed_objects.append(
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 1ac79e90a..ff7c69a89 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -10,6 +10,9 @@ class DummyQuerySet:
     def __init__(self, queryset):
         self._cache = [obj for obj in queryset.all()]
 
+    def __iter__(self):
+        return iter(self._cache)
+
     def all(self):
         return self._cache
 

From 3890d17c61df8e993e116c833bacacfb130d2952 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 13:29:27 -0400
Subject: [PATCH 175/505] Clean up errant references to TagField

---
 netbox/dcim/forms.py | 11 +++++------
 netbox/ipam/forms.py |  3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 4f5113a5e..e7cb461bf 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2214,11 +2214,10 @@ class DeviceBulkAddComponentForm(LabeledComponentForm):
         queryset=Device.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
-
-    def clean_tags(self):
-        # Because we're feeding TagField data (on the bulk edit form) to another TagField (on the model form), we
-        # must first convert the list of tags to a string.
-        return ','.join(self.cleaned_data.get('tags'))
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
 
 
 #
@@ -2855,7 +2854,7 @@ class InterfaceCreateForm(InterfaceCommonForm, LabeledComponentForm):
 
 
 class InterfaceBulkCreateForm(
-    form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description', 'tags']),
+    form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description']),
     DeviceBulkAddComponentForm
 ):
     pass
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 93c1b5777..b332bf33f 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -687,7 +687,8 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         required=False,
         label='VRF'
     )
-    tags = TagField(
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
         required=False
     )
 

From 360c56ec34fafab72b42b783a97f11d37f6964b0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 13:30:00 -0400
Subject: [PATCH 176/505] Fix permission evaluation for
 BulkComponentCreateViews

---
 netbox/utilities/views.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 6da516171..033e038d1 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1162,6 +1162,9 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
     table = None
     template_name = 'utilities/obj_bulk_add_component.html'
 
+    def get_required_permission(self):
+        return f'dcim.add_{self.queryset.model._meta.model_name}'
+
     def post(self, request):
         logger = logging.getLogger('netbox.views.BulkComponentCreateView')
         parent_model_name = self.parent_model._meta.verbose_name_plural

From fd18395f782e14d0969749d0df8a5a55d827ec0a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 17 Jun 2020 13:31:26 -0400
Subject: [PATCH 177/505] Fix queryset for TagBulkImportView

---
 netbox/extras/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 7fce4fe8e..ff8ce75e0 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -77,7 +77,7 @@ class TagDeleteView(ObjectDeleteView):
 
 
 class TagBulkImportView(BulkImportView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
     default_return_url = 'extras:tag_list'

From 11a247edc20a91b9362d2287d005d63ceeb4ad96 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 18 Jun 2020 10:32:22 -0400
Subject: [PATCH 178/505] Fix up tests

---
 netbox/circuits/tests/test_views.py       |  8 ++-
 netbox/dcim/tests/test_views.py           | 68 ++++++++++++++---------
 netbox/ipam/tests/test_views.py           | 24 ++++++--
 netbox/tenancy/tests/test_views.py        |  4 +-
 netbox/utilities/testing/views.py         | 24 +++++---
 netbox/virtualization/tests/test_views.py | 12 ++--
 6 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index 38365521a..3356fca8f 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -17,6 +17,8 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Provider(name='Provider 3', slug='provider-3', asn=65003),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Provider X',
             'slug': 'provider-x',
@@ -26,7 +28,7 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'noc_contact': 'noc@example.com',
             'admin_contact': 'admin@example.com',
             'comments': 'Another provider',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -96,6 +98,8 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Circuit(cid='Circuit 3', provider=providers[0], type=circuittypes[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'cid': 'Circuit X',
             'provider': providers[1].pk,
@@ -106,7 +110,7 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'commit_rate': 1000,
             'description': 'A new circuit',
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index a6ce89ec4..b9a02b318 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -76,6 +76,8 @@ class SiteTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Site(name='Site 3', slug='site-3', region=regions[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Site X',
             'slug': 'site-x',
@@ -94,7 +96,7 @@ class SiteTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'contact_phone': '123-555-9999',
             'contact_email': 'hank@stricklandpropane.com',
             'comments': 'Test site',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -196,13 +198,15 @@ class RackReservationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             RackReservation(rack=rack, user=user2, units=[7, 8, 9], description='Reservation 3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'rack': rack.pk,
             'units': "10,11,12",
             'user': user3.pk,
             'tenant': None,
             'description': 'Rack reservation',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -250,6 +254,8 @@ class RackTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Rack(name='Rack 3', site=sites[0]),
         ))
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Rack X',
             'facility_id': 'Facility X',
@@ -268,7 +274,7 @@ class RackTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'outer_depth': 500,
             'outer_unit': RackDimensionUnitChoices.UNIT_MILLIMETER,
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -350,6 +356,8 @@ class DeviceTypeTestCase(
             DeviceType(model='Device Type 3', slug='device-type-3', manufacturer=manufacturers[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'manufacturer': manufacturers[1].pk,
             'model': 'Device Type X',
@@ -359,7 +367,7 @@ class DeviceTypeTestCase(
             'is_full_depth': True,
             'subdevice_role': '',  # CharField
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -947,6 +955,8 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Device(name='Device 3', site=sites[0], rack=racks[0], device_type=devicetypes[0], device_role=deviceroles[0], platform=platforms[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device_type': devicetypes[1].pk,
             'device_role': deviceroles[1].pk,
@@ -967,7 +977,7 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'vc_position': None,
             'vc_priority': None,
             'comments': 'A new device',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
             'local_context_data': None,
         }
 
@@ -1008,7 +1018,7 @@ class ConsolePortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'name': 'Console Port X',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console port',
-            'tags': tags,
+            'tags': sorted([t.pk for t in tags]),
         }
 
         cls.bulk_create_data = {
@@ -1018,7 +1028,7 @@ class ConsolePortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'label_pattern': 'Serial[3-5]',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console port',
-            'tags': tags,
+            'tags': sorted([t.pk for t in tags]),
         }
 
         cls.bulk_edit_data = {
@@ -1054,7 +1064,7 @@ class ConsoleServerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'name': 'Console Server Port X',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console server port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1062,7 +1072,7 @@ class ConsoleServerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'name_pattern': 'Console Server Port [4-6]',
             'type': ConsolePortTypeChoices.TYPE_RJ45,
             'description': 'A console server port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1100,7 +1110,7 @@ class PowerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'maximum_draw': 100,
             'allocated_draw': 50,
             'description': 'A power port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1110,7 +1120,7 @@ class PowerPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'maximum_draw': 100,
             'allocated_draw': 50,
             'description': 'A power port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1156,7 +1166,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'power_port': powerports[1].pk,
             'feed_leg': PowerOutletFeedLegChoices.FEED_LEG_B,
             'description': 'A power outlet',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1166,7 +1176,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'power_port': powerports[1].pk,
             'feed_leg': PowerOutletFeedLegChoices.FEED_LEG_B,
             'description': 'A power outlet',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1226,7 +1236,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1242,7 +1252,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1298,7 +1308,7 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'rear_port': rearports[3].pk,
             'rear_port_position': 1,
             'description': 'New description',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1309,7 +1319,7 @@ class FrontPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
                 '{}:1'.format(rp.pk) for rp in rearports[3:6]
             ],
             'description': 'New description',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1346,7 +1356,7 @@ class RearPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'type': PortTypeChoices.TYPE_8P8C,
             'positions': 3,
             'description': 'A rear port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1355,7 +1365,7 @@ class RearPortTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'type': PortTypeChoices.TYPE_8P8C,
             'positions': 3,
             'description': 'A rear port',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1393,14 +1403,14 @@ class DeviceBayTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'device': device.pk,
             'name': 'Device Bay X',
             'description': 'A device bay',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
             'device': device.pk,
             'name_pattern': 'Device Bay [4-6]',
             'description': 'A device bay',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1441,7 +1451,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'serial': '123ABC',
             'asset_tag': 'ABC123',
             'description': 'An inventory item',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -1453,7 +1463,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
             'part_id': '123456',
             'serial': '123ABC',
             'description': 'An inventory item',
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {
@@ -1518,6 +1528,8 @@ class CableTestCase(
         Cable(termination_a=interfaces[1], termination_b=interfaces[4], type=CableTypeChoices.TYPE_CAT6).save()
         Cable(termination_a=interfaces[2], termination_b=interfaces[5], type=CableTypeChoices.TYPE_CAT6).save()
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         interface_ct = ContentType.objects.get_for_model(Interface)
         cls.form_data = {
             # Changing terminations not supported when editing an existing Cable
@@ -1531,7 +1543,7 @@ class CableTestCase(
             'color': 'c0c0c0',
             'length': 100,
             'length_unit': CableLengthUnitChoices.UNIT_FOOT,
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -1640,11 +1652,13 @@ class PowerPanelTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             PowerPanel(site=sites[0], rack_group=rackgroups[0], name='Power Panel 3'),
         ))
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'site': sites[1].pk,
             'rack_group': rackgroups[1].pk,
             'name': 'Power Panel X',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -1686,6 +1700,8 @@ class PowerFeedTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             PowerFeed(name='Power Feed 3', power_panel=powerpanels[0], rack=racks[0]),
         ))
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Power Feed X',
             'power_panel': powerpanels[1].pk,
@@ -1698,7 +1714,7 @@ class PowerFeedTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'amperage': 100,
             'max_utilization': 50,
             'comments': 'New comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
 
             # Connection
             'cable': None,
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index b704664c1..06090e768 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -27,13 +27,15 @@ class VRFTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             VRF(name='VRF 3', rd='65000:3'),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'VRF X',
             'rd': '65000:999',
             'tenant': tenants[0].pk,
             'enforce_unique': True,
             'description': 'A new VRF',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -95,12 +97,14 @@ class AggregateTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Aggregate(prefix=IPNetwork('10.3.0.0/16'), rir=rirs[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'prefix': IPNetwork('10.99.0.0/16'),
             'rir': rirs[1].pk,
             'date_added': datetime.date(2020, 1, 1),
             'description': 'A new aggregate',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -173,6 +177,8 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Prefix(prefix=IPNetwork('10.3.0.0/16'), vrf=vrfs[0], site=sites[0], role=roles[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'prefix': IPNetwork('192.0.2.0/24'),
             'site': sites[1].pk,
@@ -183,7 +189,7 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'role': roles[1].pk,
             'is_pool': True,
             'description': 'A new prefix',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -222,6 +228,8 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             IPAddress(address=IPNetwork('192.0.2.3/24'), vrf=vrfs[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'vrf': vrfs[1].pk,
             'address': IPNetwork('192.0.2.99/24'),
@@ -232,7 +240,7 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'nat_inside': None,
             'dns_name': 'example',
             'description': 'A new IP address',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -311,6 +319,8 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             VLAN(group=vlangroups[0], vid=103, name='VLAN103', site=sites[0], role=roles[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'site': sites[1].pk,
             'group': vlangroups[1].pk,
@@ -320,7 +330,7 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'status': VLANStatusChoices.STATUS_RESERVED,
             'role': roles[1].pk,
             'description': 'A new VLAN',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -368,6 +378,8 @@ class ServiceTestCase(
             Service(device=device, name='Service 3', protocol=ServiceProtocolChoices.PROTOCOL_TCP, port=103),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'device': device.pk,
             'virtual_machine': None,
@@ -376,7 +388,7 @@ class ServiceTestCase(
             'port': 999,
             'ipaddresses': [],
             'description': 'A new service',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py
index 4e00b648c..5b88b84cf 100644
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -49,13 +49,15 @@ class TenantTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Tenant X',
             'slug': 'tenant-x',
             'group': tenant_groups[1].pk,
             'description': 'A new tenant',
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 28eefdc70..774ceac85 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -1,13 +1,14 @@
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import ArrayField
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import ForeignKey, ManyToManyField
+from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist
+from django.db.models import ManyToManyField
 from django.forms.models import model_to_dict
 from django.test import Client, TestCase as _TestCase, override_settings
 from django.urls import reverse, NoReverseMatch
 from django.utils.text import slugify
 from netaddr import IPNetwork
+from taggit.managers import TaggableManager
 
 from extras.models import Tag
 from users.models import ObjectPermission
@@ -55,14 +56,19 @@ class TestCase(_TestCase):
                 model_dict[attr] = getattr(instance, attr)
 
         for key, value in list(model_dict.items()):
+            try:
+                field = instance._meta.get_field(key)
+            except FieldDoesNotExist:
+                # Attribute is not a model field
+                continue
 
-            # TODO: Differentiate between tags assigned to the instance and a M2M field for tags (ex: ConfigContext)
-            if key == 'tags':
-                model_dict[key] = sorted(value, key=lambda t: t.name)
+            # Handle ManyToManyFields
+            if value and type(field) in (ManyToManyField, TaggableManager):
 
-            # Convert ManyToManyField to list of instance PKs
-            elif model_dict[key] and type(value) in (list, tuple) and hasattr(value[0], 'pk'):
-                model_dict[key] = [obj.pk for obj in value]
+                if field.related_model is ContentType:
+                    model_dict[key] = sorted([f'{ct.app_label}.{ct.model}' for ct in value])
+                else:
+                    model_dict[key] = sorted([obj.pk for obj in value])
 
             if api:
 
@@ -72,7 +78,7 @@ class TestCase(_TestCase):
                     model_dict[key] = f'{ct.app_label}.{ct.model}'
 
                 # Convert IPNetwork instances to strings
-                if type(value) is IPNetwork:
+                elif type(value) is IPNetwork:
                     model_dict[key] = str(value)
 
             else:
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 0ccf8a9b1..a98496f29 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -90,6 +90,8 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], site=sites[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'name': 'Cluster X',
             'group': clustergroups[1].pk,
@@ -97,7 +99,7 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'tenant': None,
             'site': sites[1].pk,
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
         }
 
         cls.csv_data = (
@@ -148,6 +150,8 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             VirtualMachine(name='Virtual Machine 3', cluster=clusters[0], role=deviceroles[0], platform=platforms[0]),
         ])
 
+        tags = cls.create_tags('Alpha', 'Bravo', 'Charlie')
+
         cls.form_data = {
             'cluster': clusters[1].pk,
             'tenant': None,
@@ -161,7 +165,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'memory': 32768,
             'disk': 4000,
             'comments': 'Some comments',
-            'tags': cls.create_tags('Alpha', 'Bravo', 'Charlie'),
+            'tags': [t.pk for t in tags],
             'local_context_data': None,
         }
 
@@ -242,7 +246,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_create_data = {
@@ -257,7 +261,7 @@ class InterfaceTestCase(
             'mode': InterfaceModeChoices.MODE_TAGGED,
             'untagged_vlan': vlans[0].pk,
             'tagged_vlans': [v.pk for v in vlans[1:4]],
-            'tags': tags,
+            'tags': [t.pk for t in tags],
         }
 
         cls.bulk_edit_data = {

From c832e3c2c701bea4c7d24f0b96ea22023457a358 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 18 Jun 2020 13:35:11 -0400
Subject: [PATCH 179/505] #4615: Add missing label field to device bay forms

---
 netbox/dcim/forms.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index b5b1d029f..2109f0784 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1476,7 +1476,7 @@ class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = DeviceBayTemplate
         fields = [
-            'device_type', 'name',
+            'device_type', 'name', 'label',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -3323,7 +3323,7 @@ class DeviceBayForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = DeviceBay
         fields = [
-            'device', 'name', 'description', 'tags',
+            'device', 'name', 'label', 'description', 'tags',
         ]
         widgets = {
             'device': forms.HiddenInput(),

From 4f3fde80556387655695066fd3f217e453356f85 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 18 Jun 2020 13:57:15 -0400
Subject: [PATCH 180/505] #4615: Add label field to component tables

---
 netbox/dcim/tables.py | 92 ++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 57 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 3db01b89f..1589a7f6d 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -470,11 +470,14 @@ class DeviceTypeTable(BaseTable):
 # Device type components
 #
 
-class ConsolePortTemplateTable(BaseTable):
+class ComponentTemplateTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(
         order_by=('_name',)
     )
+
+
+class ConsolePortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('consoleporttemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -483,7 +486,7 @@ class ConsolePortTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = ConsolePortTemplate
-        fields = ('pk', 'name', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'actions')
         empty_text = "None"
 
 
@@ -499,11 +502,7 @@ class ConsolePortImportTable(BaseTable):
         empty_text = False
 
 
-class ConsoleServerPortTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class ConsoleServerPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('consoleserverporttemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -512,7 +511,7 @@ class ConsoleServerPortTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = ConsoleServerPortTemplate
-        fields = ('pk', 'name', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'actions')
         empty_text = "None"
 
 
@@ -528,11 +527,7 @@ class ConsoleServerPortImportTable(BaseTable):
         empty_text = False
 
 
-class PowerPortTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class PowerPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('powerporttemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -541,7 +536,7 @@ class PowerPortTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = PowerPortTemplate
-        fields = ('pk', 'name', 'type', 'maximum_draw', 'allocated_draw', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'actions')
         empty_text = "None"
 
 
@@ -557,11 +552,7 @@ class PowerPortImportTable(BaseTable):
         empty_text = False
 
 
-class PowerOutletTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class PowerOutletTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('poweroutlettemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -570,7 +561,7 @@ class PowerOutletTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = PowerOutletTemplate
-        fields = ('pk', 'name', 'type', 'power_port', 'feed_leg', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'power_port', 'feed_leg', 'actions')
         empty_text = "None"
 
 
@@ -586,10 +577,9 @@ class PowerOutletImportTable(BaseTable):
         empty_text = False
 
 
-class InterfaceTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    mgmt_only = tables.TemplateColumn(
-        template_code="{% if value %}OOB Management{% endif %}"
+class InterfaceTemplateTable(ComponentTemplateTable):
+    mgmt_only = BooleanColumn(
+        verbose_name='Management Only'
     )
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('interfacetemplate'),
@@ -599,7 +589,7 @@ class InterfaceTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = InterfaceTemplate
-        fields = ('pk', 'name', 'mgmt_only', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'mgmt_only', 'type', 'actions')
         empty_text = "None"
 
 
@@ -623,11 +613,7 @@ class InterfaceImportTable(BaseTable):
         empty_text = False
 
 
-class FrontPortTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class FrontPortTemplateTable(ComponentTemplateTable):
     rear_port_position = tables.Column(
         verbose_name='Position'
     )
@@ -639,7 +625,7 @@ class FrontPortTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = FrontPortTemplate
-        fields = ('pk', 'name', 'type', 'rear_port', 'rear_port_position', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'actions')
         empty_text = "None"
 
 
@@ -655,11 +641,7 @@ class FrontPortImportTable(BaseTable):
         empty_text = False
 
 
-class RearPortTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class RearPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('rearporttemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -668,7 +650,7 @@ class RearPortTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = RearPortTemplate
-        fields = ('pk', 'name', 'type', 'positions', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'positions', 'actions')
         empty_text = "None"
 
 
@@ -684,11 +666,7 @@ class RearPortImportTable(BaseTable):
         empty_text = False
 
 
-class DeviceBayTemplateTable(BaseTable):
-    pk = ToggleColumn()
-    name = tables.Column(
-        order_by=('_name',)
-    )
+class DeviceBayTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('devicebaytemplate'),
         attrs={'td': {'class': 'text-right noprint'}},
@@ -697,7 +675,7 @@ class DeviceBayTemplateTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = DeviceBayTemplate
-        fields = ('pk', 'name', 'actions')
+        fields = ('pk', 'name', 'label', 'actions')
         empty_text = "None"
 
 
@@ -890,8 +868,8 @@ class DeviceComponentDetailTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         order_by = ('device', 'name')
-        fields = ('pk', 'device', 'name', 'type', 'description', 'cable')
-        sequence = ('pk', 'device', 'name', 'type', 'description', 'cable')
+        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
+        sequence = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
 
 
 class ConsolePortTable(BaseTable):
@@ -899,7 +877,7 @@ class ConsolePortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = ConsolePort
-        fields = ('name', 'type')
+        fields = ('name', 'label', 'type')
 
 
 class ConsolePortDetailTable(DeviceComponentDetailTable):
@@ -914,7 +892,7 @@ class ConsoleServerPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = ConsoleServerPort
-        fields = ('name', 'description')
+        fields = ('name', 'label', 'description')
 
 
 class ConsoleServerPortDetailTable(DeviceComponentDetailTable):
@@ -929,7 +907,7 @@ class PowerPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = PowerPort
-        fields = ('name', 'type')
+        fields = ('name', 'label', 'type')
 
 
 class PowerPortDetailTable(DeviceComponentDetailTable):
@@ -944,7 +922,7 @@ class PowerOutletTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = PowerOutlet
-        fields = ('name', 'type', 'description')
+        fields = ('name', 'label', 'type', 'description')
 
 
 class PowerOutletDetailTable(DeviceComponentDetailTable):
@@ -958,7 +936,7 @@ class InterfaceTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Interface
-        fields = ('name', 'type', 'lag', 'enabled', 'mgmt_only', 'description')
+        fields = ('name', 'label', 'type', 'lag', 'enabled', 'mgmt_only', 'description')
 
 
 class InterfaceDetailTable(DeviceComponentDetailTable):
@@ -968,8 +946,8 @@ class InterfaceDetailTable(DeviceComponentDetailTable):
 
     class Meta(InterfaceTable.Meta):
         order_by = ('parent', 'name')
-        fields = ('pk', 'parent', 'name', 'enabled', 'type', 'description', 'cable')
-        sequence = ('pk', 'parent', 'name', 'enabled', 'type', 'description', 'cable')
+        fields = ('pk', 'parent', 'name', 'label', 'enabled', 'type', 'description', 'cable')
+        sequence = ('pk', 'parent', 'name', 'label', 'enabled', 'type', 'description', 'cable')
 
 
 class FrontPortTable(BaseTable):
@@ -977,7 +955,7 @@ class FrontPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = FrontPort
-        fields = ('name', 'type', 'rear_port', 'rear_port_position', 'description')
+        fields = ('name', 'label', 'type', 'rear_port', 'rear_port_position', 'description')
         empty_text = "None"
 
 
@@ -993,7 +971,7 @@ class RearPortTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = RearPort
-        fields = ('name', 'type', 'positions', 'description')
+        fields = ('name', 'label', 'type', 'positions', 'description')
         empty_text = "None"
 
 
@@ -1009,7 +987,7 @@ class DeviceBayTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = DeviceBay
-        fields = ('name', 'description')
+        fields = ('name', 'label', 'description')
 
 
 class DeviceBayDetailTable(DeviceComponentDetailTable):
@@ -1017,8 +995,8 @@ class DeviceBayDetailTable(DeviceComponentDetailTable):
     installed_device = tables.LinkColumn()
 
     class Meta(DeviceBayTable.Meta):
-        fields = ('pk', 'name', 'device', 'installed_device', 'description')
-        sequence = ('pk', 'name', 'device', 'installed_device', 'description')
+        fields = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
+        sequence = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
         exclude = ('cable',)
 
 

From eb8c0539c565a0e33b3c086f42e728630e9accfe Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 18 Jun 2020 14:24:50 -0400
Subject: [PATCH 181/505] Update REST API changes for #4615

---
 docs/release-notes/version-2.9.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 552859d4d..ee259a67a 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -32,6 +32,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 ```
 
 * The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
+* A `label` field has been added to all device components and component templates.
 
 ### Other Changes
 

From 181bcd70ad7fd40e28a35a792bcf76a795430adb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 12:01:57 -0400
Subject: [PATCH 182/505] Fix schema migrations for device components

---
 .../migrations/0093_device_component_ordering.py | 16 ++++++++--------
 .../0094_device_component_template_ordering.py   | 14 +++++++-------
 .../migrations/0095_primary_model_ordering.py    |  6 +++---
 .../dcim/migrations/0096_interface_ordering.py   |  4 ++--
 netbox/utilities/fields.py                       |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/netbox/dcim/migrations/0093_device_component_ordering.py b/netbox/dcim/migrations/0093_device_component_ordering.py
index 4e3c941a1..925694958 100644
--- a/netbox/dcim/migrations/0093_device_component_ordering.py
+++ b/netbox/dcim/migrations/0093_device_component_ordering.py
@@ -79,42 +79,42 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='consoleport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='consoleserverport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='devicebay',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='frontport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='inventoryitem',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='poweroutlet',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='powerport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='rearport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_consoleports,
diff --git a/netbox/dcim/migrations/0094_device_component_template_ordering.py b/netbox/dcim/migrations/0094_device_component_template_ordering.py
index 24fe98e94..70acd3189 100644
--- a/netbox/dcim/migrations/0094_device_component_template_ordering.py
+++ b/netbox/dcim/migrations/0094_device_component_template_ordering.py
@@ -75,37 +75,37 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='consoleporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='consoleserverporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='devicebaytemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='frontporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='poweroutlettemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='powerporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='rearporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_consoleporttemplates,
diff --git a/netbox/dcim/migrations/0095_primary_model_ordering.py b/netbox/dcim/migrations/0095_primary_model_ordering.py
index 6225a9b73..2d6be72c8 100644
--- a/netbox/dcim/migrations/0095_primary_model_ordering.py
+++ b/netbox/dcim/migrations/0095_primary_model_ordering.py
@@ -43,17 +43,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='device',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
         ),
         migrations.AddField(
             model_name='rack',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='site',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_sites,
diff --git a/netbox/dcim/migrations/0096_interface_ordering.py b/netbox/dcim/migrations/0096_interface_ordering.py
index f1622f504..7b2663c95 100644
--- a/netbox/dcim/migrations/0096_interface_ordering.py
+++ b/netbox/dcim/migrations/0096_interface_ordering.py
@@ -35,12 +35,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='interface',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         migrations.AddField(
             model_name='interfacetemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         migrations.RunPython(
             code=naturalize_interfacetemplates,
diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py
index 4eb19f539..a9b851def 100644
--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -68,6 +68,6 @@ class NaturalOrderingField(models.CharField):
         return (
             self.name,
             'utilities.fields.NaturalOrderingField',
-            ['target_field'],
+            [self.target_field],
             kwargs,
         )

From 6cb31a274fdcdf8b93ea5f46cbfa480b4ae70801 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 13:10:56 -0400
Subject: [PATCH 183/505] Initial work on #4721 (WIP)

---
 .../migrations/0109_interface_remove_vm.py    |  18 +++
 netbox/dcim/models/__init__.py                |   5 +-
 netbox/dcim/models/device_components.py       | 128 +++++++-----------
 netbox/dcim/tables.py                         |  17 +--
 netbox/dcim/views.py                          |   2 +-
 netbox/ipam/constants.py                      |   7 +
 netbox/ipam/filters.py                        |  62 ++++-----
 netbox/ipam/forms.py                          |  10 +-
 .../migrations/0037_ipaddress_assignment.py   |  35 +++++
 netbox/ipam/models.py                         |  17 ++-
 netbox/ipam/tables.py                         |  14 +-
 netbox/ipam/tests/test_filters.py             |  22 +--
 netbox/utilities/filters.py                   |   4 +
 netbox/virtualization/api/serializers.py      |   8 +-
 netbox/virtualization/api/views.py            |   4 +-
 netbox/virtualization/filters.py              |   4 +-
 netbox/virtualization/forms.py                |  41 +++---
 .../migrations/0015_interface.py              |  43 ++++++
 .../migrations/0016_replicate_interfaces.py   |  69 ++++++++++
 netbox/virtualization/models.py               | 114 +++++++++++++++-
 netbox/virtualization/tables.py               |   3 +-
 netbox/virtualization/tests/test_api.py       |  31 ++---
 netbox/virtualization/tests/test_filters.py   |   4 +-
 netbox/virtualization/tests/test_views.py     |  16 +--
 netbox/virtualization/urls.py                 |   1 +
 netbox/virtualization/views.py                |  17 ++-
 26 files changed, 481 insertions(+), 215 deletions(-)
 create mode 100644 netbox/dcim/migrations/0109_interface_remove_vm.py
 create mode 100644 netbox/ipam/migrations/0037_ipaddress_assignment.py
 create mode 100644 netbox/virtualization/migrations/0015_interface.py
 create mode 100644 netbox/virtualization/migrations/0016_replicate_interfaces.py

diff --git a/netbox/dcim/migrations/0109_interface_remove_vm.py b/netbox/dcim/migrations/0109_interface_remove_vm.py
new file mode 100644
index 000000000..97a84a43e
--- /dev/null
+++ b/netbox/dcim/migrations/0109_interface_remove_vm.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.6 on 2020-06-22 16:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0108_add_tags'),
+        ('virtualization', '0016_replicate_interfaces'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='interface',
+            name='virtual_machine',
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 236979b4a..d8a5f028c 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -35,11 +35,12 @@ from .device_component_templates import (
     PowerOutletTemplate, PowerPortTemplate, RearPortTemplate,
 )
 from .device_components import (
-    CableTermination, ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem, PowerOutlet,
-    PowerPort, RearPort,
+    BaseInterface, CableTermination, ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem,
+    PowerOutlet, PowerPort, RearPort,
 )
 
 __all__ = (
+    'BaseInterface',
     'Cable',
     'CableTermination',
     'ConsolePort',
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index a626c055f..8f945622a 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -19,7 +19,6 @@ from utilities.ordering import naturalize_interface
 from utilities.querysets import RestrictedQuerySet
 from utilities.query_functions import CollateAsChar
 from utilities.utils import serialize_object
-from virtualization.choices import VMInterfaceTypeChoices
 
 
 __all__ = (
@@ -53,18 +52,12 @@ class ComponentModel(models.Model):
         return self.name
 
     def to_objectchange(self, action):
-        # Annotate the parent Device/VM
-        try:
-            parent = getattr(self, 'device', None) or getattr(self, 'virtual_machine', None)
-        except ObjectDoesNotExist:
-            # The parent device/VM has already been deleted
-            parent = None
-
+        # Annotate the parent Device
         return ObjectChange(
             changed_object=self,
             object_repr=str(self),
             action=action,
-            related_object=parent,
+            related_object=self.device,
             object_data=serialize_object(self)
         )
 
@@ -592,26 +585,7 @@ class PowerOutlet(CableTermination, ComponentModel):
 # Interfaces
 #
 
-@extras_features('graphs', 'export_templates', 'webhooks')
-class Interface(CableTermination, ComponentModel):
-    """
-    A network interface within a Device or VirtualMachine. A physical Interface can connect to exactly one other
-    Interface.
-    """
-    device = models.ForeignKey(
-        to='Device',
-        on_delete=models.CASCADE,
-        related_name='interfaces',
-        null=True,
-        blank=True
-    )
-    virtual_machine = models.ForeignKey(
-        to='virtualization.VirtualMachine',
-        on_delete=models.CASCADE,
-        related_name='interfaces',
-        null=True,
-        blank=True
-    )
+class BaseInterface(models.Model):
     name = models.CharField(
         max_length=64
     )
@@ -621,6 +595,43 @@ class Interface(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
+    enabled = models.BooleanField(
+        default=True
+    )
+    mac_address = MACAddressField(
+        null=True,
+        blank=True,
+        verbose_name='MAC Address'
+    )
+    mtu = models.PositiveIntegerField(
+        blank=True,
+        null=True,
+        validators=[MinValueValidator(1), MaxValueValidator(65536)],
+        verbose_name='MTU'
+    )
+    mode = models.CharField(
+        max_length=50,
+        choices=InterfaceModeChoices,
+        blank=True
+    )
+
+    class Meta:
+        abstract = True
+
+
+@extras_features('graphs', 'export_templates', 'webhooks')
+class Interface(CableTermination, ComponentModel, BaseInterface):
+    """
+    A network interface within a Device. A physical Interface can connect to exactly one other
+    Interface.
+    """
+    device = models.ForeignKey(
+        to='Device',
+        on_delete=models.CASCADE,
+        related_name='interfaces',
+        null=True,
+        blank=True
+    )
     label = models.CharField(
         max_length=64,
         blank=True,
@@ -656,30 +667,11 @@ class Interface(CableTermination, ComponentModel):
         max_length=50,
         choices=InterfaceTypeChoices
     )
-    enabled = models.BooleanField(
-        default=True
-    )
-    mac_address = MACAddressField(
-        null=True,
-        blank=True,
-        verbose_name='MAC Address'
-    )
-    mtu = models.PositiveIntegerField(
-        blank=True,
-        null=True,
-        validators=[MinValueValidator(1), MaxValueValidator(65536)],
-        verbose_name='MTU'
-    )
     mgmt_only = models.BooleanField(
         default=False,
         verbose_name='OOB Management',
         help_text='This interface is used only for out-of-band management'
     )
-    mode = models.CharField(
-        max_length=50,
-        choices=InterfaceModeChoices,
-        blank=True
-    )
     untagged_vlan = models.ForeignKey(
         to='ipam.VLAN',
         on_delete=models.SET_NULL,
@@ -694,15 +686,19 @@ class Interface(CableTermination, ComponentModel):
         blank=True,
         verbose_name='Tagged VLANs'
     )
+    ipaddresses = GenericRelation(
+        to='ipam.IPAddress',
+        content_type_field='assigned_object_type',
+        object_id_field='assigned_object_id'
+    )
     tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
-        'device', 'virtual_machine', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only',
+        'device', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only',
         'description', 'mode',
     ]
 
     class Meta:
-        # TODO: ordering and unique_together should include virtual_machine
         ordering = ('device', CollateAsChar('_name'))
         unique_together = ('device', 'name')
 
@@ -712,7 +708,6 @@ class Interface(CableTermination, ComponentModel):
     def to_csv(self):
         return (
             self.device.identifier if self.device else None,
-            self.virtual_machine.name if self.virtual_machine else None,
             self.name,
             self.lag.name if self.lag else None,
             self.get_type_display(),
@@ -726,18 +721,6 @@ class Interface(CableTermination, ComponentModel):
 
     def clean(self):
 
-        # An Interface must belong to a Device *or* to a VirtualMachine
-        if self.device and self.virtual_machine:
-            raise ValidationError("An interface cannot belong to both a device and a virtual machine.")
-        if not self.device and not self.virtual_machine:
-            raise ValidationError("An interface must belong to either a device or a virtual machine.")
-
-        # VM interfaces must be virtual
-        if self.virtual_machine and self.type not in VMInterfaceTypeChoices.values():
-            raise ValidationError({
-                'type': "Invalid interface type for a virtual machine: {}".format(self.type)
-            })
-
         # Virtual interfaces cannot be connected
         if self.type in NONCONNECTABLE_IFACE_TYPES and (
                 self.cable or getattr(self, 'circuit_termination', False)
@@ -773,7 +756,7 @@ class Interface(CableTermination, ComponentModel):
         if self.untagged_vlan and self.untagged_vlan.site not in [self.parent.site, None]:
             raise ValidationError({
                 'untagged_vlan': "The untagged VLAN ({}) must belong to the same site as the interface's parent "
-                                 "device/VM, or it must be global".format(self.untagged_vlan)
+                                 "device, or it must be global".format(self.untagged_vlan)
             })
 
     def save(self, *args, **kwargs):
@@ -788,21 +771,6 @@ class Interface(CableTermination, ComponentModel):
 
         return super().save(*args, **kwargs)
 
-    def to_objectchange(self, action):
-        # Annotate the parent Device/VM
-        try:
-            parent_obj = self.device or self.virtual_machine
-        except ObjectDoesNotExist:
-            parent_obj = None
-
-        return ObjectChange(
-            changed_object=self,
-            object_repr=str(self),
-            action=action,
-            related_object=parent_obj,
-            object_data=serialize_object(self)
-        )
-
     @property
     def connected_endpoint(self):
         """
@@ -841,7 +809,7 @@ class Interface(CableTermination, ComponentModel):
 
     @property
     def parent(self):
-        return self.device or self.virtual_machine
+        return self.device
 
     @property
     def is_connectable(self):
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 1589a7f6d..189f98923 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -863,6 +863,7 @@ class DeviceImportTable(BaseTable):
 
 class DeviceComponentDetailTable(BaseTable):
     pk = ToggleColumn()
+    device = tables.LinkColumn()
     name = tables.Column(order_by=('_name',))
     cable = tables.LinkColumn()
 
@@ -881,7 +882,6 @@ class ConsolePortTable(BaseTable):
 
 
 class ConsolePortDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, ConsolePortTable.Meta):
         pass
@@ -896,7 +896,6 @@ class ConsoleServerPortTable(BaseTable):
 
 
 class ConsoleServerPortDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, ConsoleServerPortTable.Meta):
         pass
@@ -911,7 +910,6 @@ class PowerPortTable(BaseTable):
 
 
 class PowerPortDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, PowerPortTable.Meta):
         pass
@@ -926,7 +924,6 @@ class PowerOutletTable(BaseTable):
 
 
 class PowerOutletDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, PowerOutletTable.Meta):
         pass
@@ -940,14 +937,11 @@ class InterfaceTable(BaseTable):
 
 
 class InterfaceDetailTable(DeviceComponentDetailTable):
-    parent = tables.LinkColumn(order_by=('device', 'virtual_machine'))
-    name = tables.LinkColumn()
     enabled = BooleanColumn()
 
-    class Meta(InterfaceTable.Meta):
-        order_by = ('parent', 'name')
-        fields = ('pk', 'parent', 'name', 'label', 'enabled', 'type', 'description', 'cable')
-        sequence = ('pk', 'parent', 'name', 'label', 'enabled', 'type', 'description', 'cable')
+    class Meta(DeviceComponentDetailTable.Meta, InterfaceTable.Meta):
+        fields = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description', 'cable')
+        sequence = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description', 'cable')
 
 
 class FrontPortTable(BaseTable):
@@ -960,7 +954,6 @@ class FrontPortTable(BaseTable):
 
 
 class FrontPortDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, FrontPortTable.Meta):
         pass
@@ -976,7 +969,6 @@ class RearPortTable(BaseTable):
 
 
 class RearPortDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
 
     class Meta(DeviceComponentDetailTable.Meta, RearPortTable.Meta):
         pass
@@ -991,7 +983,6 @@ class DeviceBayTable(BaseTable):
 
 
 class DeviceBayDetailTable(DeviceComponentDetailTable):
-    device = tables.LinkColumn()
     installed_device = tables.LinkColumn()
 
     class Meta(DeviceBayTable.Meta):
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 6aad18bd3..9b19734e6 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1442,7 +1442,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 
diff --git a/netbox/ipam/constants.py b/netbox/ipam/constants.py
index 41075e54a..0a3c67f32 100644
--- a/netbox/ipam/constants.py
+++ b/netbox/ipam/constants.py
@@ -1,3 +1,5 @@
+from django.db.models import Q
+
 from .choices import IPAddressRoleChoices
 
 # BGP ASN bounds
@@ -29,6 +31,11 @@ PREFIX_LENGTH_MAX = 127  # IPv6
 # IPAddresses
 #
 
+IPADDRESS_ASSIGNMENT_MODELS = Q(
+    Q(app_label='dcim', model='interface') |
+    Q(app_label='virtualization', model='interface')
+)
+
 IPADDRESS_MASK_LENGTH_MIN = 1
 IPADDRESS_MASK_LENGTH_MAX = 128  # IPv6
 
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 7662d5825..15be58ad4 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -299,37 +299,37 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         to_field_name='rd',
         label='VRF (RD)',
     )
-    device = MultiValueCharFilter(
-        method='filter_device',
-        field_name='name',
-        label='Device (name)',
-    )
-    device_id = MultiValueNumberFilter(
-        method='filter_device',
-        field_name='pk',
-        label='Device (ID)',
-    )
-    virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
-        field_name='interface__virtual_machine',
-        queryset=VirtualMachine.objects.unrestricted(),
-        label='Virtual machine (ID)',
-    )
-    virtual_machine = django_filters.ModelMultipleChoiceFilter(
-        field_name='interface__virtual_machine__name',
-        queryset=VirtualMachine.objects.unrestricted(),
-        to_field_name='name',
-        label='Virtual machine (name)',
-    )
-    interface = django_filters.ModelMultipleChoiceFilter(
-        field_name='interface__name',
-        queryset=Interface.objects.unrestricted(),
-        to_field_name='name',
-        label='Interface (ID)',
-    )
-    interface_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Interface.objects.unrestricted(),
-        label='Interface (ID)',
-    )
+    # device = MultiValueCharFilter(
+    #     method='filter_device',
+    #     field_name='name',
+    #     label='Device (name)',
+    # )
+    # device_id = MultiValueNumberFilter(
+    #     method='filter_device',
+    #     field_name='pk',
+    #     label='Device (ID)',
+    # )
+    # virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
+    #     field_name='interface__virtual_machine',
+    #     queryset=VirtualMachine.objects.unrestricted(),
+    #     label='Virtual machine (ID)',
+    # )
+    # virtual_machine = django_filters.ModelMultipleChoiceFilter(
+    #     field_name='interface__virtual_machine__name',
+    #     queryset=VirtualMachine.objects.unrestricted(),
+    #     to_field_name='name',
+    #     label='Virtual machine (name)',
+    # )
+    # interface = django_filters.ModelMultipleChoiceFilter(
+    #     field_name='interface__name',
+    #     queryset=Interface.objects.unrestricted(),
+    #     to_field_name='name',
+    #     label='Interface (ID)',
+    # )
+    # interface_id = django_filters.ModelMultipleChoiceFilter(
+    #     queryset=Interface.objects.unrestricted(),
+    #     label='Interface (ID)',
+    # )
     assigned_to_interface = django_filters.BooleanFilter(
         method='_assigned_to_interface',
         label='Is assigned to an interface',
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index b332bf33f..620638703 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1,4 +1,5 @@
 from django import forms
+from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MaxValueValidator, MinValueValidator
 
 from dcim.models import Device, Interface, Rack, Region, Site
@@ -14,7 +15,7 @@ from utilities.forms import (
     ExpandableIPAddressField, ReturnURLForm, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
     BOOLEAN_WITH_BLANK_CHOICES,
 )
-from virtualization.models import VirtualMachine
+from virtualization.models import Interface as VMInterface, VirtualMachine
 from .choices import *
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -1194,13 +1195,14 @@ class ServiceForm(BootstrapMixin, CustomFieldModelForm):
 
         # Limit IP address choices to those assigned to interfaces of the parent device/VM
         if self.instance.device:
-            vc_interface_ids = [i['id'] for i in self.instance.device.vc_interfaces.values('id')]
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
-                interface_id__in=vc_interface_ids
+                assigned_object_type=ContentType.objects.get_for_model(Interface),
+                assigned_object_id__in=self.instance.device.vc_interfaces.values('id', flat=True)
             )
         elif self.instance.virtual_machine:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
-                interface__virtual_machine=self.instance.virtual_machine
+                assigned_object_type=ContentType.objects.get_for_model(VMInterface),
+                assigned_object_id__in=self.instance.virtual_machine.interfaces.values_list('id', flat=True)
             )
         else:
             self.fields['ipaddresses'].choices = []
diff --git a/netbox/ipam/migrations/0037_ipaddress_assignment.py b/netbox/ipam/migrations/0037_ipaddress_assignment.py
new file mode 100644
index 000000000..4586a5088
--- /dev/null
+++ b/netbox/ipam/migrations/0037_ipaddress_assignment.py
@@ -0,0 +1,35 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def set_assigned_object_type(apps, schema_editor):
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    IPAddress = apps.get_model('ipam', 'IPAddress')
+
+    device_ct = ContentType.objects.get(app_label='dcim', model='interface').pk
+    IPAddress.objects.update(assigned_object_type=device_ct)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('ipam', '0036_standardize_description'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='ipaddress',
+            old_name='interface',
+            new_name='assigned_object_id',
+        ),
+        migrations.AddField(
+            model_name='ipaddress',
+            name='assigned_object_type',
+            field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'interface')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType', blank=True, null=True),
+            preserve_default=False,
+        ),
+        migrations.RunPython(
+            code=set_assigned_object_type
+        ),
+    ]
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index b99a6c919..ba7c959dd 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -1,6 +1,7 @@
 import netaddr
 from django.conf import settings
-from django.contrib.contenttypes.fields import GenericRelation
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
@@ -606,13 +607,25 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         blank=True,
         help_text='The functional role of this IP'
     )
-    interface = models.ForeignKey(
+    assigned_object_type = models.ForeignKey(
+        to=ContentType,
+        limit_choices_to=IPADDRESS_ASSIGNMENT_MODELS,
+        on_delete=models.PROTECT,
+        related_name='+',
+        blank=True,
+        null=True
+    )
+    assigned_object_id = models.ForeignKey(
         to='dcim.Interface',
         on_delete=models.CASCADE,
         related_name='ip_addresses',
         blank=True,
         null=True
     )
+    assigned_object = GenericForeignKey(
+        ct_field='assigned_object_type',
+        fk_field='assigned_object_id'
+    )
     nat_inside = models.OneToOneField(
         to='self',
         on_delete=models.SET_NULL,
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index ca48c2951..989fe0844 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -431,18 +431,14 @@ class IPAddressTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=TENANT_LINK
     )
-    parent = tables.TemplateColumn(
-        template_code=IPADDRESS_PARENT,
-        orderable=False
-    )
-    interface = tables.Column(
-        orderable=False
+    assigned = tables.BooleanColumn(
+        accessor='assigned_object_id'
     )
 
     class Meta(BaseTable.Meta):
         model = IPAddress
         fields = (
-            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface', 'dns_name', 'description',
+            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'assigned', 'dns_name', 'description',
         )
         row_attrs = {
             'class': lambda record: 'success' if not isinstance(record, IPAddress) else '',
@@ -465,11 +461,11 @@ class IPAddressDetailTable(IPAddressTable):
 
     class Meta(IPAddressTable.Meta):
         fields = (
-            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'nat_inside', 'parent', 'interface', 'dns_name',
+            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'nat_inside', 'assigned', 'dns_name',
             'description', 'tags',
         )
         default_columns = (
-            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface', 'dns_name', 'description',
+            'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'assigned', 'dns_name', 'description',
         )
 
 
diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index 785f5f2c5..24d0d7fa8 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -4,7 +4,7 @@ from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer,
 from ipam.choices import *
 from ipam.filters import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-from virtualization.models import Cluster, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterType, Interfaces as VMInterface, VirtualMachine
 from tenancy.models import Tenant, TenantGroup
 
 
@@ -375,6 +375,13 @@ class IPAddressTestCase(TestCase):
         )
         Device.objects.bulk_create(devices)
 
+        interfaces = (
+            Interface(device=devices[0], name='Interface 1'),
+            Interface(device=devices[1], name='Interface 2'),
+            Interface(device=devices[2], name='Interface 3'),
+        )
+        Interface.objects.bulk_create(interfaces)
+
         clustertype = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1')
         cluster = Cluster.objects.create(type=clustertype, name='Cluster 1')
 
@@ -385,15 +392,12 @@ class IPAddressTestCase(TestCase):
         )
         VirtualMachine.objects.bulk_create(virtual_machines)
 
-        interfaces = (
-            Interface(device=devices[0], name='Interface 1'),
-            Interface(device=devices[1], name='Interface 2'),
-            Interface(device=devices[2], name='Interface 3'),
-            Interface(virtual_machine=virtual_machines[0], name='Interface 1'),
-            Interface(virtual_machine=virtual_machines[1], name='Interface 2'),
-            Interface(virtual_machine=virtual_machines[2], name='Interface 3'),
+        vm_interfaces = (
+            VMInterface(virtual_machine=virtual_machines[0], name='Interface 1'),
+            VMInterface(virtual_machine=virtual_machines[1], name='Interface 2'),
+            VMInterface(virtual_machine=virtual_machines[2], name='Interface 3'),
         )
-        Interface.objects.bulk_create(interfaces)
+        VMInterface.objects.bulk_create(vm_interfaces)
 
         tenant_groups = (
             TenantGroup(name='Tenant group 1', slug='tenant-group-1'),
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index f628ca917..2b49dd99e 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -256,6 +256,10 @@ class BaseFilterSet(django_filters.FilterSet):
                 except django_filters.exceptions.FieldLookupError:
                     # The filter could not be created because the lookup expression is not supported on the field
                     continue
+                except Exception as e:
+                    print(existing_filter_name, existing_filter)
+                    print(f'field: {field}, lookup_expr: {lookup_expr}')
+                    raise e
 
                 if lookup_name.startswith('n'):
                     # This is a negation filter which requires a queryset.exclude() clause
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 008c6dd88..a437a000c 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -3,7 +3,6 @@ from rest_framework import serializers
 
 from dcim.api.nested_serializers import NestedDeviceRoleSerializer, NestedPlatformSerializer, NestedSiteSerializer
 from dcim.choices import InterfaceModeChoices
-from dcim.models import Interface
 from extras.api.customfields import CustomFieldModelSerializer
 from extras.api.serializers import TaggedObjectSerializer
 from ipam.api.nested_serializers import NestedIPAddressSerializer, NestedVLANSerializer
@@ -11,7 +10,7 @@ from ipam.models import VLAN
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer
 from virtualization.choices import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 from .nested_serializers import *
 
 
@@ -97,7 +96,6 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 
 class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     virtual_machine = NestedVirtualMachineSerializer()
-    type = ChoiceField(choices=VMInterfaceTypeChoices, default=VMInterfaceTypeChoices.TYPE_VIRTUAL, required=False)
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
     tagged_vlans = SerializedPKRelatedField(
@@ -110,6 +108,6 @@ class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = Interface
         fields = [
-            'id', 'virtual_machine', 'name', 'type', 'enabled', 'mtu', 'mac_address', 'description', 'mode',
-            'untagged_vlan', 'tagged_vlans', 'tags',
+            'id', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan',
+            'tagged_vlans', 'tags',
         ]
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 2a1d7c3a9..bcff543a8 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -1,11 +1,11 @@
 from django.db.models import Count
 
-from dcim.models import Device, Interface
+from dcim.models import Device
 from extras.api.views import CustomFieldModelViewSet
 from utilities.api import ModelViewSet
 from utilities.utils import get_subquery
 from virtualization import filters
-from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 from . import serializers
 
 
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 7e8349cf1..dd1c3e4b2 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -1,7 +1,7 @@
 import django_filters
 from django.db.models import Q
 
-from dcim.models import DeviceRole, Interface, Platform, Region, Site
+from dcim.models import DeviceRole, Platform, Region, Site
 from extras.filters import CustomFieldFilterSet, CreatedUpdatedFilterSet, LocalConfigContextFilterSet
 from tenancy.filters import TenancyFilterSet
 from utilities.filters import (
@@ -9,7 +9,7 @@ from utilities.filters import (
     TreeNodeMultipleChoiceFilter,
 )
 from .choices import *
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 __all__ = (
     'ClusterFilterSet',
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 942368f19..5789dff88 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -1,10 +1,11 @@
 from django import forms
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 
 from dcim.choices import InterfaceModeChoices
 from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN
 from dcim.forms import INTERFACE_MODE_HELP_TEXT
-from dcim.models import Device, DeviceRole, Interface, Platform, Rack, Region, Site
+from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
 )
@@ -16,10 +17,10 @@ from utilities.forms import (
     add_blank_choice, APISelect, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
     CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
     DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, SlugField, SmallTextarea,
-    StaticSelect2, StaticSelect2Multiple, TagFilterField,
+    StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from .choices import *
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 
 #
@@ -355,8 +356,11 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
             for family in [4, 6]:
                 ip_choices = [(None, '---------')]
                 # Collect interface IPs
+                interface_pks = self.instance.interfaces.values_list('id', flat=True)
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
-                    address__family=family, interface__virtual_machine=self.instance
+                    address__family=family,
+                    assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    assigned_object_id__in=interface_pks
                 )
                 if interface_ips:
                     ip_choices.append(
@@ -600,12 +604,11 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = Interface
         fields = [
-            'virtual_machine', 'name', 'type', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags',
-            'untagged_vlan', 'tagged_vlans',
+            'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags', 'untagged_vlan',
+            'tagged_vlans',
         ]
         widgets = {
             'virtual_machine': forms.HiddenInput(),
-            'type': forms.HiddenInput(),
             'mode': StaticSelect2()
         }
         labels = {
@@ -619,7 +622,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
         super().__init__(*args, **kwargs)
 
         # Add current site to VLANs query params
-        site = getattr(self.instance.parent, 'site', None)
+        site = getattr(self.instance.virtual_machine, 'site', None)
         if site is not None:
             # Add current site to VLANs query params
             self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
@@ -650,11 +653,6 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
     name_pattern = ExpandableNameField(
         label='Name'
     )
-    type = forms.ChoiceField(
-        choices=VMInterfaceTypeChoices,
-        initial=VMInterfaceTypeChoices.TYPE_VIRTUAL,
-        widget=forms.HiddenInput()
-    )
     enabled = forms.BooleanField(
         required=False,
         initial=True
@@ -789,6 +787,17 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
                 self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
 
+class InterfaceFilterForm(forms.Form):
+    model = Interface
+    enabled = forms.NullBooleanField(
+        required=False,
+        widget=StaticSelect2(
+            choices=BOOLEAN_WITH_BLANK_CHOICES
+        )
+    )
+    tag = TagFilterField(model)
+
+
 #
 # Bulk VirtualMachine component creation
 #
@@ -812,8 +821,4 @@ class InterfaceBulkCreateForm(
     form_from_model(Interface, ['enabled', 'mtu', 'description', 'tags']),
     VirtualMachineBulkAddComponentForm
 ):
-    type = forms.ChoiceField(
-        choices=VMInterfaceTypeChoices,
-        initial=VMInterfaceTypeChoices.TYPE_VIRTUAL,
-        widget=forms.HiddenInput()
-    )
+    pass
diff --git a/netbox/virtualization/migrations/0015_interface.py b/netbox/virtualization/migrations/0015_interface.py
new file mode 100644
index 000000000..7ad22eeb8
--- /dev/null
+++ b/netbox/virtualization/migrations/0015_interface.py
@@ -0,0 +1,43 @@
+# Generated by Django 3.0.6 on 2020-06-18 20:21
+
+import dcim.fields
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import taggit.managers
+import utilities.fields
+import utilities.ordering
+import utilities.query_functions
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0036_standardize_description'),
+        ('extras', '0042_customfield_manager'),
+        ('virtualization', '0014_standardize_description'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Interface',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=64)),
+                ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface)),
+                ('enabled', models.BooleanField(default=True)),
+                ('mac_address', dcim.fields.MACAddressField(blank=True, null=True)),
+                ('mtu', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65536)])),
+                ('mode', models.CharField(blank=True, max_length=50)),
+                ('description', models.CharField(blank=True, max_length=200)),
+                ('tagged_vlans', models.ManyToManyField(blank=True, related_name='vm_interfaces_as_tagged', to='ipam.VLAN')),
+                ('tags', taggit.managers.TaggableManager(related_name='vm_interface', through='extras.TaggedItem', to='extras.Tag')),
+                ('untagged_vlan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vm_interfaces_as_untagged', to='ipam.VLAN')),
+                ('virtual_machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='virtualization.VirtualMachine')),
+            ],
+            options={
+                'ordering': ('virtual_machine', utilities.query_functions.CollateAsChar('_name')),
+                'unique_together': {('virtual_machine', 'name')},
+            },
+        ),
+    ]
diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
new file mode 100644
index 000000000..c259b4140
--- /dev/null
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -0,0 +1,69 @@
+import sys
+
+from django.db import migrations
+
+
+def replicate_interfaces(apps, schema_editor):
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    TaggedItem = apps.get_model('taggit', 'TaggedItem')
+    Interface = apps.get_model('dcim', 'Interface')
+    IPAddress = apps.get_model('ipam', 'IPAddress')
+    VMInterface = apps.get_model('virtualization', 'Interface')
+
+    interface_ct = ContentType.objects.get_for_model(Interface)
+    vm_interface_ct = ContentType.objects.get_for_model(VMInterface)
+
+    # Replicate dcim.Interface instances assigned to VirtualMachines
+    original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
+    for interface in original_interfaces:
+        vm_interface = VMInterface(
+            virtual_machine=interface.virtual_machine,
+            name=interface.name,
+            enabled=interface.enabled,
+            mac_address=interface.mac_address,
+            mtu=interface.mtu,
+            mode=interface.mode,
+            description=interface.description,
+            untagged_vlan=interface.untagged_vlan,
+        )
+        vm_interface.save()
+
+        # Copy tagged VLANs
+        vm_interface.tagged_vlans.set(interface.tagged_vlans.all())
+
+        # Reassign tags to the new instance
+        TaggedItem.objects.filter(
+            content_type=interface_ct, object_id=interface.pk
+        ).update(
+            content_type=vm_interface_ct, object_id=vm_interface.pk
+        )
+
+        # Update any assigned IPAddresses
+        IPAddress.objects.filter(assigned_object_id=interface.pk).update(
+            assigned_object_type=vm_interface_ct,
+            assigned_object_id=vm_interface.pk
+        )
+
+    replicated_count = VMInterface.objects.count()
+    if 'test' not in sys.argv:
+        print(f"\n    Replicated {replicated_count} interfaces ", end='', flush=True)
+
+    # Verify that all interfaces have been replicated
+    assert replicated_count == original_interfaces.count(), "Replicated interfaces count does not match original count!"
+
+    # Delete original VM interfaces
+    original_interfaces.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0037_ipaddress_assignment'),
+        ('virtualization', '0015_interface'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=replicate_interfaces
+        ),
+    ]
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 8ad40bab7..8d4d5d889 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -5,11 +5,14 @@ from django.db import models
 from django.urls import reverse
 from taggit.managers import TaggableManager
 
-from dcim.models import Device
-from extras.models import ConfigContextModel, CustomFieldModel, TaggedItem
+from dcim.choices import InterfaceModeChoices
+from dcim.models import BaseInterface, Device
+from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
+from utilities.query_functions import CollateAsChar
 from utilities.querysets import RestrictedQuerySet
+from utilities.utils import serialize_object
 from .choices import *
 
 
@@ -17,6 +20,7 @@ __all__ = (
     'Cluster',
     'ClusterGroup',
     'ClusterType',
+    'Interface',
     'VirtualMachine',
 )
 
@@ -370,3 +374,109 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
     @property
     def site(self):
         return self.cluster.site
+
+
+#
+# Interfaces
+#
+
+@extras_features('graphs', 'export_templates', 'webhooks')
+class Interface(BaseInterface):
+    virtual_machine = models.ForeignKey(
+        to='virtualization.VirtualMachine',
+        on_delete=models.CASCADE,
+        related_name='interfaces'
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+    untagged_vlan = models.ForeignKey(
+        to='ipam.VLAN',
+        on_delete=models.SET_NULL,
+        related_name='vm_interfaces_as_untagged',
+        null=True,
+        blank=True,
+        verbose_name='Untagged VLAN'
+    )
+    tagged_vlans = models.ManyToManyField(
+        to='ipam.VLAN',
+        related_name='vm_interfaces_as_tagged',
+        blank=True,
+        verbose_name='Tagged VLANs'
+    )
+    ipaddresses = GenericRelation(
+        to='ipam.IPAddress',
+        content_type_field='assigned_object_type',
+        object_id_field='assigned_object_id'
+    )
+    tags = TaggableManager(
+        through=TaggedItem,
+        related_name='vm_interface'
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'mode',
+    ]
+
+    class Meta:
+        ordering = ('virtual_machine', CollateAsChar('_name'))
+        unique_together = ('virtual_machine', 'name')
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('virtualization:interface', kwargs={'pk': self.pk})
+
+    def to_csv(self):
+        return (
+            self.virtual_machine.name,
+            self.name,
+            self.enabled,
+            self.mac_address,
+            self.mtu,
+            self.description,
+            self.get_mode_display(),
+        )
+
+    def clean(self):
+
+        # Validate untagged VLAN
+        if self.untagged_vlan and self.untagged_vlan.site not in [self.parent.site, None]:
+            raise ValidationError({
+                'untagged_vlan': "The untagged VLAN ({}) must belong to the same site as the interface's parent "
+                                 "virtual machine, or it must be global".format(self.untagged_vlan)
+            })
+
+    def save(self, *args, **kwargs):
+
+        # Remove untagged VLAN assignment for non-802.1Q interfaces
+        if self.mode is None:
+            self.untagged_vlan = None
+
+        # Only "tagged" interfaces may have tagged VLANs assigned. ("tagged all" implies all VLANs are assigned.)
+        if self.pk and self.mode != InterfaceModeChoices.MODE_TAGGED:
+            self.tagged_vlans.clear()
+
+        return super().save(*args, **kwargs)
+
+    def to_objectchange(self, action):
+        # Annotate the parent VirtualMachine
+        return ObjectChange(
+            changed_object=self,
+            object_repr=str(self),
+            action=action,
+            related_object=self.virtual_machine,
+            object_data=serialize_object(self)
+        )
+
+    @property
+    def parent(self):
+        return self.virtual_machine
+
+    @property
+    def count_ipaddresses(self):
+        return self.ip_addresses.count()
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index d957e0053..97831a458 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -1,10 +1,9 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from dcim.models import Interface
 from tenancy.tables import COL_TENANT
 from utilities.tables import BaseTable, ColoredLabelColumn, TagColumn, ToggleColumn
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 CLUSTERTYPE_ACTIONS = """
 <a href="{% url 'virtualization:clustertype_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index 6b466116e..3027211f2 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -2,11 +2,9 @@ from django.urls import reverse
 from rest_framework import status
 
 from dcim.choices import InterfaceModeChoices
-from dcim.models import Interface
 from ipam.models import VLAN
 from utilities.testing import APITestCase, APIViewTestCases
-from virtualization.choices import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 
 class AppTest(APITestCase):
@@ -207,18 +205,15 @@ class InterfaceTest(APITestCase):
         self.virtualmachine = VirtualMachine.objects.create(cluster=cluster, name='Test VM 1')
         self.interface1 = Interface.objects.create(
             virtual_machine=self.virtualmachine,
-            name='Test Interface 1',
-            type=InterfaceTypeChoices.TYPE_VIRTUAL
+            name='Test Interface 1'
         )
         self.interface2 = Interface.objects.create(
             virtual_machine=self.virtualmachine,
-            name='Test Interface 2',
-            type=InterfaceTypeChoices.TYPE_VIRTUAL
+            name='Test Interface 2'
         )
         self.interface3 = Interface.objects.create(
             virtual_machine=self.virtualmachine,
-            name='Test Interface 3',
-            type=InterfaceTypeChoices.TYPE_VIRTUAL
+            name='Test Interface 3'
         )
 
         self.vlan1 = VLAN.objects.create(name="Test VLAN 1", vid=1)
@@ -227,21 +222,21 @@ class InterfaceTest(APITestCase):
 
     def test_get_interface(self):
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('dcim.view_interface')
+        self.add_permissions('virtualization.view_interface')
 
         response = self.client.get(url, **self.header)
         self.assertEqual(response.data['name'], self.interface1.name)
 
     def test_list_interfaces(self):
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.view_interface')
+        self.add_permissions('virtualization.view_interface')
 
         response = self.client.get(url, **self.header)
         self.assertEqual(response.data['count'], 3)
 
     def test_list_interfaces_brief(self):
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.view_interface')
+        self.add_permissions('virtualization.view_interface')
 
         response = self.client.get('{}?brief=1'.format(url), **self.header)
         self.assertEqual(
@@ -255,7 +250,7 @@ class InterfaceTest(APITestCase):
             'name': 'Test Interface 4',
         }
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.add_interface')
+        self.add_permissions('virtualization.add_interface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -273,7 +268,7 @@ class InterfaceTest(APITestCase):
             'tagged_vlans': [self.vlan1.id, self.vlan2.id],
         }
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.add_interface')
+        self.add_permissions('virtualization.add_interface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -299,7 +294,7 @@ class InterfaceTest(APITestCase):
             },
         ]
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.add_interface')
+        self.add_permissions('virtualization.add_interface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -333,7 +328,7 @@ class InterfaceTest(APITestCase):
             },
         ]
         url = reverse('virtualization-api:interface-list')
-        self.add_permissions('dcim.add_interface')
+        self.add_permissions('virtualization.add_interface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -349,7 +344,7 @@ class InterfaceTest(APITestCase):
             'name': 'Test Interface X',
         }
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('dcim.change_interface')
+        self.add_permissions('virtualization.change_interface')
 
         response = self.client.put(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -359,7 +354,7 @@ class InterfaceTest(APITestCase):
 
     def test_delete_interface(self):
         url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('dcim.delete_interface')
+        self.add_permissions('virtualization.delete_interface')
 
         response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index 51c7c6e8d..562ed9901 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -1,10 +1,10 @@
 from django.test import TestCase
 
-from dcim.models import DeviceRole, Interface, Platform, Region, Site
+from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
 from virtualization.choices import *
 from virtualization.filters import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 
 class ClusterTypeTestCase(TestCase):
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index a98496f29..b8e1f92c5 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -1,11 +1,11 @@
 from netaddr import EUI
 
 from dcim.choices import InterfaceModeChoices
-from dcim.models import DeviceRole, Interface, Platform, Site
+from dcim.models import DeviceRole, Platform, Site
 from ipam.models import VLAN
 from utilities.testing import ViewTestCases
 from virtualization.choices import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 
 class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
@@ -201,10 +201,6 @@ class InterfaceTestCase(
 ):
     model = Interface
 
-    def _get_base_url(self):
-        # Interface belongs to the DCIM app, so we have to override the base URL
-        return 'virtualization:interface_{}'
-
     @classmethod
     def setUpTestData(cls):
 
@@ -219,9 +215,9 @@ class InterfaceTestCase(
         VirtualMachine.objects.bulk_create(virtualmachines)
 
         Interface.objects.bulk_create([
-            Interface(virtual_machine=virtualmachines[0], name='Interface 1', type=InterfaceTypeChoices.TYPE_VIRTUAL),
-            Interface(virtual_machine=virtualmachines[0], name='Interface 2', type=InterfaceTypeChoices.TYPE_VIRTUAL),
-            Interface(virtual_machine=virtualmachines[0], name='Interface 3', type=InterfaceTypeChoices.TYPE_VIRTUAL),
+            Interface(virtual_machine=virtualmachines[0], name='Interface 1'),
+            Interface(virtual_machine=virtualmachines[0], name='Interface 2'),
+            Interface(virtual_machine=virtualmachines[0], name='Interface 3'),
         ])
 
         vlans = (
@@ -237,7 +233,6 @@ class InterfaceTestCase(
         cls.form_data = {
             'virtual_machine': virtualmachines[1].pk,
             'name': 'Interface X',
-            'type': InterfaceTypeChoices.TYPE_VIRTUAL,
             'enabled': False,
             'mgmt_only': False,
             'mac_address': EUI('01-02-03-04-05-06'),
@@ -252,7 +247,6 @@ class InterfaceTestCase(
         cls.bulk_create_data = {
             'virtual_machine': virtualmachines[1].pk,
             'name_pattern': 'Interface [4-6]',
-            'type': InterfaceTypeChoices.TYPE_VIRTUAL,
             'enabled': False,
             'mgmt_only': False,
             'mac_address': EUI('01-02-03-04-05-06'),
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 38ad1a8b1..4e29f861a 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -54,6 +54,7 @@ urlpatterns = [
     path('interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'),
     path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'),
     path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'),
+    path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='interface'),
     path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='interface_edit'),
     path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='interface_delete'),
     path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_interface'),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index aea4d0556..a64b9b9db 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -4,7 +4,8 @@ from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 
-from dcim.models import Device, Interface
+from dcim.models import Device
+from dcim.views import InterfaceView as DeviceInterfaceView
 from dcim.tables import DeviceTable
 from extras.views import ObjectConfigContextView
 from ipam.models import Service
@@ -13,7 +14,7 @@ from utilities.views import (
     ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
 
 
 #
@@ -288,6 +289,18 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 # VM interfaces
 #
 
+class InterfaceListView(ObjectListView):
+    queryset = Interface.objects.prefetch_related('virtual_machine', 'virtual_machine__tenant', 'cable')
+    filterset = filters.InterfaceFilterSet
+    filterset_form = forms.InterfaceFilterForm
+    table = tables.InterfaceTable
+    action_buttons = ('import', 'export')
+
+
+class InterfaceView(DeviceInterfaceView):
+    queryset = Interface.objects.all()
+
+
 class InterfaceCreateView(ComponentCreateView):
     queryset = Interface.objects.all()
     form = forms.InterfaceCreateForm

From e76b1f1daae8919d4e4ad1872100c8fd478acc86 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 13:50:14 -0400
Subject: [PATCH 184/505] Fix assigned_object field

---
 netbox/ipam/migrations/0037_ipaddress_assignment.py | 5 +++++
 netbox/ipam/models.py                               | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/netbox/ipam/migrations/0037_ipaddress_assignment.py b/netbox/ipam/migrations/0037_ipaddress_assignment.py
index 4586a5088..607f832a5 100644
--- a/netbox/ipam/migrations/0037_ipaddress_assignment.py
+++ b/netbox/ipam/migrations/0037_ipaddress_assignment.py
@@ -23,6 +23,11 @@ class Migration(migrations.Migration):
             old_name='interface',
             new_name='assigned_object_id',
         ),
+        migrations.AlterField(
+            model_name='ipaddress',
+            name='assigned_object_id',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
         migrations.AddField(
             model_name='ipaddress',
             name='assigned_object_type',
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index ba7c959dd..640d29834 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -615,10 +615,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         blank=True,
         null=True
     )
-    assigned_object_id = models.ForeignKey(
-        to='dcim.Interface',
-        on_delete=models.CASCADE,
-        related_name='ip_addresses',
+    assigned_object_id = models.PositiveIntegerField(
         blank=True,
         null=True
     )
@@ -660,7 +657,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         'dns_name', 'description',
     ]
     clone_fields = [
-        'vrf', 'tenant', 'status', 'role', 'description', 'interface',
+        'vrf', 'tenant', 'status', 'role', 'description',
     ]
 
     STATUS_CLASS_MAP = {

From 2608b3f9f391ca85a9cd9a78b3624d529a7e4e30 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 14:33:53 -0400
Subject: [PATCH 185/505] Separate VM interface view and template

---
 .../templates/virtualization/interface.html   | 120 ++++++++++++++++++
 netbox/virtualization/views.py                |  34 ++++-
 2 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 netbox/templates/virtualization/interface.html

diff --git a/netbox/templates/virtualization/interface.html b/netbox/templates/virtualization/interface.html
new file mode 100644
index 000000000..15b432a3f
--- /dev/null
+++ b/netbox/templates/virtualization/interface.html
@@ -0,0 +1,120 @@
+{% extends 'base.html' %}
+{% load helpers %}
+
+{% block header %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                {% if interface.device %}
+                    <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
+                {% else %}
+                    <li><a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a></li>
+                {% endif %}
+                <li><a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a></li>
+                <li>{{ interface }}</li>
+            </ol>
+        </div>
+    </div>
+    <div class="pull-right noprint">
+        {% if perms.dcim.change_interface %}
+            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:interface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
+                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
+            </a>
+        {% endif %}
+        {% if perms.dcim.delete_interface %}
+            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:interface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
+                <span class="fa fa-trash" aria-hidden="true"></span> Delete
+            </a>
+        {% endif %}
+    </div>
+    <h1>{% block title %}{{ interface.parent }} / {{ interface.name }}{% endblock %}</h1>
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ interface.get_absolute_url }}">Interface</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'dcim:interface_changelog' pk=interface.pk %}">Change Log</a>
+            </li>
+        {% endif %}
+    </ul>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+	<div class="col-md-6">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Interface</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>{% if interface.device %}Device{% else %}Virtual Machine{% endif %}</td>
+                    <td>
+                        <a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Name</td>
+                    <td>{{ interface.name }}</td>
+                </tr>
+                <tr>
+                    <td>Label</td>
+                    <td>{{ interface.label|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>Type</td>
+                    <td>{{ interface.get_type_display }}</td>
+                </tr>
+                <tr>
+                    <td>Enabled</td>
+                    <td>
+                        {% if interface.enabled %}
+                            <span class="text-success"><i class="fa fa-check"></i></span>
+                        {% else %}
+                            <span class="text-danger"><i class="fa fa-close"></i></span>
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>LAG</td>
+                    <td>
+                        {% if interface.lag%}
+                            <a href="{{ interface.lag.get_absolute_url }}">{{ interface.lag }}</a>
+                        {% else %}
+                            <span class="text-muted">None</span>
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Description</td>
+                    <td>{{ interface.description|placeholder }} </td>
+                </tr>
+                <tr>
+                    <td>MTU</td>
+                    <td>{{ interface.mtu|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>MAC Address</td>
+                    <td>{{ interface.mac_address|placeholder }}</span></td>
+                </tr>
+                <tr>
+                    <td>802.1Q Mode</td>
+                    <td>{{ interface.get_mode_display }}</td>
+                </tr>
+            </table>
+        </div>
+        {% include 'extras/inc/tags_panel.html' with tags=interface.tags.all %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+    </div>
+</div>
+{% endblock %}
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index a64b9b9db..bd700d16b 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -5,10 +5,10 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 
 from dcim.models import Device
-from dcim.views import InterfaceView as DeviceInterfaceView
 from dcim.tables import DeviceTable
 from extras.views import ObjectConfigContextView
 from ipam.models import Service
+from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, ObjectView,
     ObjectDeleteView, ObjectEditView, ObjectListView,
@@ -297,9 +297,39 @@ class InterfaceListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
-class InterfaceView(DeviceInterfaceView):
+class InterfaceView(ObjectView):
     queryset = Interface.objects.all()
 
+    def get(self, request, pk):
+
+        interface = get_object_or_404(self.queryset, pk=pk)
+
+        # Get assigned IP addresses
+        ipaddress_table = InterfaceIPAddressTable(
+            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            orderable=False
+        )
+
+        # Get assigned VLANs and annotate whether each is tagged or untagged
+        vlans = []
+        if interface.untagged_vlan is not None:
+            vlans.append(interface.untagged_vlan)
+            vlans[0].tagged = False
+        for vlan in interface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
+            vlan.tagged = True
+            vlans.append(vlan)
+        vlan_table = InterfaceVLANTable(
+            interface=interface,
+            data=vlans,
+            orderable=False
+        )
+
+        return render(request, 'virtualization/interface.html', {
+            'interface': interface,
+            'ipaddress_table': ipaddress_table,
+            'vlan_table': vlan_table,
+        })
+
 
 class InterfaceCreateView(ComponentCreateView):
     queryset = Interface.objects.all()

From 31bb70d9a251cfb39cbb77f03907bfd1be12a554 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 14:46:25 -0400
Subject: [PATCH 186/505] Fixed IPAM tests

---
 netbox/ipam/api/views.py                  |   3 +-
 netbox/ipam/filters.py                    |  74 ++++++-----
 netbox/ipam/forms.py                      | 142 +++++++++++-----------
 netbox/ipam/models.py                     |  29 +----
 netbox/ipam/tables.py                     |   4 +-
 netbox/ipam/tests/test_filters.py         |  35 +++---
 netbox/ipam/tests/test_views.py           |   1 -
 netbox/ipam/views.py                      |  90 +++++++-------
 netbox/templates/ipam/ipaddress.html      |   8 +-
 netbox/virtualization/tests/test_views.py |   7 --
 10 files changed, 188 insertions(+), 205 deletions(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 60bfade24..0f84ee772 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -233,8 +233,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
 
 class IPAddressViewSet(CustomFieldModelViewSet):
     queryset = IPAddress.objects.prefetch_related(
-        'vrf__tenant', 'tenant', 'nat_inside', 'interface__device__device_type', 'interface__virtual_machine',
-        'nat_outside', 'tags',
+        'vrf__tenant', 'tenant', 'nat_inside', 'nat_outside', 'tags',
     )
     serializer_class = serializers.IPAddressSerializer
     filterset_class = filters.IPAddressFilterSet
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 15be58ad4..aa3fa885b 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -1,5 +1,6 @@
 import django_filters
 import netaddr
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from netaddr.core import AddrFormatError
@@ -11,7 +12,7 @@ from utilities.filters import (
     BaseFilterSet, MultiValueCharFilter, MultiValueNumberFilter, NameSlugSearchFilterSet, TagFilter,
     TreeNodeMultipleChoiceFilter,
 )
-from virtualization.models import VirtualMachine
+from virtualization.models import Interface as VMInterface, VirtualMachine
 from .choices import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 
@@ -299,27 +300,26 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         to_field_name='rd',
         label='VRF (RD)',
     )
-    # device = MultiValueCharFilter(
-    #     method='filter_device',
-    #     field_name='name',
-    #     label='Device (name)',
-    # )
-    # device_id = MultiValueNumberFilter(
-    #     method='filter_device',
-    #     field_name='pk',
-    #     label='Device (ID)',
-    # )
-    # virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
-    #     field_name='interface__virtual_machine',
-    #     queryset=VirtualMachine.objects.unrestricted(),
-    #     label='Virtual machine (ID)',
-    # )
-    # virtual_machine = django_filters.ModelMultipleChoiceFilter(
-    #     field_name='interface__virtual_machine__name',
-    #     queryset=VirtualMachine.objects.unrestricted(),
-    #     to_field_name='name',
-    #     label='Virtual machine (name)',
-    # )
+    device = MultiValueCharFilter(
+        method='filter_device',
+        field_name='name',
+        label='Device (name)',
+    )
+    device_id = MultiValueNumberFilter(
+        method='filter_device',
+        field_name='pk',
+        label='Device (ID)',
+    )
+    virtual_machine = MultiValueCharFilter(
+        method='filter_virtual_machine',
+        field_name='name',
+        label='Virtual machine (name)',
+    )
+    virtual_machine_id = MultiValueNumberFilter(
+        method='filter_virtual_machine',
+        field_name='pk',
+        label='Virtual machine (ID)',
+    )
     # interface = django_filters.ModelMultipleChoiceFilter(
     #     field_name='interface__name',
     #     queryset=Interface.objects.unrestricted(),
@@ -379,17 +379,31 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         return queryset.filter(address__net_mask_length=value)
 
     def filter_device(self, queryset, name, value):
-        try:
-            devices = Device.objects.prefetch_related('device_type').filter(**{'{}__in'.format(name): value})
-            vc_interface_ids = []
-            for device in devices:
-                vc_interface_ids.extend([i['id'] for i in device.vc_interfaces.values('id')])
-            return queryset.filter(interface_id__in=vc_interface_ids)
-        except Device.DoesNotExist:
+        devices = Device.objects.filter(**{'{}__in'.format(name): value})
+        if not devices.exists():
             return queryset.none()
+        interface_ids = []
+        for device in devices:
+            interface_ids.extend(device.vc_interfaces.values_list('id', flat=True))
+        return queryset.filter(
+            assigned_object_type=ContentType.objects.get_for_model(Interface),
+            assigned_object_id__in=interface_ids
+        )
+
+    def filter_virtual_machine(self, queryset, name, value):
+        virtual_machines = VirtualMachine.objects.filter(**{'{}__in'.format(name): value})
+        if not virtual_machines.exists():
+            return queryset.none()
+        interface_ids = []
+        for vm in virtual_machines:
+            interface_ids.extend(vm.interfaces.values_list('id', flat=True))
+        return queryset.filter(
+            assigned_object_type=ContentType.objects.get_for_model(VMInterface),
+            assigned_object_id__in=interface_ids
+        )
 
     def _assigned_to_interface(self, queryset, name, value):
-        return queryset.exclude(interface__isnull=value)
+        return queryset.exclude(assigned_object_id__isnull=value)
 
 
 class VLANGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 620638703..a66a306da 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -523,10 +523,10 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
 #
 
 class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModelForm):
-    interface = forms.ModelChoiceField(
-        queryset=Interface.objects.all(),
-        required=False
-    )
+    # interface = forms.ModelChoiceField(
+    #     queryset=Interface.objects.all(),
+    #     required=False
+    # )
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
@@ -598,8 +598,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
     class Meta:
         model = IPAddress
         fields = [
-            'address', 'vrf', 'status', 'role', 'dns_name', 'description', 'interface', 'primary_for_parent',
-            'nat_site', 'nat_rack', 'nat_inside', 'tenant_group', 'tenant', 'tags',
+            'address', 'vrf', 'status', 'role', 'dns_name', 'description', 'primary_for_parent', 'nat_site', 'nat_rack',
+            'nat_inside', 'tenant_group', 'tenant', 'tags',
         ]
         widgets = {
             'status': StaticSelect2(),
@@ -621,27 +621,27 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
 
         self.fields['vrf'].empty_label = 'Global'
 
-        # Limit interface selections to those belonging to the parent device/VM
-        if self.instance and self.instance.interface:
-            self.fields['interface'].queryset = Interface.objects.filter(
-                device=self.instance.interface.device, virtual_machine=self.instance.interface.virtual_machine
-            ).prefetch_related(
-                'device__primary_ip4',
-                'device__primary_ip6',
-                'virtual_machine__primary_ip4',
-                'virtual_machine__primary_ip6',
-            )  # We prefetch the primary address fields to ensure cache invalidation does not balk on the save()
-        else:
-            self.fields['interface'].choices = []
-
-        # Initialize primary_for_parent if IP address is already assigned
-        if self.instance.pk and self.instance.interface is not None:
-            parent = self.instance.interface.parent
-            if (
-                self.instance.address.version == 4 and parent.primary_ip4_id == self.instance.pk or
-                self.instance.address.version == 6 and parent.primary_ip6_id == self.instance.pk
-            ):
-                self.initial['primary_for_parent'] = True
+        # # Limit interface selections to those belonging to the parent device/VM
+        # if self.instance and self.instance.interface:
+        #     self.fields['interface'].queryset = Interface.objects.filter(
+        #         device=self.instance.interface.device, virtual_machine=self.instance.interface.virtual_machine
+        #     ).prefetch_related(
+        #         'device__primary_ip4',
+        #         'device__primary_ip6',
+        #         'virtual_machine__primary_ip4',
+        #         'virtual_machine__primary_ip6',
+        #     )  # We prefetch the primary address fields to ensure cache invalidation does not balk on the save()
+        # else:
+        #     self.fields['interface'].choices = []
+        #
+        # # Initialize primary_for_parent if IP address is already assigned
+        # if self.instance.pk and self.instance.interface is not None:
+        #     parent = self.instance.interface.parent
+        #     if (
+        #         self.instance.address.version == 4 and parent.primary_ip4_id == self.instance.pk or
+        #         self.instance.address.version == 6 and parent.primary_ip6_id == self.instance.pk
+        #     ):
+        #         self.initial['primary_for_parent'] = True
 
     def clean(self):
         super().clean()
@@ -664,14 +664,14 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
             else:
                 parent.primary_ip6 = ipaddress
             parent.save()
-        elif self.cleaned_data['interface']:
-            parent = self.cleaned_data['interface'].parent
-            if ipaddress.address.version == 4 and parent.primary_ip4 == ipaddress:
-                parent.primary_ip4 = None
-                parent.save()
-            elif ipaddress.address.version == 6 and parent.primary_ip6 == ipaddress:
-                parent.primary_ip6 = None
-                parent.save()
+        # elif self.cleaned_data['interface']:
+        #     parent = self.cleaned_data['interface'].parent
+        #     if ipaddress.address.version == 4 and parent.primary_ip4 == ipaddress:
+        #         parent.primary_ip4 = None
+        #         parent.save()
+        #     elif ipaddress.address.version == 6 and parent.primary_ip6 == ipaddress:
+        #         parent.primary_ip6 = None
+        #         parent.save()
 
         return ipaddress
 
@@ -730,24 +730,24 @@ class IPAddressCSVForm(CustomFieldModelCSVForm):
         required=False,
         help_text='Functional role'
     )
-    device = CSVModelChoiceField(
-        queryset=Device.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text='Parent device of assigned interface (if any)'
-    )
-    virtual_machine = CSVModelChoiceField(
-        queryset=VirtualMachine.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text='Parent VM of assigned interface (if any)'
-    )
-    interface = CSVModelChoiceField(
-        queryset=Interface.objects.all(),
-        required=False,
-        to_field_name='name',
-        help_text='Assigned interface'
-    )
+    # device = CSVModelChoiceField(
+    #     queryset=Device.objects.all(),
+    #     required=False,
+    #     to_field_name='name',
+    #     help_text='Parent device of assigned interface (if any)'
+    # )
+    # virtual_machine = CSVModelChoiceField(
+    #     queryset=VirtualMachine.objects.all(),
+    #     required=False,
+    #     to_field_name='name',
+    #     help_text='Parent VM of assigned interface (if any)'
+    # )
+    # interface = CSVModelChoiceField(
+    #     queryset=Interface.objects.all(),
+    #     required=False,
+    #     to_field_name='name',
+    #     help_text='Assigned interface'
+    # )
     is_primary = forms.BooleanField(
         help_text='Make this the primary IP for the assigned device',
         required=False
@@ -760,23 +760,23 @@ class IPAddressCSVForm(CustomFieldModelCSVForm):
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(data, *args, **kwargs)
 
-        if data:
-
-            # Limit interface queryset by assigned device or virtual machine
-            if data.get('device'):
-                params = {
-                    f"device__{self.fields['device'].to_field_name}": data.get('device')
-                }
-            elif data.get('virtual_machine'):
-                params = {
-                    f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data.get('virtual_machine')
-                }
-            else:
-                params = {
-                    'device': None,
-                    'virtual_machine': None,
-                }
-            self.fields['interface'].queryset = self.fields['interface'].queryset.filter(**params)
+        # if data:
+        #
+        #     # Limit interface queryset by assigned device or virtual machine
+        #     if data.get('device'):
+        #         params = {
+        #             f"device__{self.fields['device'].to_field_name}": data.get('device')
+        #         }
+        #     elif data.get('virtual_machine'):
+        #         params = {
+        #             f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data.get('virtual_machine')
+        #         }
+        #     else:
+        #         params = {
+        #             'device': None,
+        #             'virtual_machine': None,
+        #         }
+        #     self.fields['interface'].queryset = self.fields['interface'].queryset.filter(**params)
 
     def clean(self):
         super().clean()
@@ -1197,7 +1197,7 @@ class ServiceForm(BootstrapMixin, CustomFieldModelForm):
         if self.instance.device:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
                 assigned_object_type=ContentType.objects.get_for_model(Interface),
-                assigned_object_id__in=self.instance.device.vc_interfaces.values('id', flat=True)
+                assigned_object_id__in=self.instance.device.vc_interfaces.values_list('id', flat=True)
             )
         elif self.instance.virtual_machine:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 640d29834..11eddb07a 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import F, Q
+from django.db.models import F
 from django.urls import reverse
 from taggit.managers import TaggableManager
 
@@ -653,7 +653,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
     objects = IPAddressManager()
 
     csv_headers = [
-        'address', 'vrf', 'tenant', 'status', 'role', 'device', 'virtual_machine', 'interface', 'is_primary',
+        'address', 'vrf', 'tenant', 'status', 'role', 'assigned_object_type', 'assigned_object_id', 'is_primary',
         'dns_name', 'description',
     ]
     clone_fields = [
@@ -753,17 +753,11 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         super().save(*args, **kwargs)
 
     def to_objectchange(self, action):
-        # Annotate the assigned Interface (if any)
-        try:
-            parent_obj = self.interface
-        except ObjectDoesNotExist:
-            parent_obj = None
-
         return ObjectChange(
             changed_object=self,
             object_repr=str(self),
             action=action,
-            related_object=parent_obj,
+            related_object=self.assigned_object,
             object_data=serialize_object(self)
         )
 
@@ -783,9 +777,8 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
             self.tenant.name if self.tenant else None,
             self.get_status_display(),
             self.get_role_display(),
-            self.device.identifier if self.device else None,
-            self.virtual_machine.name if self.virtual_machine else None,
-            self.interface.name if self.interface else None,
+            '{}.{}'.format(self.assigned_object_type.app_label, self.assigned_object_type.model) if self.assigned_object_type else None,
+            self.assigned_object_id,
             is_primary,
             self.dns_name,
             self.description,
@@ -806,18 +799,6 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
             self.address.prefixlen = value
     mask_length = property(fset=_set_mask_length)
 
-    @property
-    def device(self):
-        if self.interface:
-            return self.interface.device
-        return None
-
-    @property
-    def virtual_machine(self):
-        if self.interface:
-            return self.interface.virtual_machine
-        return None
-
     def get_status_class(self):
         return self.STATUS_CLASS_MAP.get(self.status)
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 989fe0844..8f731b7ae 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -481,13 +481,13 @@ class IPAddressAssignTable(BaseTable):
         template_code=IPADDRESS_PARENT,
         orderable=False
     )
-    interface = tables.Column(
+    assigned_object = tables.Column(
         orderable=False
     )
 
     class Meta(BaseTable.Meta):
         model = IPAddress
-        fields = ('address', 'dns_name', 'vrf', 'status', 'role', 'tenant', 'parent', 'interface', 'description')
+        fields = ('address', 'dns_name', 'vrf', 'status', 'role', 'tenant', 'parent', 'assigned_object', 'description')
         orderable = False
 
 
diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index 24d0d7fa8..8382ae409 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -4,7 +4,7 @@ from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer,
 from ipam.choices import *
 from ipam.filters import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-from virtualization.models import Cluster, ClusterType, Interfaces as VMInterface, VirtualMachine
+from virtualization.models import Cluster, ClusterType, Interface as VMInterface, VirtualMachine
 from tenancy.models import Tenant, TenantGroup
 
 
@@ -415,16 +415,16 @@ class IPAddressTestCase(TestCase):
         Tenant.objects.bulk_create(tenants)
 
         ipaddresses = (
-            IPAddress(address='10.0.0.1/24', tenant=None, vrf=None, interface=None, status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-a'),
-            IPAddress(address='10.0.0.2/24', tenant=tenants[0], vrf=vrfs[0], interface=interfaces[0], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
-            IPAddress(address='10.0.0.3/24', tenant=tenants[1], vrf=vrfs[1], interface=interfaces[1], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
-            IPAddress(address='10.0.0.4/24', tenant=tenants[2], vrf=vrfs[2], interface=interfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
-            IPAddress(address='10.0.0.1/25', tenant=None, vrf=None, interface=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
-            IPAddress(address='2001:db8::1/64', tenant=None, vrf=None, interface=None, status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-a'),
-            IPAddress(address='2001:db8::2/64', tenant=tenants[0], vrf=vrfs[0], interface=interfaces[3], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
-            IPAddress(address='2001:db8::3/64', tenant=tenants[1], vrf=vrfs[1], interface=interfaces[4], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
-            IPAddress(address='2001:db8::4/64', tenant=tenants[2], vrf=vrfs[2], interface=interfaces[5], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
-            IPAddress(address='2001:db8::1/65', tenant=None, vrf=None, interface=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
+            IPAddress(address='10.0.0.1/24', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-a'),
+            IPAddress(address='10.0.0.2/24', tenant=tenants[0], vrf=vrfs[0], assigned_object=interfaces[0], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
+            IPAddress(address='10.0.0.3/24', tenant=tenants[1], vrf=vrfs[1], assigned_object=interfaces[1], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
+            IPAddress(address='10.0.0.4/24', tenant=tenants[2], vrf=vrfs[2], assigned_object=interfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
+            IPAddress(address='10.0.0.1/25', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
+            IPAddress(address='2001:db8::1/64', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-a'),
+            IPAddress(address='2001:db8::2/64', tenant=tenants[0], vrf=vrfs[0], assigned_object=vm_interfaces[0], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
+            IPAddress(address='2001:db8::3/64', tenant=tenants[1], vrf=vrfs[1], assigned_object=vm_interfaces[1], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
+            IPAddress(address='2001:db8::4/64', tenant=tenants[2], vrf=vrfs[2], assigned_object=vm_interfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
+            IPAddress(address='2001:db8::1/65', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
         )
         IPAddress.objects.bulk_create(ipaddresses)
 
@@ -486,12 +486,13 @@ class IPAddressTestCase(TestCase):
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    def test_interface(self):
-        interfaces = Interface.objects.all()[:2]
-        params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-        params = {'interface': ['Interface 1', 'Interface 2']}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+    # TODO: Restore filtering by interface
+    # def test_interface(self):
+    #     interfaces = Interface.objects.all()[:2]
+    #     params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
+    #     self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+    #     params = {'interface': ['Interface 1', 'Interface 2']}
+    #     self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_assigned_to_interface(self):
         params = {'assigned_to_interface': 'true'}
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index 06090e768..eb7f05e8f 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -236,7 +236,6 @@ class IPAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'tenant': None,
             'status': IPAddressStatusChoices.STATUS_RESERVED,
             'role': IPAddressRoleChoices.ROLE_ANYCAST,
-            'interface': None,
             'nat_inside': None,
             'dns_name': 'example',
             'description': 'A new IP address',
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 98fe1d73d..20355bab3 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -517,7 +517,7 @@ class PrefixIPAddressesView(ObjectView):
 
         # Find all IPAddresses belonging to this Prefix
         ipaddresses = prefix.get_child_ips().restrict(request.user, 'view').prefetch_related(
-            'vrf', 'interface__device', 'primary_ip4_for', 'primary_ip6_for'
+            'vrf', 'primary_ip4_for', 'primary_ip6_for'
         )
 
         # Add available IP addresses to the table if requested
@@ -593,7 +593,7 @@ class PrefixBulkDeleteView(BulkDeleteView):
 
 class IPAddressListView(ObjectListView):
     queryset = IPAddress.objects.prefetch_related(
-        'vrf__tenant', 'tenant', 'nat_inside', 'interface__device', 'interface__virtual_machine'
+        'vrf__tenant', 'tenant', 'nat_inside'
     )
     filterset = filters.IPAddressFilterSet
     filterset_form = forms.IPAddressFilterForm
@@ -607,49 +607,47 @@ class IPAddressView(ObjectView):
 
         ipaddress = get_object_or_404(self.queryset, pk=pk)
 
-        # Parent prefixes table
-        parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
-            vrf=ipaddress.vrf, prefix__net_contains=str(ipaddress.address.ip)
-        ).prefetch_related(
-            'site', 'role'
-        )
-        parent_prefixes_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
-        parent_prefixes_table.exclude = ('vrf',)
-
-        # Duplicate IPs table
-        duplicate_ips = IPAddress.objects.restrict(request.user, 'view').filter(
-            vrf=ipaddress.vrf, address=str(ipaddress.address)
-        ).exclude(
-            pk=ipaddress.pk
-        ).prefetch_related(
-            'nat_inside', 'interface__device'
-        )
-        # Exclude anycast IPs if this IP is anycast
-        if ipaddress.role == IPAddressRoleChoices.ROLE_ANYCAST:
-            duplicate_ips = duplicate_ips.exclude(role=IPAddressRoleChoices.ROLE_ANYCAST)
-        duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
-
-        # Related IP table
-        related_ips = IPAddress.objects.restrict(request.user, 'view').prefetch_related(
-            'interface__device'
-        ).exclude(
-            address=str(ipaddress.address)
-        ).filter(
-            vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)
-        )
-        related_ips_table = tables.IPAddressTable(related_ips, orderable=False)
-
-        paginate = {
-            'paginator_class': EnhancedPaginator,
-            'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
-        }
-        RequestConfig(request, paginate).configure(related_ips_table)
+        # # Parent prefixes table
+        # parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
+        #     vrf=ipaddress.vrf, prefix__net_contains=str(ipaddress.address.ip)
+        # ).prefetch_related(
+        #     'site', 'role'
+        # )
+        # parent_prefixes_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
+        # parent_prefixes_table.exclude = ('vrf',)
+        #
+        # # Duplicate IPs table
+        # duplicate_ips = IPAddress.objects.restrict(request.user, 'view').filter(
+        #     vrf=ipaddress.vrf, address=str(ipaddress.address)
+        # ).exclude(
+        #     pk=ipaddress.pk
+        # ).prefetch_related(
+        #     'nat_inside'
+        # )
+        # # Exclude anycast IPs if this IP is anycast
+        # if ipaddress.role == IPAddressRoleChoices.ROLE_ANYCAST:
+        #     duplicate_ips = duplicate_ips.exclude(role=IPAddressRoleChoices.ROLE_ANYCAST)
+        # duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
+        #
+        # # Related IP table
+        # related_ips = IPAddress.objects.restrict(request.user, 'view').exclude(
+        #     address=str(ipaddress.address)
+        # ).filter(
+        #     vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)
+        # )
+        # related_ips_table = tables.IPAddressTable(related_ips, orderable=False)
+        #
+        # paginate = {
+        #     'paginator_class': EnhancedPaginator,
+        #     'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
+        # }
+        # RequestConfig(request, paginate).configure(related_ips_table)
 
         return render(request, 'ipam/ipaddress.html', {
             'ipaddress': ipaddress,
-            'parent_prefixes_table': parent_prefixes_table,
-            'duplicate_ips_table': duplicate_ips_table,
-            'related_ips_table': related_ips_table,
+            # 'parent_prefixes_table': parent_prefixes_table,
+            # 'duplicate_ips_table': duplicate_ips_table,
+            # 'related_ips_table': related_ips_table,
         })
 
 
@@ -699,9 +697,7 @@ class IPAddressAssignView(ObjectView):
 
         if form.is_valid():
 
-            addresses = self.queryset.prefetch_related(
-                'vrf', 'tenant', 'interface__device', 'interface__virtual_machine'
-            )
+            addresses = self.queryset.prefetch_related('vrf', 'tenant')
             # Limit to 100 results
             addresses = filters.IPAddressFilterSet(request.POST, addresses).qs[:100]
             table = tables.IPAddressAssignTable(addresses)
@@ -734,7 +730,7 @@ class IPAddressBulkImportView(BulkImportView):
 
 
 class IPAddressBulkEditView(BulkEditView):
-    queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant').prefetch_related('interface__device')
+    queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant')
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
     form = forms.IPAddressBulkEditForm
@@ -742,7 +738,7 @@ class IPAddressBulkEditView(BulkEditView):
 
 
 class IPAddressBulkDeleteView(BulkDeleteView):
-    queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant').prefetch_related('interface__device')
+    queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant')
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
     default_return_url = 'ipam:ipaddress_list'
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 6eba1a5e6..ff83061cf 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -120,8 +120,8 @@
                 <tr>
                     <td>Assignment</td>
                     <td>
-                        {% if ipaddress.interface %}
-                            <span><a href="{{ ipaddress.interface.parent.get_absolute_url }}">{{ ipaddress.interface.parent }}</a> ({{ ipaddress.interface }})</span>
+                        {% if ipaddress.assigned_object %}
+                            <span><a href="{{ ipaddress.assigned_object.parent.get_absolute_url }}">{{ ipaddress.assigned_object.parent }}</a> ({{ ipaddress.assigned_object }})</span>
                         {% else %}
                             <span class="text-muted">&mdash;</span>
                         {% endif %}
@@ -132,8 +132,8 @@
                     <td>
                         {% if ipaddress.nat_inside %}
                             <a href="{% url 'ipam:ipaddress' pk=ipaddress.nat_inside.pk %}">{{ ipaddress.nat_inside }}</a>
-                            {% if ipaddress.nat_inside.interface %}
-                                (<a href="{{ ipaddress.nat_inside.interface.parent.get_absolute_url }}">{{ ipaddress.nat_inside.interface.parent }}</a>)
+                            {% if ipaddress.nat_inside.assigned_object %}
+                                (<a href="{{ ipaddress.nat_inside.assigned_object.parent.get_absolute_url }}">{{ ipaddress.nat_inside.assigned_object.parent }}</a>)
                             {% endif %}
                         {% else %}
                             <span class="text-muted">None</span>
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index b8e1f92c5..e71a23668 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -267,10 +267,3 @@ class InterfaceTestCase(
             # 'untagged_vlan': vlans[0].pk,
             # 'tagged_vlans': [v.pk for v in vlans[1:4]],
         }
-
-        cls.csv_data = (
-            "device,name,type",
-            "Device 1,Interface 4,1000BASE-T (1GE)",
-            "Device 1,Interface 5,1000BASE-T (1GE)",
-            "Device 1,Interface 6,1000BASE-T (1GE)",
-        )

From f2b26282b873a7c09b404bc4a74aeea49309e035 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:09:16 -0400
Subject: [PATCH 187/505] Disable VM interface bulk creation testing

---
 netbox/virtualization/forms.py            | 9 +++++----
 netbox/virtualization/tests/test_views.py | 2 +-
 netbox/virtualization/views.py            | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 5789dff88..4c62df344 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -356,11 +356,10 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
             for family in [4, 6]:
                 ip_choices = [(None, '---------')]
                 # Collect interface IPs
-                interface_pks = self.instance.interfaces.values_list('id', flat=True)
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
                     address__family=family,
                     assigned_object_type=ContentType.objects.get_for_model(Interface),
-                    assigned_object_id__in=interface_pks
+                    assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if interface_ips:
                     ip_choices.append(
@@ -370,7 +369,9 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                     )
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
-                    address__family=family, nat_inside__interface__virtual_machine=self.instance
+                    address__family=family,
+                    nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    nat_inside__assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if nat_ips:
                     ip_choices.append(
@@ -622,7 +623,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
         super().__init__(*args, **kwargs)
 
         # Add current site to VLANs query params
-        site = getattr(self.instance.virtual_machine, 'site', None)
+        site = self.instance.virtual_machine.site
         if site is not None:
             # Add current site to VLANs query params
             self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index e71a23668..fba3e0eac 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -195,7 +195,7 @@ class InterfaceTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.BulkCreateObjectsViewTestCase,
+    # ViewTestCases.BulkCreateObjectsViewTestCase,
     ViewTestCases.BulkEditObjectsViewTestCase,
     ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index bd700d16b..65fdddd85 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -331,6 +331,7 @@ class InterfaceView(ObjectView):
         })
 
 
+# TODO: This should not use ComponentCreateView
 class InterfaceCreateView(ComponentCreateView):
     queryset = Interface.objects.all()
     form = forms.InterfaceCreateForm

From 380a5cf8a7d805f2d8b2f4ae4baa63517aaa27cc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:12:35 -0400
Subject: [PATCH 188/505] Fix IP choices for DeviceForm

---
 netbox/dcim/forms.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 2109f0784..7eda7d8cd 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1816,18 +1816,22 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 ip_choices = [(None, '---------')]
 
                 # Gather PKs of all interfaces belonging to this Device or a peer VirtualChassis member
-                interface_ids = self.instance.vc_interfaces.values('pk')
+                interface_ids = self.instance.vc_interfaces.values_list('pk', flat=True)
 
                 # Collect interface IPs
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
-                    address__family=family, interface_id__in=interface_ids
+                    address__family=family,
+                    assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    assigned_object_id__in=interface_ids
                 )
                 if interface_ips:
                     ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips]
                     ip_choices.append(('Interface IPs', ip_list))
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
-                    address__family=family, nat_inside__interface__in=interface_ids
+                    address__family=family,
+                    nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    nat_inside__assigned_object_id__in=interface_ids
                 )
                 if nat_ips:
                     ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips]

From 37564d630a19af78b88c6dda92d72e620ed40eef Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:17:01 -0400
Subject: [PATCH 189/505] Misc test fixes

---
 netbox/dcim/api/views.py          | 2 +-
 netbox/dcim/tests/test_filters.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 324edcb49..24f553f0e 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -484,7 +484,7 @@ class PowerOutletViewSet(CableTraceMixin, ModelViewSet):
 
 class InterfaceViewSet(CableTraceMixin, ModelViewSet):
     queryset = Interface.objects.prefetch_related(
-        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ip_addresses', 'tags'
+        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ipaddresses', 'tags'
     ).filter(
         device__isnull=False
     )
diff --git a/netbox/dcim/tests/test_filters.py b/netbox/dcim/tests/test_filters.py
index 6c261f025..d4504d586 100644
--- a/netbox/dcim/tests/test_filters.py
+++ b/netbox/dcim/tests/test_filters.py
@@ -1254,8 +1254,8 @@ class DeviceTestCase(TestCase):
 
         # Assign primary IPs for filtering
         ipaddresses = (
-            IPAddress(address='192.0.2.1/24', interface=interfaces[0]),
-            IPAddress(address='192.0.2.2/24', interface=interfaces[1]),
+            IPAddress(address='192.0.2.1/24', assigned_object=interfaces[0]),
+            IPAddress(address='192.0.2.2/24', assigned_object=interfaces[1]),
         )
         IPAddress.objects.bulk_create(ipaddresses)
         Device.objects.filter(pk=devices[0].pk).update(primary_ip4=ipaddresses[0])

From 7b24984280171df30d2b3fd438103f83653dcd8d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:39:57 -0400
Subject: [PATCH 190/505] Update IPAddressSerializer

---
 netbox/ipam/api/serializers.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py
index e92006096..d7f70f113 100644
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -1,5 +1,7 @@
 from collections import OrderedDict
 
+from django.contrib.contenttypes.models import ContentType
+from drf_yasg.utils import swagger_serializer_method
 from rest_framework import serializers
 from rest_framework.reverse import reverse
 from rest_framework.validators import UniqueTogetherValidator
@@ -9,10 +11,12 @@ from dcim.models import Interface
 from extras.api.customfields import CustomFieldModelSerializer
 from extras.api.serializers import TaggedObjectSerializer
 from ipam.choices import *
+from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import (
-    ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer, WritableNestedSerializer,
+    ChoiceField, ContentTypeField, SerializedPKRelatedField, ValidatedModelSerializer, WritableNestedSerializer,
+    get_serializer_for_model,
 )
 from virtualization.api.nested_serializers import NestedVirtualMachineSerializer
 from .nested_serializers import *
@@ -228,18 +232,31 @@ class IPAddressSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     status = ChoiceField(choices=IPAddressStatusChoices, required=False)
     role = ChoiceField(choices=IPAddressRoleChoices, allow_blank=True, required=False)
-    interface = IPAddressInterfaceSerializer(required=False, allow_null=True)
+    assigned_object_type = ContentTypeField(
+        queryset=ContentType.objects.filter(IPADDRESS_ASSIGNMENT_MODELS),
+        required=False
+    )
+    assigned_object = serializers.SerializerMethodField(read_only=True)
     nat_inside = NestedIPAddressSerializer(required=False, allow_null=True)
     nat_outside = NestedIPAddressSerializer(read_only=True)
 
     class Meta:
         model = IPAddress
         fields = [
-            'id', 'family', 'address', 'vrf', 'tenant', 'status', 'role', 'interface', 'nat_inside',
-            'nat_outside', 'dns_name', 'description', 'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'family', 'address', 'vrf', 'tenant', 'status', 'role', 'assigned_object_type', 'assigned_object_id',
+            'assigned_object', 'nat_inside', 'nat_outside', 'dns_name', 'description', 'tags', 'custom_fields',
+            'created', 'last_updated',
         ]
         read_only_fields = ['family']
 
+    @swagger_serializer_method(serializer_or_field=serializers.DictField)
+    def get_assigned_object(self, obj):
+        if obj.assigned_object is None:
+            return None
+        serializer = get_serializer_for_model(obj.assigned_object, prefix='Nested')
+        context = {'request': self.context['request']}
+        return serializer(obj.assigned_object, context=context).data
+
 
 class AvailableIPSerializer(serializers.Serializer):
     """

From b5d53fa850903043e73bbea8234249fc3aebfa09 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:49:09 -0400
Subject: [PATCH 191/505] Fix schema deconstruction for NaturalOrderingField

---
 .../migrations/0093_device_component_ordering.py | 16 ++++++++--------
 .../0094_device_component_template_ordering.py   | 14 +++++++-------
 .../migrations/0095_primary_model_ordering.py    |  6 +++---
 .../dcim/migrations/0096_interface_ordering.py   |  4 ++--
 netbox/utilities/fields.py                       |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/netbox/dcim/migrations/0093_device_component_ordering.py b/netbox/dcim/migrations/0093_device_component_ordering.py
index 4e3c941a1..925694958 100644
--- a/netbox/dcim/migrations/0093_device_component_ordering.py
+++ b/netbox/dcim/migrations/0093_device_component_ordering.py
@@ -79,42 +79,42 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='consoleport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='consoleserverport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='devicebay',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='frontport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='inventoryitem',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='poweroutlet',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='powerport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='rearport',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_consoleports,
diff --git a/netbox/dcim/migrations/0094_device_component_template_ordering.py b/netbox/dcim/migrations/0094_device_component_template_ordering.py
index 24fe98e94..70acd3189 100644
--- a/netbox/dcim/migrations/0094_device_component_template_ordering.py
+++ b/netbox/dcim/migrations/0094_device_component_template_ordering.py
@@ -75,37 +75,37 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='consoleporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='consoleserverporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='devicebaytemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='frontporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='poweroutlettemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='powerporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='rearporttemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_consoleporttemplates,
diff --git a/netbox/dcim/migrations/0095_primary_model_ordering.py b/netbox/dcim/migrations/0095_primary_model_ordering.py
index 6225a9b73..2d6be72c8 100644
--- a/netbox/dcim/migrations/0095_primary_model_ordering.py
+++ b/netbox/dcim/migrations/0095_primary_model_ordering.py
@@ -43,17 +43,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='device',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True),
         ),
         migrations.AddField(
             model_name='rack',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.AddField(
             model_name='site',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize),
         ),
         migrations.RunPython(
             code=naturalize_sites,
diff --git a/netbox/dcim/migrations/0096_interface_ordering.py b/netbox/dcim/migrations/0096_interface_ordering.py
index f1622f504..7b2663c95 100644
--- a/netbox/dcim/migrations/0096_interface_ordering.py
+++ b/netbox/dcim/migrations/0096_interface_ordering.py
@@ -35,12 +35,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='interface',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         migrations.AddField(
             model_name='interfacetemplate',
             name='_name',
-            field=utilities.fields.NaturalOrderingField('target_field', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
+            field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface),
         ),
         migrations.RunPython(
             code=naturalize_interfacetemplates,
diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py
index 4eb19f539..a9b851def 100644
--- a/netbox/utilities/fields.py
+++ b/netbox/utilities/fields.py
@@ -68,6 +68,6 @@ class NaturalOrderingField(models.CharField):
         return (
             self.name,
             'utilities.fields.NaturalOrderingField',
-            ['target_field'],
+            [self.target_field],
             kwargs,
         )

From 27796bbd08fa4f3c741ef5ae278d3ce8e2107f85 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 15:58:47 -0400
Subject: [PATCH 192/505] Add queryset to IPAddressBulkCreateView

---
 netbox/ipam/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 98fe1d73d..0447960c2 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -719,6 +719,7 @@ class IPAddressDeleteView(ObjectDeleteView):
 
 
 class IPAddressBulkCreateView(BulkCreateView):
+    queryset = IPAddress.objects.all()
     form = forms.IPAddressBulkCreateForm
     model_form = forms.IPAddressBulkAddForm
     pattern_target = 'address'

From 40938f0c8a657825ce37758c8b5785b961218131 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 16:13:18 -0400
Subject: [PATCH 193/505] Retain ip_addresses name for related IPAddress
 objects

---
 netbox/dcim/api/views.py                | 2 +-
 netbox/dcim/models/device_components.py | 2 +-
 netbox/dcim/views.py                    | 2 +-
 netbox/ipam/models.py                   | 2 +-
 netbox/virtualization/models.py         | 2 +-
 netbox/virtualization/views.py          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 24f553f0e..324edcb49 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -484,7 +484,7 @@ class PowerOutletViewSet(CableTraceMixin, ModelViewSet):
 
 class InterfaceViewSet(CableTraceMixin, ModelViewSet):
     queryset = Interface.objects.prefetch_related(
-        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ipaddresses', 'tags'
+        'device', '_connected_interface', '_connected_circuittermination', 'cable', 'ip_addresses', 'tags'
     ).filter(
         device__isnull=False
     )
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 8f945622a..8724994f5 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -686,7 +686,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         blank=True,
         verbose_name='Tagged VLANs'
     )
-    ipaddresses = GenericRelation(
+    ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 9b19734e6..6aad18bd3 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1442,7 +1442,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 11eddb07a..c7baba435 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -2,7 +2,7 @@ import netaddr
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import F
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 8d4d5d889..de6073b4f 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -405,7 +405,7 @@ class Interface(BaseInterface):
         blank=True,
         verbose_name='Tagged VLANs'
     )
-    ipaddresses = GenericRelation(
+    ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id'
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 65fdddd85..4b37b5a66 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -306,7 +306,7 @@ class InterfaceView(ObjectView):
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ipaddresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 

From fc2d08c407e9477af6d0aa3da43742e080f8f693 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 16:27:13 -0400
Subject: [PATCH 194/505] Set related_query_name for GenericRelations to
 IPAddress

---
 netbox/dcim/forms.py                    |  6 ++----
 netbox/dcim/models/device_components.py |  3 ++-
 netbox/ipam/filters.py                  |  9 +++------
 netbox/ipam/forms.py                    | 11 ++++-------
 netbox/virtualization/forms.py          |  7 ++-----
 netbox/virtualization/models.py         |  3 ++-
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 7eda7d8cd..c8d445c1c 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1821,8 +1821,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect interface IPs
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
                     address__family=family,
-                    assigned_object_type=ContentType.objects.get_for_model(Interface),
-                    assigned_object_id__in=interface_ids
+                    interface__in=interface_ids
                 )
                 if interface_ips:
                     ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips]
@@ -1830,8 +1829,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
                     address__family=family,
-                    nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
-                    nat_inside__assigned_object_id__in=interface_ids
+                    nat_inside__interface__in=interface_ids
                 )
                 if nat_ips:
                     ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips]
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 8724994f5..fdbeeade8 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -689,7 +689,8 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
     ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
-        object_id_field='assigned_object_id'
+        object_id_field='assigned_object_id',
+        related_query_name='interface'
     )
     tags = TaggableManager(through=TaggedItem)
 
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index aa3fa885b..c9012cd3a 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -1,6 +1,5 @@
 import django_filters
 import netaddr
-from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from netaddr.core import AddrFormatError
@@ -12,7 +11,7 @@ from utilities.filters import (
     BaseFilterSet, MultiValueCharFilter, MultiValueNumberFilter, NameSlugSearchFilterSet, TagFilter,
     TreeNodeMultipleChoiceFilter,
 )
-from virtualization.models import Interface as VMInterface, VirtualMachine
+from virtualization.models import VirtualMachine
 from .choices import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 
@@ -386,8 +385,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         for device in devices:
             interface_ids.extend(device.vc_interfaces.values_list('id', flat=True))
         return queryset.filter(
-            assigned_object_type=ContentType.objects.get_for_model(Interface),
-            assigned_object_id__in=interface_ids
+            interface__in=interface_ids
         )
 
     def filter_virtual_machine(self, queryset, name, value):
@@ -398,8 +396,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         for vm in virtual_machines:
             interface_ids.extend(vm.interfaces.values_list('id', flat=True))
         return queryset.filter(
-            assigned_object_type=ContentType.objects.get_for_model(VMInterface),
-            assigned_object_id__in=interface_ids
+            vm_interface__in=interface_ids
         )
 
     def _assigned_to_interface(self, queryset, name, value):
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index a66a306da..3ffbc2d4f 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1,8 +1,7 @@
 from django import forms
-from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MaxValueValidator, MinValueValidator
 
-from dcim.models import Device, Interface, Rack, Region, Site
+from dcim.models import Device, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
 )
@@ -15,7 +14,7 @@ from utilities.forms import (
     ExpandableIPAddressField, ReturnURLForm, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
     BOOLEAN_WITH_BLANK_CHOICES,
 )
-from virtualization.models import Interface as VMInterface, VirtualMachine
+from virtualization.models import VirtualMachine
 from .choices import *
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -1196,13 +1195,11 @@ class ServiceForm(BootstrapMixin, CustomFieldModelForm):
         # Limit IP address choices to those assigned to interfaces of the parent device/VM
         if self.instance.device:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
-                assigned_object_type=ContentType.objects.get_for_model(Interface),
-                assigned_object_id__in=self.instance.device.vc_interfaces.values_list('id', flat=True)
+                interface__in=self.instance.device.vc_interfaces.values_list('id', flat=True)
             )
         elif self.instance.virtual_machine:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
-                assigned_object_type=ContentType.objects.get_for_model(VMInterface),
-                assigned_object_id__in=self.instance.virtual_machine.interfaces.values_list('id', flat=True)
+                vm_interface__in=self.instance.virtual_machine.interfaces.values_list('id', flat=True)
             )
         else:
             self.fields['ipaddresses'].choices = []
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 4c62df344..500de821b 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -1,5 +1,4 @@
 from django import forms
-from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 
 from dcim.choices import InterfaceModeChoices
@@ -358,8 +357,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect interface IPs
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
                     address__family=family,
-                    assigned_object_type=ContentType.objects.get_for_model(Interface),
-                    assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
+                    vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if interface_ips:
                     ip_choices.append(
@@ -370,8 +368,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
                     address__family=family,
-                    nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
-                    nat_inside__assigned_object_id__in=self.instance.interfaces.values_list('id', flat=True)
+                    nat_inside__vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if nat_ips:
                     ip_choices.append(
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index de6073b4f..2adf821a5 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -408,7 +408,8 @@ class Interface(BaseInterface):
     ip_addresses = GenericRelation(
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
-        object_id_field='assigned_object_id'
+        object_id_field='assigned_object_id',
+        related_query_name='vm_interface'
     )
     tags = TaggableManager(
         through=TaggedItem,

From bb6be8e3d3337bd59c5ef8c9e23c5b0c124a1e5d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 22 Jun 2020 16:36:06 -0400
Subject: [PATCH 195/505] Disable editing assigned interface under IPAddress
 form

---
 netbox/templates/ipam/ipaddress_edit.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index d8902595a..8583ec160 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -28,21 +28,28 @@
             {% render_field form.tenant %}
         </div>
     </div>
-    {% if obj.interface %}
+    {% if obj.assigned_object %}
         <div class="panel panel-default">
             <div class="panel-heading">
                 <strong>Interface Assignment</strong>
             </div>
             <div class="panel-body">
                 <div class="form-group">
-                    <label class="col-md-3 control-label">{{ obj.interface.parent|meta:"verbose_name"|bettertitle }}</label>
+                    <label class="col-md-3 control-label">{{ obj.assigned_object.parent|meta:"verbose_name"|bettertitle }}</label>
                     <div class="col-md-9">
                         <p class="form-control-static">
-                            <a href="{{ obj.interface.parent.get_absolute_url }}">{{ obj.interface.parent }}</a>
+                            <a href="{{ obj.assigned_object.parent.get_absolute_url }}">{{ obj.assigned_object.parent }}</a>
+                        </p>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-md-3 control-label">Interface</label>
+                    <div class="col-md-9">
+                        <p class="form-control-static">
+                            <a href="{{ obj.assigned_object.get_absolute_url }}">{{ obj.assigned_object }}</a>
                         </p>
                     </div>
                 </div>
-                {% render_field form.interface %}
                 {% render_field form.primary_for_parent %}
             </div>
         </div>

From d1bd010e057af3cde79ad3fd64921d4ff28cbad1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 12:50:22 -0400
Subject: [PATCH 196/505] Fix Interface tag replication in schema migration

---
 netbox/virtualization/migrations/0016_replicate_interfaces.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index c259b4140..640e9b02f 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -5,7 +5,7 @@ from django.db import migrations
 
 def replicate_interfaces(apps, schema_editor):
     ContentType = apps.get_model('contenttypes', 'ContentType')
-    TaggedItem = apps.get_model('taggit', 'TaggedItem')
+    TaggedItem = apps.get_model('extras', 'TaggedItem')
     Interface = apps.get_model('dcim', 'Interface')
     IPAddress = apps.get_model('ipam', 'IPAddress')
     VMInterface = apps.get_model('virtualization', 'Interface')

From 75354a8a78861b7c85bfa0b8a558d4e8a26cbe2b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 13:16:21 -0400
Subject: [PATCH 197/505] Rename Interface to VMInterface

---
 netbox/ipam/tests/test_filters.py             |  2 +-
 netbox/virtualization/api/serializers.py      |  4 ++--
 netbox/virtualization/api/views.py            |  4 ++--
 netbox/virtualization/filters.py              |  4 ++--
 netbox/virtualization/forms.py                | 10 ++++----
 ...{0015_interface.py => 0015_vminterface.py} |  3 ++-
 .../migrations/0016_replicate_interfaces.py   | 10 ++++----
 netbox/virtualization/models.py               |  5 ++--
 netbox/virtualization/tables.py               |  4 ++--
 netbox/virtualization/tests/test_api.py       | 24 +++++++++----------
 netbox/virtualization/tests/test_filters.py   | 20 ++++++++--------
 netbox/virtualization/tests/test_views.py     | 12 +++++-----
 netbox/virtualization/views.py                | 20 ++++++++--------
 13 files changed, 62 insertions(+), 60 deletions(-)
 rename netbox/virtualization/migrations/{0015_interface.py => 0015_vminterface.py} (96%)

diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index 8382ae409..db9241480 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -4,7 +4,7 @@ from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer,
 from ipam.choices import *
 from ipam.filters import *
 from ipam.models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-from virtualization.models import Cluster, ClusterType, Interface as VMInterface, VirtualMachine
+from virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
 from tenancy.models import Tenant, TenantGroup
 
 
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index a437a000c..d2a13ce7d 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -10,7 +10,7 @@ from ipam.models import VLAN
 from tenancy.api.nested_serializers import NestedTenantSerializer
 from utilities.api import ChoiceField, SerializedPKRelatedField, ValidatedModelSerializer
 from virtualization.choices import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 from .nested_serializers import *
 
 
@@ -106,7 +106,7 @@ class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     )
 
     class Meta:
-        model = Interface
+        model = VMInterface
         fields = [
             'id', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan',
             'tagged_vlans', 'tags',
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index bcff543a8..8d16e08e1 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -5,7 +5,7 @@ from extras.api.views import CustomFieldModelViewSet
 from utilities.api import ModelViewSet
 from utilities.utils import get_subquery
 from virtualization import filters
-from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 from . import serializers
 
 
@@ -72,7 +72,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
 
 
 class InterfaceViewSet(ModelViewSet):
-    queryset = Interface.objects.filter(
+    queryset = VMInterface.objects.filter(
         virtual_machine__isnull=False
     ).prefetch_related(
         'virtual_machine', 'tags'
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index dd1c3e4b2..50bde1b3f 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -9,7 +9,7 @@ from utilities.filters import (
     TreeNodeMultipleChoiceFilter,
 )
 from .choices import *
-from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 __all__ = (
     'ClusterFilterSet',
@@ -222,7 +222,7 @@ class InterfaceFilterSet(BaseFilterSet):
     )
 
     class Meta:
-        model = Interface
+        model = VMInterface
         fields = ['id', 'name', 'enabled', 'mtu']
 
     def search(self, queryset, name, value):
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 500de821b..ec4b28f04 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -19,7 +19,7 @@ from utilities.forms import (
     StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from .choices import *
-from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 #
@@ -600,7 +600,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
     )
 
     class Meta:
-        model = Interface
+        model = VMInterface
         fields = [
             'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'mode', 'tags', 'untagged_vlan',
             'tagged_vlans',
@@ -717,7 +717,7 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
 
 class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
+        queryset=VMInterface.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
     virtual_machine = forms.ModelChoiceField(
@@ -786,7 +786,7 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
 
 
 class InterfaceFilterForm(forms.Form):
-    model = Interface
+    model = VMInterface
     enabled = forms.NullBooleanField(
         required=False,
         widget=StaticSelect2(
@@ -816,7 +816,7 @@ class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form):
 
 
 class InterfaceBulkCreateForm(
-    form_from_model(Interface, ['enabled', 'mtu', 'description', 'tags']),
+    form_from_model(VMInterface, ['enabled', 'mtu', 'description', 'tags']),
     VirtualMachineBulkAddComponentForm
 ):
     pass
diff --git a/netbox/virtualization/migrations/0015_interface.py b/netbox/virtualization/migrations/0015_vminterface.py
similarity index 96%
rename from netbox/virtualization/migrations/0015_interface.py
rename to netbox/virtualization/migrations/0015_vminterface.py
index 7ad22eeb8..fcda6b4f3 100644
--- a/netbox/virtualization/migrations/0015_interface.py
+++ b/netbox/virtualization/migrations/0015_vminterface.py
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Interface',
+            name='VMInterface',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=64)),
@@ -38,6 +38,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ('virtual_machine', utilities.query_functions.CollateAsChar('_name')),
                 'unique_together': {('virtual_machine', 'name')},
+                'verbose_name': 'interface',
             },
         ),
     ]
diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index 640e9b02f..2df483e78 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -8,10 +8,10 @@ def replicate_interfaces(apps, schema_editor):
     TaggedItem = apps.get_model('extras', 'TaggedItem')
     Interface = apps.get_model('dcim', 'Interface')
     IPAddress = apps.get_model('ipam', 'IPAddress')
-    VMInterface = apps.get_model('virtualization', 'Interface')
+    VMInterface = apps.get_model('virtualization', 'VMInterface')
 
     interface_ct = ContentType.objects.get_for_model(Interface)
-    vm_interface_ct = ContentType.objects.get_for_model(VMInterface)
+    vminterface_ct = ContentType.objects.get_for_model(VMInterface)
 
     # Replicate dcim.Interface instances assigned to VirtualMachines
     original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
@@ -35,12 +35,12 @@ def replicate_interfaces(apps, schema_editor):
         TaggedItem.objects.filter(
             content_type=interface_ct, object_id=interface.pk
         ).update(
-            content_type=vm_interface_ct, object_id=vm_interface.pk
+            content_type=vminterface_ct, object_id=vm_interface.pk
         )
 
         # Update any assigned IPAddresses
         IPAddress.objects.filter(assigned_object_id=interface.pk).update(
-            assigned_object_type=vm_interface_ct,
+            assigned_object_type=vminterface_ct,
             assigned_object_id=vm_interface.pk
         )
 
@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('ipam', '0037_ipaddress_assignment'),
-        ('virtualization', '0015_interface'),
+        ('virtualization', '0015_vminterface'),
     ]
 
     operations = [
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 2adf821a5..1ef4832a8 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -20,8 +20,8 @@ __all__ = (
     'Cluster',
     'ClusterGroup',
     'ClusterType',
-    'Interface',
     'VirtualMachine',
+    'VMInterface',
 )
 
 
@@ -381,7 +381,7 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
 #
 
 @extras_features('graphs', 'export_templates', 'webhooks')
-class Interface(BaseInterface):
+class VMInterface(BaseInterface):
     virtual_machine = models.ForeignKey(
         to='virtualization.VirtualMachine',
         on_delete=models.CASCADE,
@@ -423,6 +423,7 @@ class Interface(BaseInterface):
     ]
 
     class Meta:
+        verbose_name = 'interface'
         ordering = ('virtual_machine', CollateAsChar('_name'))
         unique_together = ('virtual_machine', 'name')
 
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 97831a458..e06714e85 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -3,7 +3,7 @@ from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
 from utilities.tables import BaseTable, ColoredLabelColumn, TagColumn, ToggleColumn
-from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 CLUSTERTYPE_ACTIONS = """
 <a href="{% url 'virtualization:clustertype_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
@@ -175,5 +175,5 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 class InterfaceTable(BaseTable):
 
     class Meta(BaseTable.Meta):
-        model = Interface
+        model = VMInterface
         fields = ('name', 'enabled', 'description')
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index 3027211f2..bc1b3332c 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -4,7 +4,7 @@ from rest_framework import status
 from dcim.choices import InterfaceModeChoices
 from ipam.models import VLAN
 from utilities.testing import APITestCase, APIViewTestCases
-from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 class AppTest(APITestCase):
@@ -203,15 +203,15 @@ class InterfaceTest(APITestCase):
         clustertype = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
         cluster = Cluster.objects.create(name='Test Cluster 1', type=clustertype)
         self.virtualmachine = VirtualMachine.objects.create(cluster=cluster, name='Test VM 1')
-        self.interface1 = Interface.objects.create(
+        self.interface1 = VMInterface.objects.create(
             virtual_machine=self.virtualmachine,
             name='Test Interface 1'
         )
-        self.interface2 = Interface.objects.create(
+        self.interface2 = VMInterface.objects.create(
             virtual_machine=self.virtualmachine,
             name='Test Interface 2'
         )
-        self.interface3 = Interface.objects.create(
+        self.interface3 = VMInterface.objects.create(
             virtual_machine=self.virtualmachine,
             name='Test Interface 3'
         )
@@ -254,8 +254,8 @@ class InterfaceTest(APITestCase):
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Interface.objects.count(), 4)
-        interface4 = Interface.objects.get(pk=response.data['id'])
+        self.assertEqual(VMInterface.objects.count(), 4)
+        interface4 = VMInterface.objects.get(pk=response.data['id'])
         self.assertEqual(interface4.virtual_machine_id, data['virtual_machine'])
         self.assertEqual(interface4.name, data['name'])
 
@@ -272,7 +272,7 @@ class InterfaceTest(APITestCase):
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Interface.objects.count(), 4)
+        self.assertEqual(VMInterface.objects.count(), 4)
         self.assertEqual(response.data['virtual_machine']['id'], data['virtual_machine'])
         self.assertEqual(response.data['name'], data['name'])
         self.assertEqual(response.data['untagged_vlan']['id'], data['untagged_vlan'])
@@ -298,7 +298,7 @@ class InterfaceTest(APITestCase):
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Interface.objects.count(), 6)
+        self.assertEqual(VMInterface.objects.count(), 6)
         self.assertEqual(response.data[0]['name'], data[0]['name'])
         self.assertEqual(response.data[1]['name'], data[1]['name'])
         self.assertEqual(response.data[2]['name'], data[2]['name'])
@@ -332,7 +332,7 @@ class InterfaceTest(APITestCase):
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Interface.objects.count(), 6)
+        self.assertEqual(VMInterface.objects.count(), 6)
         for i in range(0, 3):
             self.assertEqual(response.data[i]['name'], data[i]['name'])
             self.assertEqual([v['id'] for v in response.data[i]['tagged_vlans']], data[i]['tagged_vlans'])
@@ -348,8 +348,8 @@ class InterfaceTest(APITestCase):
 
         response = self.client.put(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(Interface.objects.count(), 3)
-        interface1 = Interface.objects.get(pk=response.data['id'])
+        self.assertEqual(VMInterface.objects.count(), 3)
+        interface1 = VMInterface.objects.get(pk=response.data['id'])
         self.assertEqual(interface1.name, data['name'])
 
     def test_delete_interface(self):
@@ -358,4 +358,4 @@ class InterfaceTest(APITestCase):
 
         response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(Interface.objects.count(), 2)
+        self.assertEqual(VMInterface.objects.count(), 2)
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index 562ed9901..9fe6b61d5 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -4,7 +4,7 @@ from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
 from virtualization.choices import *
 from virtualization.filters import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 class ClusterTypeTestCase(TestCase):
@@ -260,11 +260,11 @@ class VirtualMachineTestCase(TestCase):
         VirtualMachine.objects.bulk_create(vms)
 
         interfaces = (
-            Interface(virtual_machine=vms[0], name='Interface 1', mac_address='00-00-00-00-00-01'),
-            Interface(virtual_machine=vms[1], name='Interface 2', mac_address='00-00-00-00-00-02'),
-            Interface(virtual_machine=vms[2], name='Interface 3', mac_address='00-00-00-00-00-03'),
+            VMInterface(virtual_machine=vms[0], name='Interface 1', mac_address='00-00-00-00-00-01'),
+            VMInterface(virtual_machine=vms[1], name='Interface 2', mac_address='00-00-00-00-00-02'),
+            VMInterface(virtual_machine=vms[2], name='Interface 3', mac_address='00-00-00-00-00-03'),
         )
-        Interface.objects.bulk_create(interfaces)
+        VMInterface.objects.bulk_create(interfaces)
 
     def test_id(self):
         params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
@@ -366,7 +366,7 @@ class VirtualMachineTestCase(TestCase):
 
 
 class InterfaceTestCase(TestCase):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     filterset = InterfaceFilterSet
 
     @classmethod
@@ -394,11 +394,11 @@ class InterfaceTestCase(TestCase):
         VirtualMachine.objects.bulk_create(vms)
 
         interfaces = (
-            Interface(virtual_machine=vms[0], name='Interface 1', enabled=True, mtu=100, mac_address='00-00-00-00-00-01'),
-            Interface(virtual_machine=vms[1], name='Interface 2', enabled=True, mtu=200, mac_address='00-00-00-00-00-02'),
-            Interface(virtual_machine=vms[2], name='Interface 3', enabled=False, mtu=300, mac_address='00-00-00-00-00-03'),
+            VMInterface(virtual_machine=vms[0], name='Interface 1', enabled=True, mtu=100, mac_address='00-00-00-00-00-01'),
+            VMInterface(virtual_machine=vms[1], name='Interface 2', enabled=True, mtu=200, mac_address='00-00-00-00-00-02'),
+            VMInterface(virtual_machine=vms[2], name='Interface 3', enabled=False, mtu=300, mac_address='00-00-00-00-00-03'),
         )
-        Interface.objects.bulk_create(interfaces)
+        VMInterface.objects.bulk_create(interfaces)
 
     def test_id(self):
         id_list = self.queryset.values_list('id', flat=True)[:2]
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index fba3e0eac..2a8cc8ca8 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -5,7 +5,7 @@ from dcim.models import DeviceRole, Platform, Site
 from ipam.models import VLAN
 from utilities.testing import ViewTestCases
 from virtualization.choices import *
-from virtualization.models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 class ClusterGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
@@ -199,7 +199,7 @@ class InterfaceTestCase(
     ViewTestCases.BulkEditObjectsViewTestCase,
     ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
-    model = Interface
+    model = VMInterface
 
     @classmethod
     def setUpTestData(cls):
@@ -214,10 +214,10 @@ class InterfaceTestCase(
         )
         VirtualMachine.objects.bulk_create(virtualmachines)
 
-        Interface.objects.bulk_create([
-            Interface(virtual_machine=virtualmachines[0], name='Interface 1'),
-            Interface(virtual_machine=virtualmachines[0], name='Interface 2'),
-            Interface(virtual_machine=virtualmachines[0], name='Interface 3'),
+        VMInterface.objects.bulk_create([
+            VMInterface(virtual_machine=virtualmachines[0], name='Interface 1'),
+            VMInterface(virtual_machine=virtualmachines[0], name='Interface 2'),
+            VMInterface(virtual_machine=virtualmachines[0], name='Interface 3'),
         ])
 
         vlans = (
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 4b37b5a66..bb2d8b9bf 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -14,7 +14,7 @@ from utilities.views import (
     ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
-from .models import Cluster, ClusterGroup, ClusterType, Interface, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 
 #
@@ -236,7 +236,7 @@ class VirtualMachineView(ObjectView):
     def get(self, request, pk):
 
         virtualmachine = get_object_or_404(self.queryset, pk=pk)
-        interfaces = Interface.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
+        interfaces = VMInterface.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
         services = Service.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
 
         return render(request, 'virtualization/virtualmachine.html', {
@@ -290,7 +290,7 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 #
 
 class InterfaceListView(ObjectListView):
-    queryset = Interface.objects.prefetch_related('virtual_machine', 'virtual_machine__tenant', 'cable')
+    queryset = VMInterface.objects.prefetch_related('virtual_machine', 'virtual_machine__tenant', 'cable')
     filterset = filters.InterfaceFilterSet
     filterset_form = forms.InterfaceFilterForm
     table = tables.InterfaceTable
@@ -298,7 +298,7 @@ class InterfaceListView(ObjectListView):
 
 
 class InterfaceView(ObjectView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
 
     def get(self, request, pk):
 
@@ -333,30 +333,30 @@ class InterfaceView(ObjectView):
 
 # TODO: This should not use ComponentCreateView
 class InterfaceCreateView(ComponentCreateView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     form = forms.InterfaceCreateForm
     model_form = forms.InterfaceForm
     template_name = 'virtualization/virtualmachine_component_add.html'
 
 
 class InterfaceEditView(ObjectEditView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     model_form = forms.InterfaceForm
     template_name = 'virtualization/interface_edit.html'
 
 
 class InterfaceDeleteView(ObjectDeleteView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
 
 
 class InterfaceBulkEditView(BulkEditView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     table = tables.InterfaceTable
     form = forms.InterfaceBulkEditForm
 
 
 class InterfaceBulkDeleteView(BulkDeleteView):
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     table = tables.InterfaceTable
 
 
@@ -368,7 +368,7 @@ class VirtualMachineBulkAddInterfaceView(BulkComponentCreateView):
     parent_model = VirtualMachine
     parent_field = 'virtual_machine'
     form = forms.InterfaceBulkCreateForm
-    queryset = Interface.objects.all()
+    queryset = VMInterface.objects.all()
     model_form = forms.InterfaceForm
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable

From 25d6bbf6593aa32553a546782e960cb8a1159fb0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 14:38:45 -0400
Subject: [PATCH 198/505] Update view and permission names for VMInterface

---
 netbox/ipam/tables.py                         |  2 +-
 netbox/templates/dcim/inc/interface.html      |  4 +--
 netbox/templates/dcim/interface.html          |  4 +--
 .../templates/virtualization/interface.html   |  4 +--
 .../virtualization/interface_edit.html        |  2 +-
 .../virtualization/virtualmachine.html        |  6 ++--
 .../virtualization/virtualmachine_list.html   |  2 +-
 .../virtualization/api/nested_serializers.py  |  2 +-
 netbox/virtualization/models.py               |  2 +-
 netbox/virtualization/tests/test_api.py       | 36 +++++++++----------
 netbox/virtualization/urls.py                 | 14 ++++----
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 8f731b7ae..064b8d7ce 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -168,7 +168,7 @@ VLAN_MEMBER_UNTAGGED = """
 
 VLAN_MEMBER_ACTIONS = """
 {% if perms.dcim.change_interface %}
-    <a href="{% if record.device %}{% url 'dcim:interface_edit' pk=record.pk %}{% else %}{% url 'virtualization:interface_edit' pk=record.pk %}{% endif %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil"></i></a>
+    <a href="{% if record.device %}{% url 'dcim:interface_edit' pk=record.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=record.pk %}{% endif %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil"></i></a>
 {% endif %}
 """
 
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 2fe970fd7..640fca338 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -166,7 +166,7 @@
                     </ul>
                 </span>
             {% endif %}
-            <a href="{% if iface.device_id %}{% url 'dcim:interface_edit' pk=iface.pk %}{% else %}{% url 'virtualization:interface_edit' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit interface">
+            <a href="{% if iface.device_id %}{% url 'dcim:interface_edit' pk=iface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit interface">
                 <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
             </a>
         {% endif %}
@@ -176,7 +176,7 @@
                     <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
                 </button>
             {% else %}
-                <a href="{% if iface.device_id %}{% url 'dcim:interface_delete' pk=iface.pk %}{% else %}{% url 'virtualization:interface_delete' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs" title="Delete interface">
+                <a href="{% if iface.device_id %}{% url 'dcim:interface_delete' pk=iface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs" title="Delete interface">
                     <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
                 </a>
             {% endif %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 5714c8940..b4485edae 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -17,12 +17,12 @@
     </div>
     <div class="pull-right noprint">
         {% if perms.dcim.change_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:interface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
+            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span> Edit
             </a>
         {% endif %}
         {% if perms.dcim.delete_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:interface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
+            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
                 <span class="fa fa-trash" aria-hidden="true"></span> Delete
             </a>
         {% endif %}
diff --git a/netbox/templates/virtualization/interface.html b/netbox/templates/virtualization/interface.html
index 15b432a3f..8c3cb47ff 100644
--- a/netbox/templates/virtualization/interface.html
+++ b/netbox/templates/virtualization/interface.html
@@ -17,12 +17,12 @@
     </div>
     <div class="pull-right noprint">
         {% if perms.dcim.change_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:interface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
+            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span> Edit
             </a>
         {% endif %}
         {% if perms.dcim.delete_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:interface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
+            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
                 <span class="fa fa-trash" aria-hidden="true"></span> Delete
             </a>
         {% endif %}
diff --git a/netbox/templates/virtualization/interface_edit.html b/netbox/templates/virtualization/interface_edit.html
index 437b960c9..6b0313284 100644
--- a/netbox/templates/virtualization/interface_edit.html
+++ b/netbox/templates/virtualization/interface_edit.html
@@ -21,7 +21,7 @@
 {% block buttons %}
     {% if obj.pk %}
         <button type="submit" name="_update" class="btn btn-primary">Update</button>
-        <button type="submit" formaction="?return_url={% url 'virtualization:interface_edit' pk=obj.pk %}" class="btn btn-primary">Update and Continue Editing</button>
+        <button type="submit" formaction="?return_url={% url 'virtualization:vminterface_edit' pk=obj.pk %}" class="btn btn-primary">Update and Continue Editing</button>
     {% else %}
         <button type="submit" name="_create" class="btn btn-primary">Create</button>
         <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index ea8f4fedb..b3ac51f37 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -297,18 +297,18 @@
                         <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                         </button>
-                        <button type="submit" name="_edit" formaction="{% url 'virtualization:interface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
+                        <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
                         </button>
                     {% endif %}
                     {% if interfaces and perms.dcim.delete_interface %}
-                        <button type="submit" name="_delete" formaction="{% url 'virtualization:interface_bulk_delete' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
+                        <button type="submit" name="_delete" formaction="{% url 'virtualization:vminterface_bulk_delete' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
                             <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                         </button>
                     {% endif %}
                     {% if perms.dcim.add_interface %}
                         <div class="pull-right">
-                            <a href="{% url 'virtualization:interface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary btn-xs">
+                            <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary btn-xs">
                                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
                             </a>
                         </div>
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index 74839b250..f8ee77626 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -7,7 +7,7 @@
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Components <span class="caret"></span>
             </button>
             <ul class="dropdown-menu">
-                {% if perms.dcim.add_interface %}<li><a href="{% url 'virtualization:virtualmachine_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Interfaces</a></li>{% endif %}
+                {% if perms.dcim.add_interface %}<li><a href="{% url 'virtualization:virtualmachine_bulk_add_vminterface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Interfaces</a></li>{% endif %}
             </ul>
         </div>
     {% endif %}
diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py
index 47b7e6442..6e7a7c460 100644
--- a/netbox/virtualization/api/nested_serializers.py
+++ b/netbox/virtualization/api/nested_serializers.py
@@ -57,7 +57,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer):
 
 
 class NestedInterfaceSerializer(WritableNestedSerializer):
-    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:interface-detail')
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail')
     virtual_machine = NestedVirtualMachineSerializer(read_only=True)
 
     class Meta:
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 1ef4832a8..24e5f4e87 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -431,7 +431,7 @@ class VMInterface(BaseInterface):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('virtualization:interface', kwargs={'pk': self.pk})
+        return reverse('virtualization:vminterface', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index bc1b3332c..c307d6da6 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -221,22 +221,22 @@ class InterfaceTest(APITestCase):
         self.vlan3 = VLAN.objects.create(name="Test VLAN 3", vid=3)
 
     def test_get_interface(self):
-        url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.view_interface')
+        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
+        self.add_permissions('virtualization.view_vminterface')
 
         response = self.client.get(url, **self.header)
         self.assertEqual(response.data['name'], self.interface1.name)
 
     def test_list_interfaces(self):
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.view_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.view_vminterface')
 
         response = self.client.get(url, **self.header)
         self.assertEqual(response.data['count'], 3)
 
     def test_list_interfaces_brief(self):
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.view_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.view_vminterface')
 
         response = self.client.get('{}?brief=1'.format(url), **self.header)
         self.assertEqual(
@@ -249,8 +249,8 @@ class InterfaceTest(APITestCase):
             'virtual_machine': self.virtualmachine.pk,
             'name': 'Test Interface 4',
         }
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.add_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.add_vminterface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -267,8 +267,8 @@ class InterfaceTest(APITestCase):
             'untagged_vlan': self.vlan3.id,
             'tagged_vlans': [self.vlan1.id, self.vlan2.id],
         }
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.add_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.add_vminterface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -293,8 +293,8 @@ class InterfaceTest(APITestCase):
                 'name': 'Test Interface 6',
             },
         ]
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.add_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.add_vminterface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -327,8 +327,8 @@ class InterfaceTest(APITestCase):
                 'tagged_vlans': [self.vlan1.id],
             },
         ]
-        url = reverse('virtualization-api:interface-list')
-        self.add_permissions('virtualization.add_interface')
+        url = reverse('virtualization-api:vminterface-list')
+        self.add_permissions('virtualization.add_vminterface')
 
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
@@ -343,8 +343,8 @@ class InterfaceTest(APITestCase):
             'virtual_machine': self.virtualmachine.pk,
             'name': 'Test Interface X',
         }
-        url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.change_interface')
+        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
+        self.add_permissions('virtualization.change_vminterface')
 
         response = self.client.put(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
@@ -353,8 +353,8 @@ class InterfaceTest(APITestCase):
         self.assertEqual(interface1.name, data['name'])
 
     def test_delete_interface(self):
-        url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.delete_interface')
+        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
+        self.add_permissions('virtualization.delete_vminterface')
 
         response = self.client.delete(url, **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 4e29f861a..b4aae617b 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -51,12 +51,12 @@ urlpatterns = [
     path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
 
     # VM interfaces
-    path('interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'),
-    path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'),
-    path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'),
-    path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='interface'),
-    path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='interface_edit'),
-    path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='interface_delete'),
-    path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_interface'),
+    path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
+    path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
+    path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
+    path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
+    path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'),
+    path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='vminterface_delete'),
+    path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'),
 
 ]

From 5ad5994b9d276e24e2b3155ab51643fc922c15ef Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 15:09:32 -0400
Subject: [PATCH 199/505] Update interface view templates

---
 netbox/templates/dcim/interface.html          |  24 ++--
 .../templates/virtualization/interface.html   | 120 ------------------
 .../templates/virtualization/vminterface.html | 100 +++++++++++++++
 ...erface_edit.html => vminterface_edit.html} |   0
 netbox/virtualization/urls.py                 |   3 +-
 netbox/virtualization/views.py                |  18 +--
 6 files changed, 121 insertions(+), 144 deletions(-)
 delete mode 100644 netbox/templates/virtualization/interface.html
 create mode 100644 netbox/templates/virtualization/vminterface.html
 rename netbox/templates/virtualization/{interface_edit.html => vminterface_edit.html} (100%)

diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index b4485edae..5165169ff 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -5,29 +5,25 @@
     <div class="row noprint">
         <div class="col-md-12">
             <ol class="breadcrumb">
-                {% if interface.device %}
-                    <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
-                {% else %}
-                    <li><a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a></li>
-                {% endif %}
-                <li><a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a></li>
+                <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
+                <li><a href="{{ interface.device.get_absolute_url }}">{{ interface.device }}</a></li>
                 <li>{{ interface }}</li>
             </ol>
         </div>
     </div>
     <div class="pull-right noprint">
         {% if perms.dcim.change_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
+            <a href="{% url 'dcim:interface_edit' pk=interface.pk %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span> Edit
             </a>
         {% endif %}
         {% if perms.dcim.delete_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
+            <a href="{% url 'dcim:interface_delete' pk=interface.pk %}" class="btn btn-danger">
                 <span class="fa fa-trash" aria-hidden="true"></span> Delete
             </a>
         {% endif %}
     </div>
-    <h1>{% block title %}{{ interface.parent }} / {{ interface.name }}{% endblock %}</h1>
+    <h1>{% block title %}{{ interface.device }} / {{ interface.name }}{% endblock %}</h1>
     <ul class="nav nav-tabs">
         <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
             <a href="{{ interface.get_absolute_url }}">Interface</a>
@@ -49,9 +45,9 @@
             </div>
             <table class="table table-hover panel-body attr-table">
                 <tr>
-                    <td>{% if interface.device %}Device{% else %}Virtual Machine{% endif %}</td>
+                    <td>Device</td>
                     <td>
-                        <a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a>
+                        <a href="{{ interface.device.get_absolute_url }}">{{ interface.device }}</a>
                     </td>
                 </tr>
                 <tr>
@@ -96,7 +92,7 @@
                 </tr>
                 <tr>
                     <td>MAC Address</td>
-                    <td>{{ interface.mac_address|placeholder }}</span></td>
+                    <td><span class="text-monospace">{{ interface.mac_address|placeholder }}</span></td>
                 </tr>
                 <tr>
                     <td>802.1Q Mode</td>
@@ -118,7 +114,7 @@
                             <tr>
                                 <td>Device</td>
                                 <td>
-                                    <a href="{{ connected_interface.parent.get_absolute_url }}">{{ connected_interface.device }}</a>
+                                    <a href="{{ connected_interface.device.get_absolute_url }}">{{ connected_interface.device }}</a>
                                 </td>
                             </tr>
                             <tr>
@@ -225,7 +221,7 @@
                         {% for member in interface.member_interfaces.all %}
                             <tr>
                                 <td>
-                                    <a href="{{ member.parent.get_absolute_url }}">{{ member.parent }}</a>
+                                    <a href="{{ member.device.get_absolute_url }}">{{ member.device }}</a>
                                 </td>
                                 <td>
                                     <a href="{{ member.get_absolute_url }}">{{ member }}</a>
diff --git a/netbox/templates/virtualization/interface.html b/netbox/templates/virtualization/interface.html
deleted file mode 100644
index 8c3cb47ff..000000000
--- a/netbox/templates/virtualization/interface.html
+++ /dev/null
@@ -1,120 +0,0 @@
-{% extends 'base.html' %}
-{% load helpers %}
-
-{% block header %}
-    <div class="row noprint">
-        <div class="col-md-12">
-            <ol class="breadcrumb">
-                {% if interface.device %}
-                    <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
-                {% else %}
-                    <li><a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a></li>
-                {% endif %}
-                <li><a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a></li>
-                <li>{{ interface }}</li>
-            </ol>
-        </div>
-    </div>
-    <div class="pull-right noprint">
-        {% if perms.dcim.change_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_edit' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=interface.pk %}{% endif %}" class="btn btn-warning">
-                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
-            </a>
-        {% endif %}
-        {% if perms.dcim.delete_interface %}
-            <a href="{% if interface.device %}{% url 'dcim:interface_delete' pk=interface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=interface.pk %}{% endif %}" class="btn btn-danger">
-                <span class="fa fa-trash" aria-hidden="true"></span> Delete
-            </a>
-        {% endif %}
-    </div>
-    <h1>{% block title %}{{ interface.parent }} / {{ interface.name }}{% endblock %}</h1>
-    <ul class="nav nav-tabs">
-        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
-            <a href="{{ interface.get_absolute_url }}">Interface</a>
-        </li>
-        {% if perms.extras.view_objectchange %}
-            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
-                <a href="{% url 'dcim:interface_changelog' pk=interface.pk %}">Change Log</a>
-            </li>
-        {% endif %}
-    </ul>
-{% endblock %}
-
-{% block content %}
-<div class="row">
-	<div class="col-md-6">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Interface</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>{% if interface.device %}Device{% else %}Virtual Machine{% endif %}</td>
-                    <td>
-                        <a href="{{ interface.parent.get_absolute_url }}">{{ interface.parent }}</a>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Name</td>
-                    <td>{{ interface.name }}</td>
-                </tr>
-                <tr>
-                    <td>Label</td>
-                    <td>{{ interface.label|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Type</td>
-                    <td>{{ interface.get_type_display }}</td>
-                </tr>
-                <tr>
-                    <td>Enabled</td>
-                    <td>
-                        {% if interface.enabled %}
-                            <span class="text-success"><i class="fa fa-check"></i></span>
-                        {% else %}
-                            <span class="text-danger"><i class="fa fa-close"></i></span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>LAG</td>
-                    <td>
-                        {% if interface.lag%}
-                            <a href="{{ interface.lag.get_absolute_url }}">{{ interface.lag }}</a>
-                        {% else %}
-                            <span class="text-muted">None</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ interface.description|placeholder }} </td>
-                </tr>
-                <tr>
-                    <td>MTU</td>
-                    <td>{{ interface.mtu|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>MAC Address</td>
-                    <td>{{ interface.mac_address|placeholder }}</span></td>
-                </tr>
-                <tr>
-                    <td>802.1Q Mode</td>
-                    <td>{{ interface.get_mode_display }}</td>
-                </tr>
-            </table>
-        </div>
-        {% include 'extras/inc/tags_panel.html' with tags=interface.tags.all %}
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-        {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
-    </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
-    </div>
-</div>
-{% endblock %}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
new file mode 100644
index 000000000..2fa57f4f8
--- /dev/null
+++ b/netbox/templates/virtualization/vminterface.html
@@ -0,0 +1,100 @@
+{% extends 'base.html' %}
+{% load helpers %}
+
+{% block header %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                <li><a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a></li>
+                <li><a href="{{ vminterface.virtual_machine.get_absolute_url }}">{{ vminterface.virtual_machine }}</a></li>
+                <li>{{ vminterface }}</li>
+            </ol>
+        </div>
+    </div>
+    <div class="pull-right noprint">
+        {% if perms.virtualization.change_vminterface %}
+            <a href="{% url 'virtualization:vminterface_edit' pk=vminterface.pk %}" class="btn btn-warning">
+                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
+            </a>
+        {% endif %}
+        {% if perms.virtualization.delete_vminterface %}
+            <a href="{% url 'virtualization:vminterface_delete' pk=vminterface.pk %}" class="btn btn-danger">
+                <span class="fa fa-trash" aria-hidden="true"></span> Delete
+            </a>
+        {% endif %}
+    </div>
+    <h1>{% block title %}{{ vminterface.virtual_machine }} / {{ vminterface.name }}{% endblock %}</h1>
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ vminterface.get_absolute_url }}">Interface</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'virtualization:vminterface_changelog' pk=vminterface.pk %}">Change Log</a>
+            </li>
+        {% endif %}
+    </ul>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+	<div class="col-md-6">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Interface</strong>
+            </div>
+            <table class="table table-hover panel-body attr-table">
+                <tr>
+                    <td>Virtual Machine</td>
+                    <td>
+                        <a href="{{ vminterface.parent.get_absolute_url }}">{{ vminterface.parent }}</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>Name</td>
+                    <td>{{ vminterface.name }}</td>
+                </tr>
+                <tr>
+                    <td>Enabled</td>
+                    <td>
+                        {% if vminterface.enabled %}
+                            <span class="text-success"><i class="fa fa-check"></i></span>
+                        {% else %}
+                            <span class="text-danger"><i class="fa fa-close"></i></span>
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Description</td>
+                    <td>{{ vminterface.description|placeholder }} </td>
+                </tr>
+                <tr>
+                    <td>MTU</td>
+                    <td>{{ vminterface.mtu|placeholder }}</td>
+                </tr>
+                <tr>
+                    <td>MAC Address</td>
+                    <td><span class="text-monospace">{{ vminterface.mac_address|placeholder }}</span></td>
+                </tr>
+                <tr>
+                    <td>802.1Q Mode</td>
+                    <td>{{ vminterface.get_mode_display }}</td>
+                </tr>
+            </table>
+        </div>
+    </div>
+    <div class="col-md-6">
+        {% include 'extras/inc/tags_panel.html' with tags=vminterface.tags.all %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-12">
+        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+    </div>
+</div>
+{% endblock %}
diff --git a/netbox/templates/virtualization/interface_edit.html b/netbox/templates/virtualization/vminterface_edit.html
similarity index 100%
rename from netbox/templates/virtualization/interface_edit.html
rename to netbox/templates/virtualization/vminterface_edit.html
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index b4aae617b..5f28eb1df 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -3,7 +3,7 @@ from django.urls import path
 from extras.views import ObjectChangeLogView
 from ipam.views import ServiceEditView
 from . import views
-from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine
+from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 app_name = 'virtualization'
 urlpatterns = [
@@ -57,6 +57,7 @@ urlpatterns = [
     path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
     path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'),
     path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='vminterface_delete'),
+    path('interfaces/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='vminterface_changelog', kwargs={'model': VMInterface}),
     path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'),
 
 ]
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index bb2d8b9bf..e02103bc0 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -302,30 +302,30 @@ class InterfaceView(ObjectView):
 
     def get(self, request, pk):
 
-        interface = get_object_or_404(self.queryset, pk=pk)
+        vminterface = get_object_or_404(self.queryset, pk=pk)
 
         # Get assigned IP addresses
         ipaddress_table = InterfaceIPAddressTable(
-            data=interface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
+            data=vminterface.ip_addresses.restrict(request.user, 'view').prefetch_related('vrf', 'tenant'),
             orderable=False
         )
 
         # Get assigned VLANs and annotate whether each is tagged or untagged
         vlans = []
-        if interface.untagged_vlan is not None:
-            vlans.append(interface.untagged_vlan)
+        if vminterface.untagged_vlan is not None:
+            vlans.append(vminterface.untagged_vlan)
             vlans[0].tagged = False
-        for vlan in interface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
+        for vlan in vminterface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
             vlan.tagged = True
             vlans.append(vlan)
         vlan_table = InterfaceVLANTable(
-            interface=interface,
+            interface=vminterface,
             data=vlans,
             orderable=False
         )
 
-        return render(request, 'virtualization/interface.html', {
-            'interface': interface,
+        return render(request, 'virtualization/vminterface.html', {
+            'vminterface': vminterface,
             'ipaddress_table': ipaddress_table,
             'vlan_table': vlan_table,
         })
@@ -342,7 +342,7 @@ class InterfaceCreateView(ComponentCreateView):
 class InterfaceEditView(ObjectEditView):
     queryset = VMInterface.objects.all()
     model_form = forms.InterfaceForm
-    template_name = 'virtualization/interface_edit.html'
+    template_name = 'virtualization/vminterface_edit.html'
 
 
 class InterfaceDeleteView(ObjectDeleteView):

From a1b816b4038d199485da811676cd9a71395a090f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 15:31:53 -0400
Subject: [PATCH 200/505] Remove 'parent' attribute from VMinterface

---
 netbox/templates/virtualization/vminterface.html | 2 +-
 netbox/virtualization/models.py                  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 2fa57f4f8..8d46b52fd 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -47,7 +47,7 @@
                 <tr>
                     <td>Virtual Machine</td>
                     <td>
-                        <a href="{{ vminterface.parent.get_absolute_url }}">{{ vminterface.parent }}</a>
+                        <a href="{{ vminterface.virtual_machine.get_absolute_url }}">{{ vminterface.virtual_machine }}</a>
                     </td>
                 </tr>
                 <tr>
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 24e5f4e87..31ffd1ceb 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -447,7 +447,7 @@ class VMInterface(BaseInterface):
     def clean(self):
 
         # Validate untagged VLAN
-        if self.untagged_vlan and self.untagged_vlan.site not in [self.parent.site, None]:
+        if self.untagged_vlan and self.untagged_vlan.site not in [self.virtual_machine.site, None]:
             raise ValidationError({
                 'untagged_vlan': "The untagged VLAN ({}) must belong to the same site as the interface's parent "
                                  "virtual machine, or it must be global".format(self.untagged_vlan)
@@ -475,10 +475,6 @@ class VMInterface(BaseInterface):
             object_data=serialize_object(self)
         )
 
-    @property
-    def parent(self):
-        return self.virtual_machine
-
     @property
     def count_ipaddresses(self):
         return self.ip_addresses.count()

From 548127cc88ca7a7bca7521644bf4c0bbea782f5c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 15:46:20 -0400
Subject: [PATCH 201/505] Rename VMInterface serializers

---
 netbox/utilities/custom_inspectors.py           | 6 ------
 netbox/virtualization/api/nested_serializers.py | 4 ++--
 netbox/virtualization/api/serializers.py        | 2 +-
 netbox/virtualization/api/views.py              | 9 +--------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/netbox/utilities/custom_inspectors.py b/netbox/utilities/custom_inspectors.py
index 14463de23..38297838d 100644
--- a/netbox/utilities/custom_inspectors.py
+++ b/netbox/utilities/custom_inspectors.py
@@ -5,14 +5,8 @@ from drf_yasg.utils import get_serializer_ref_name
 from rest_framework.fields import ChoiceField
 from rest_framework.relations import ManyRelatedField
 
-from dcim.api.serializers import InterfaceSerializer as DeviceInterfaceSerializer
 from extras.api.customfields import CustomFieldsSerializer
 from utilities.api import ChoiceField, SerializedPKRelatedField, WritableNestedSerializer
-from virtualization.api.serializers import InterfaceSerializer as VirtualMachineInterfaceSerializer
-
-# this might be ugly, but it limits drf_yasg-specific code to this file
-DeviceInterfaceSerializer.Meta.ref_name = 'DeviceInterface'
-VirtualMachineInterfaceSerializer.Meta.ref_name = 'VirtualMachineInterface'
 
 
 class NetBoxSwaggerAutoSchema(SwaggerAutoSchema):
diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py
index 6e7a7c460..de56e6e6a 100644
--- a/netbox/virtualization/api/nested_serializers.py
+++ b/netbox/virtualization/api/nested_serializers.py
@@ -8,7 +8,7 @@ __all__ = [
     'NestedClusterGroupSerializer',
     'NestedClusterSerializer',
     'NestedClusterTypeSerializer',
-    'NestedInterfaceSerializer',
+    'NestedVMInterfaceSerializer',
     'NestedVirtualMachineSerializer',
 ]
 
@@ -56,7 +56,7 @@ class NestedVirtualMachineSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'name']
 
 
-class NestedInterfaceSerializer(WritableNestedSerializer):
+class NestedVMInterfaceSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail')
     virtual_machine = NestedVirtualMachineSerializer(read_only=True)
 
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index d2a13ce7d..5698791f8 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -94,7 +94,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 # VM interfaces
 #
 
-class InterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+class VMInterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     virtual_machine = NestedVirtualMachineSerializer()
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 8d16e08e1..3a720e56f 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -77,12 +77,5 @@ class InterfaceViewSet(ModelViewSet):
     ).prefetch_related(
         'virtual_machine', 'tags'
     )
-    serializer_class = serializers.InterfaceSerializer
+    serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.InterfaceFilterSet
-
-    def get_serializer_class(self):
-        request = self.get_serializer_context()['request']
-        if request.query_params.get('brief', False):
-            # Override get_serializer_for_model(), which will return the DCIM NestedInterfaceSerializer
-            return serializers.NestedInterfaceSerializer
-        return serializers.InterfaceSerializer

From 459e485555d350b1c08ea2dfa4b50f2c0e304a9e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 16:09:31 -0400
Subject: [PATCH 202/505] Restore interface assignment for IPAddress CSV import

---
 netbox/ipam/forms.py | 74 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 3ffbc2d4f..db9cc512e 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.core.validators import MaxValueValidator, MinValueValidator
 
-from dcim.models import Device, Rack, Region, Site
+from dcim.models import Device, Interface, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
 )
@@ -14,7 +14,7 @@ from utilities.forms import (
     ExpandableIPAddressField, ReturnURLForm, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
     BOOLEAN_WITH_BLANK_CHOICES,
 )
-from virtualization.models import VirtualMachine
+from virtualization.models import VirtualMachine, VMInterface
 from .choices import *
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -729,24 +729,24 @@ class IPAddressCSVForm(CustomFieldModelCSVForm):
         required=False,
         help_text='Functional role'
     )
-    # device = CSVModelChoiceField(
-    #     queryset=Device.objects.all(),
-    #     required=False,
-    #     to_field_name='name',
-    #     help_text='Parent device of assigned interface (if any)'
-    # )
-    # virtual_machine = CSVModelChoiceField(
-    #     queryset=VirtualMachine.objects.all(),
-    #     required=False,
-    #     to_field_name='name',
-    #     help_text='Parent VM of assigned interface (if any)'
-    # )
-    # interface = CSVModelChoiceField(
-    #     queryset=Interface.objects.all(),
-    #     required=False,
-    #     to_field_name='name',
-    #     help_text='Assigned interface'
-    # )
+    device = CSVModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+        to_field_name='name',
+        help_text='Parent device of assigned interface (if any)'
+    )
+    virtual_machine = CSVModelChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        required=False,
+        to_field_name='name',
+        help_text='Parent VM of assigned interface (if any)'
+    )
+    interface = CSVModelChoiceField(
+        queryset=Interface.objects.none(),  # Can also refer to VMInterface
+        required=False,
+        to_field_name='name',
+        help_text='Assigned interface'
+    )
     is_primary = forms.BooleanField(
         help_text='Make this the primary IP for the assigned device',
         required=False
@@ -759,23 +759,19 @@ class IPAddressCSVForm(CustomFieldModelCSVForm):
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(data, *args, **kwargs)
 
-        # if data:
-        #
-        #     # Limit interface queryset by assigned device or virtual machine
-        #     if data.get('device'):
-        #         params = {
-        #             f"device__{self.fields['device'].to_field_name}": data.get('device')
-        #         }
-        #     elif data.get('virtual_machine'):
-        #         params = {
-        #             f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data.get('virtual_machine')
-        #         }
-        #     else:
-        #         params = {
-        #             'device': None,
-        #             'virtual_machine': None,
-        #         }
-        #     self.fields['interface'].queryset = self.fields['interface'].queryset.filter(**params)
+        if data:
+
+            # Limit interface queryset by assigned device
+            if data.get('device'):
+                self.fields['interface'].queryset = Interface.objects.filter(
+                    **{f"device__{self.fields['device'].to_field_name}": data['device']}
+                )
+
+            # Limit interface queryset by assigned device
+            elif data.get('virtual_machine'):
+                self.fields['interface'].queryset = VMInterface.objects.filter(
+                    **{f"virtual_machine__{self.fields['virtual_machine'].to_field_name}": data['virtual_machine']}
+                )
 
     def clean(self):
         super().clean()
@@ -790,6 +786,10 @@ class IPAddressCSVForm(CustomFieldModelCSVForm):
 
     def save(self, *args, **kwargs):
 
+        # Set interface assignment
+        if self.cleaned_data['interface']:
+            self.instance.assigned_object = self.cleaned_data['interface']
+
         ipaddress = super().save(*args, **kwargs)
 
         # Set as primary for device/VM

From e3820e93b7c3def8483a83649a0c2ab7c5f97e8f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 16:39:43 -0400
Subject: [PATCH 203/505] Misc cleanup, renaming

---
 netbox/dcim/models/device_components.py       |  6 +-
 netbox/ipam/constants.py                      |  2 +-
 netbox/ipam/filters.py                        |  1 +
 netbox/ipam/forms.py                          |  1 +
 .../migrations/0037_ipaddress_assignment.py   |  2 +-
 netbox/ipam/models.py                         | 10 ++-
 netbox/ipam/tables.py                         | 14 +---
 netbox/ipam/views.py                          | 76 +++++++++----------
 netbox/utilities/filters.py                   |  4 -
 netbox/virtualization/api/views.py            |  2 +-
 netbox/virtualization/filters.py              |  4 +-
 netbox/virtualization/forms.py                | 10 +--
 netbox/virtualization/models.py               |  4 +
 netbox/virtualization/tables.py               |  2 +-
 netbox/virtualization/tests/test_api.py       |  2 +-
 netbox/virtualization/tests/test_filters.py   |  2 +-
 netbox/virtualization/tests/test_views.py     | 10 +--
 netbox/virtualization/views.py                | 22 +++---
 18 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index fdbeeade8..30a276c7d 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -622,8 +622,7 @@ class BaseInterface(models.Model):
 @extras_features('graphs', 'export_templates', 'webhooks')
 class Interface(CableTermination, ComponentModel, BaseInterface):
     """
-    A network interface within a Device. A physical Interface can connect to exactly one other
-    Interface.
+    A network interface within a Device. A physical Interface can connect to exactly one other Interface.
     """
     device = models.ForeignKey(
         to='Device',
@@ -695,8 +694,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
     tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
-        'device', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only',
-        'description', 'mode',
+        'device', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode',
     ]
 
     class Meta:
diff --git a/netbox/ipam/constants.py b/netbox/ipam/constants.py
index 0a3c67f32..1ad355aec 100644
--- a/netbox/ipam/constants.py
+++ b/netbox/ipam/constants.py
@@ -33,7 +33,7 @@ PREFIX_LENGTH_MAX = 127  # IPv6
 
 IPADDRESS_ASSIGNMENT_MODELS = Q(
     Q(app_label='dcim', model='interface') |
-    Q(app_label='virtualization', model='interface')
+    Q(app_label='virtualization', model='vminterface')
 )
 
 IPADDRESS_MASK_LENGTH_MIN = 1
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index c9012cd3a..0876a0d1a 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -319,6 +319,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         field_name='pk',
         label='Virtual machine (ID)',
     )
+    # TODO: Restore filtering by assigned interface
     # interface = django_filters.ModelMultipleChoiceFilter(
     #     field_name='interface__name',
     #     queryset=Interface.objects.unrestricted(),
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index db9cc512e..ecb2d7c1e 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -522,6 +522,7 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
 #
 
 class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModelForm):
+    # TODO: Restore ability to select assigned object when editing IPAddress
     # interface = forms.ModelChoiceField(
     #     queryset=Interface.objects.all(),
     #     required=False
diff --git a/netbox/ipam/migrations/0037_ipaddress_assignment.py b/netbox/ipam/migrations/0037_ipaddress_assignment.py
index 607f832a5..6139d41d6 100644
--- a/netbox/ipam/migrations/0037_ipaddress_assignment.py
+++ b/netbox/ipam/migrations/0037_ipaddress_assignment.py
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='ipaddress',
             name='assigned_object_type',
-            field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'interface')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType', blank=True, null=True),
+            field=models.ForeignKey(blank=True, limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.ContentType'),
             preserve_default=False,
         ),
         migrations.RunPython(
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index c7baba435..d2df6261f 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -753,6 +753,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         super().save(*args, **kwargs)
 
     def to_objectchange(self, action):
+        # Annotate the assigned object, if any
         return ObjectChange(
             changed_object=self,
             object_repr=str(self),
@@ -764,12 +765,15 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
     def to_csv(self):
 
         # Determine if this IP is primary for a Device
+        is_primary = False
         if self.address.version == 4 and getattr(self, 'primary_ip4_for', False):
             is_primary = True
         elif self.address.version == 6 and getattr(self, 'primary_ip6_for', False):
             is_primary = True
-        else:
-            is_primary = False
+
+        obj_type = None
+        if self.assigned_object_type:
+            obj_type = f'{self.assigned_object_type.app_label}.{self.assigned_object_type.model}'
 
         return (
             self.address,
@@ -777,7 +781,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
             self.tenant.name if self.tenant else None,
             self.get_status_display(),
             self.get_role_display(),
-            '{}.{}'.format(self.assigned_object_type.app_label, self.assigned_object_type.model) if self.assigned_object_type else None,
+            obj_type,
             self.assigned_object_id,
             is_primary,
             self.dns_name,
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 064b8d7ce..f1855327b 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -92,14 +92,6 @@ IPADDRESS_ASSIGN_LINK = """
 {% endif %}
 """
 
-IPADDRESS_PARENT = """
-{% if record.interface %}
-    <a href="{{ record.interface.parent.get_absolute_url }}">{{ record.interface.parent }}</a>
-{% else %}
-    &mdash;
-{% endif %}
-"""
-
 VRF_LINK = """
 {% if record.vrf %}
     <a href="{{ record.vrf.get_absolute_url }}">{{ record.vrf }}</a>
@@ -477,17 +469,13 @@ class IPAddressAssignTable(BaseTable):
     status = tables.TemplateColumn(
         template_code=STATUS_LABEL
     )
-    parent = tables.TemplateColumn(
-        template_code=IPADDRESS_PARENT,
-        orderable=False
-    )
     assigned_object = tables.Column(
         orderable=False
     )
 
     class Meta(BaseTable.Meta):
         model = IPAddress
-        fields = ('address', 'dns_name', 'vrf', 'status', 'role', 'tenant', 'parent', 'assigned_object', 'description')
+        fields = ('address', 'dns_name', 'vrf', 'status', 'role', 'tenant', 'assigned_object', 'description')
         orderable = False
 
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index bb8de1f73..bcbe00923 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -607,47 +607,47 @@ class IPAddressView(ObjectView):
 
         ipaddress = get_object_or_404(self.queryset, pk=pk)
 
-        # # Parent prefixes table
-        # parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
-        #     vrf=ipaddress.vrf, prefix__net_contains=str(ipaddress.address.ip)
-        # ).prefetch_related(
-        #     'site', 'role'
-        # )
-        # parent_prefixes_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
-        # parent_prefixes_table.exclude = ('vrf',)
-        #
-        # # Duplicate IPs table
-        # duplicate_ips = IPAddress.objects.restrict(request.user, 'view').filter(
-        #     vrf=ipaddress.vrf, address=str(ipaddress.address)
-        # ).exclude(
-        #     pk=ipaddress.pk
-        # ).prefetch_related(
-        #     'nat_inside'
-        # )
-        # # Exclude anycast IPs if this IP is anycast
-        # if ipaddress.role == IPAddressRoleChoices.ROLE_ANYCAST:
-        #     duplicate_ips = duplicate_ips.exclude(role=IPAddressRoleChoices.ROLE_ANYCAST)
-        # duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
-        #
-        # # Related IP table
-        # related_ips = IPAddress.objects.restrict(request.user, 'view').exclude(
-        #     address=str(ipaddress.address)
-        # ).filter(
-        #     vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)
-        # )
-        # related_ips_table = tables.IPAddressTable(related_ips, orderable=False)
-        #
-        # paginate = {
-        #     'paginator_class': EnhancedPaginator,
-        #     'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
-        # }
-        # RequestConfig(request, paginate).configure(related_ips_table)
+        # Parent prefixes table
+        parent_prefixes = Prefix.objects.restrict(request.user, 'view').filter(
+            vrf=ipaddress.vrf, prefix__net_contains=str(ipaddress.address.ip)
+        ).prefetch_related(
+            'site', 'role'
+        )
+        parent_prefixes_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
+        parent_prefixes_table.exclude = ('vrf',)
+
+        # Duplicate IPs table
+        duplicate_ips = IPAddress.objects.restrict(request.user, 'view').filter(
+            vrf=ipaddress.vrf, address=str(ipaddress.address)
+        ).exclude(
+            pk=ipaddress.pk
+        ).prefetch_related(
+            'nat_inside'
+        )
+        # Exclude anycast IPs if this IP is anycast
+        if ipaddress.role == IPAddressRoleChoices.ROLE_ANYCAST:
+            duplicate_ips = duplicate_ips.exclude(role=IPAddressRoleChoices.ROLE_ANYCAST)
+        duplicate_ips_table = tables.IPAddressTable(list(duplicate_ips), orderable=False)
+
+        # Related IP table
+        related_ips = IPAddress.objects.restrict(request.user, 'view').exclude(
+            address=str(ipaddress.address)
+        ).filter(
+            vrf=ipaddress.vrf, address__net_contained_or_equal=str(ipaddress.address)
+        )
+        related_ips_table = tables.IPAddressTable(related_ips, orderable=False)
+
+        paginate = {
+            'paginator_class': EnhancedPaginator,
+            'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
+        }
+        RequestConfig(request, paginate).configure(related_ips_table)
 
         return render(request, 'ipam/ipaddress.html', {
             'ipaddress': ipaddress,
-            # 'parent_prefixes_table': parent_prefixes_table,
-            # 'duplicate_ips_table': duplicate_ips_table,
-            # 'related_ips_table': related_ips_table,
+            'parent_prefixes_table': parent_prefixes_table,
+            'duplicate_ips_table': duplicate_ips_table,
+            'related_ips_table': related_ips_table,
         })
 
 
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index 2b49dd99e..f628ca917 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -256,10 +256,6 @@ class BaseFilterSet(django_filters.FilterSet):
                 except django_filters.exceptions.FieldLookupError:
                     # The filter could not be created because the lookup expression is not supported on the field
                     continue
-                except Exception as e:
-                    print(existing_filter_name, existing_filter)
-                    print(f'field: {field}, lookup_expr: {lookup_expr}')
-                    raise e
 
                 if lookup_name.startswith('n'):
                     # This is a negation filter which requires a queryset.exclude() clause
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 3a720e56f..d5fff805b 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -78,4 +78,4 @@ class InterfaceViewSet(ModelViewSet):
         'virtual_machine', 'tags'
     )
     serializer_class = serializers.VMInterfaceSerializer
-    filterset_class = filters.InterfaceFilterSet
+    filterset_class = filters.VMInterfaceFilterSet
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 50bde1b3f..33ca44a22 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -15,8 +15,8 @@ __all__ = (
     'ClusterFilterSet',
     'ClusterGroupFilterSet',
     'ClusterTypeFilterSet',
-    'InterfaceFilterSet',
     'VirtualMachineFilterSet',
+    'VMInterfaceFilterSet',
 )
 
 
@@ -201,7 +201,7 @@ class VirtualMachineFilterSet(
         )
 
 
-class InterfaceFilterSet(BaseFilterSet):
+class VMInterfaceFilterSet(BaseFilterSet):
     q = django_filters.CharFilter(
         method='search',
         label='Search',
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index ec4b28f04..1a304931c 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -571,7 +571,7 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
 # VM interfaces
 #
 
-class InterfaceForm(BootstrapMixin, forms.ModelForm):
+class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
@@ -643,7 +643,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
             self.cleaned_data['tagged_vlans'] = []
 
 
-class InterfaceCreateForm(BootstrapMixin, forms.Form):
+class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
     virtual_machine = forms.ModelChoiceField(
         queryset=VirtualMachine.objects.all(),
         widget=forms.HiddenInput()
@@ -715,7 +715,7 @@ class InterfaceCreateForm(BootstrapMixin, forms.Form):
             self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
 
-class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
+class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=VMInterface.objects.all(),
         widget=forms.MultipleHiddenInput()
@@ -785,7 +785,7 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
                 self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
 
-class InterfaceFilterForm(forms.Form):
+class VMInterfaceFilterForm(forms.Form):
     model = VMInterface
     enabled = forms.NullBooleanField(
         required=False,
@@ -815,7 +815,7 @@ class VirtualMachineBulkAddComponentForm(BootstrapMixin, forms.Form):
         return ','.join(self.cleaned_data.get('tags'))
 
 
-class InterfaceBulkCreateForm(
+class VMInterfaceBulkCreateForm(
     form_from_model(VMInterface, ['enabled', 'mtu', 'description', 'tags']),
     VirtualMachineBulkAddComponentForm
 ):
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 31ffd1ceb..bed198326 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -475,6 +475,10 @@ class VMInterface(BaseInterface):
             object_data=serialize_object(self)
         )
 
+    @property
+    def parent(self):
+        return self.virtual_machine
+
     @property
     def count_ipaddresses(self):
         return self.ip_addresses.count()
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index e06714e85..fd6395220 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -172,7 +172,7 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 # VM components
 #
 
-class InterfaceTable(BaseTable):
+class VMInterfaceTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = VMInterface
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index c307d6da6..8d525f4fe 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -194,7 +194,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
 
 
 # TODO: Standardize InterfaceTest (pending #4721)
-class InterfaceTest(APITestCase):
+class VMInterfaceTest(APITestCase):
 
     def setUp(self):
 
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index 9fe6b61d5..821127b92 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -367,7 +367,7 @@ class VirtualMachineTestCase(TestCase):
 
 class InterfaceTestCase(TestCase):
     queryset = VMInterface.objects.all()
-    filterset = InterfaceFilterSet
+    filterset = VMInterfaceFilterSet
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 2a8cc8ca8..772603ea1 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -191,11 +191,11 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
 # TODO: Update base class to DeviceComponentViewTestCase
 # Blocked by #4721
-class InterfaceTestCase(
+class VMInterfaceTestCase(
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
-    # ViewTestCases.BulkCreateObjectsViewTestCase,
+    ViewTestCases.BulkCreateObjectsViewTestCase,
     ViewTestCases.BulkEditObjectsViewTestCase,
     ViewTestCases.BulkDeleteObjectsViewTestCase,
 ):
@@ -234,7 +234,6 @@ class InterfaceTestCase(
             'virtual_machine': virtualmachines[1].pk,
             'name': 'Interface X',
             'enabled': False,
-            'mgmt_only': False,
             'mac_address': EUI('01-02-03-04-05-06'),
             'mtu': 2000,
             'description': 'New description',
@@ -248,7 +247,6 @@ class InterfaceTestCase(
             'virtual_machine': virtualmachines[1].pk,
             'name_pattern': 'Interface [4-6]',
             'enabled': False,
-            'mgmt_only': False,
             'mac_address': EUI('01-02-03-04-05-06'),
             'mtu': 2000,
             'description': 'New description',
@@ -264,6 +262,6 @@ class InterfaceTestCase(
             'mtu': 2000,
             'description': 'New description',
             'mode': InterfaceModeChoices.MODE_TAGGED,
-            # 'untagged_vlan': vlans[0].pk,
-            # 'tagged_vlans': [v.pk for v in vlans[1:4]],
+            'untagged_vlan': vlans[0].pk,
+            'tagged_vlans': [v.pk for v in vlans[1:4]],
         }
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index e02103bc0..1fff399ed 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -291,9 +291,9 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 
 class InterfaceListView(ObjectListView):
     queryset = VMInterface.objects.prefetch_related('virtual_machine', 'virtual_machine__tenant', 'cable')
-    filterset = filters.InterfaceFilterSet
-    filterset_form = forms.InterfaceFilterForm
-    table = tables.InterfaceTable
+    filterset = filters.VMInterfaceFilterSet
+    filterset_form = forms.VMInterfaceFilterForm
+    table = tables.VMInterfaceTable
     action_buttons = ('import', 'export')
 
 
@@ -334,14 +334,14 @@ class InterfaceView(ObjectView):
 # TODO: This should not use ComponentCreateView
 class InterfaceCreateView(ComponentCreateView):
     queryset = VMInterface.objects.all()
-    form = forms.InterfaceCreateForm
-    model_form = forms.InterfaceForm
+    form = forms.VMInterfaceCreateForm
+    model_form = forms.VMInterfaceForm
     template_name = 'virtualization/virtualmachine_component_add.html'
 
 
 class InterfaceEditView(ObjectEditView):
     queryset = VMInterface.objects.all()
-    model_form = forms.InterfaceForm
+    model_form = forms.VMInterfaceForm
     template_name = 'virtualization/vminterface_edit.html'
 
 
@@ -351,13 +351,13 @@ class InterfaceDeleteView(ObjectDeleteView):
 
 class InterfaceBulkEditView(BulkEditView):
     queryset = VMInterface.objects.all()
-    table = tables.InterfaceTable
-    form = forms.InterfaceBulkEditForm
+    table = tables.VMInterfaceTable
+    form = forms.VMInterfaceBulkEditForm
 
 
 class InterfaceBulkDeleteView(BulkDeleteView):
     queryset = VMInterface.objects.all()
-    table = tables.InterfaceTable
+    table = tables.VMInterfaceTable
 
 
 #
@@ -367,9 +367,9 @@ class InterfaceBulkDeleteView(BulkDeleteView):
 class VirtualMachineBulkAddInterfaceView(BulkComponentCreateView):
     parent_model = VirtualMachine
     parent_field = 'virtual_machine'
-    form = forms.InterfaceBulkCreateForm
+    form = forms.VMInterfaceBulkCreateForm
     queryset = VMInterface.objects.all()
-    model_form = forms.InterfaceForm
+    model_form = forms.VMInterfaceForm
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
     default_return_url = 'virtualization:virtualmachine_list'

From fce19a363d23ecd48e6b2afb999df50c2c3713c2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 16:52:05 -0400
Subject: [PATCH 204/505] Add VMInterface list view

---
 netbox/templates/inc/nav_menu.html        | 3 +++
 netbox/virtualization/tables.py           | 6 +++++-
 netbox/virtualization/tests/test_views.py | 1 +
 netbox/virtualization/urls.py             | 1 +
 netbox/virtualization/views.py            | 4 ++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index db8442821..65d7baa67 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -372,6 +372,9 @@
                             {% endif %}
                             <a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a>
                         </li>
+                        <li{% if not perms.virtualization.view_vminterface%} class="disabled"{% endif %}>
+                            <a href="{% url 'virtualization:vminterface_list' %}">Interfaces</a>
+                        </li>
                         <li class="divider"></li>
                         <li class="dropdown-header">Clusters</li>
                         <li{% if not perms.virtualization.view_cluster %} class="disabled"{% endif %}>
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index fd6395220..de319361c 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -173,7 +173,11 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 #
 
 class VMInterfaceTable(BaseTable):
+    virtual_machine = tables.LinkColumn()
+    name = tables.Column(
+        linkify=True
+    )
 
     class Meta(BaseTable.Meta):
         model = VMInterface
-        fields = ('name', 'enabled', 'description')
+        fields = ('virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description')
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 772603ea1..a7db2477f 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -192,6 +192,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 # TODO: Update base class to DeviceComponentViewTestCase
 # Blocked by #4721
 class VMInterfaceTestCase(
+    ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.GetObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 5f28eb1df..f55a0b1ed 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -51,6 +51,7 @@ urlpatterns = [
     path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
 
     # VM interfaces
+    path('interfaces/', views.InterfaceListView.as_view(), name='vminterface_list'),
     path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
     path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
     path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 1fff399ed..d1d1e6145 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -290,11 +290,11 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 #
 
 class InterfaceListView(ObjectListView):
-    queryset = VMInterface.objects.prefetch_related('virtual_machine', 'virtual_machine__tenant', 'cable')
+    queryset = VMInterface.objects.prefetch_related('virtual_machine')
     filterset = filters.VMInterfaceFilterSet
     filterset_form = forms.VMInterfaceFilterForm
     table = tables.VMInterfaceTable
-    action_buttons = ('import', 'export')
+    action_buttons = ('export',)
 
 
 class InterfaceView(ObjectView):

From 603c8045352c2634026ec538df7c6c543f40aedc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 17:01:57 -0400
Subject: [PATCH 205/505] Add VMInterface CSV import view

---
 netbox/dcim/forms.py                      |  6 ------
 netbox/dcim/tables.py                     |  8 +-------
 netbox/templates/inc/nav_menu.html        |  5 +++++
 netbox/virtualization/forms.py            | 23 +++++++++++++++++++++++
 netbox/virtualization/tests/test_views.py | 16 ++++++++--------
 netbox/virtualization/urls.py             |  1 +
 netbox/virtualization/views.py            |  7 +++++++
 7 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index c8d445c1c..4d8fc9d81 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2963,12 +2963,6 @@ class InterfaceBulkDisconnectForm(ConfirmationForm):
 class InterfaceCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
-        required=False,
-        to_field_name='name'
-    )
-    virtual_machine = CSVModelChoiceField(
-        queryset=VirtualMachine.objects.all(),
-        required=False,
         to_field_name='name'
     )
     lag = CSVModelChoiceField(
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 189f98923..82b2414ad 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -598,17 +598,11 @@ class InterfaceImportTable(BaseTable):
         viewname='dcim:device',
         args=[Accessor('device.pk')]
     )
-    virtual_machine = tables.LinkColumn(
-        viewname='virtualization:virtualmachine',
-        args=[Accessor('virtual_machine.pk')],
-        verbose_name='Virtual Machine'
-    )
 
     class Meta(BaseTable.Meta):
         model = Interface
         fields = (
-            'device', 'virtual_machine', 'name', 'description', 'lag', 'type', 'enabled', 'mac_address', 'mtu',
-            'mgmt_only', 'mode',
+            'device', 'name', 'description', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'mode',
         )
         empty_text = False
 
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 65d7baa67..4704ef613 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -373,6 +373,11 @@
                             <a href="{% url 'virtualization:virtualmachine_list' %}">Virtual Machines</a>
                         </li>
                         <li{% if not perms.virtualization.view_vminterface%} class="disabled"{% endif %}>
+                            {% if perms.virtualization.add_vminterface %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'virtualization:vminterface_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
                             <a href="{% url 'virtualization:vminterface_list' %}">Interfaces</a>
                         </li>
                         <li class="divider"></li>
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 1a304931c..b2cb25e94 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -715,6 +715,29 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
             self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
 
+class VMInterfaceCSVForm(CSVModelForm):
+    virtual_machine = CSVModelChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        to_field_name='name'
+    )
+    mode = CSVChoiceField(
+        choices=InterfaceModeChoices,
+        required=False,
+        help_text='IEEE 802.1Q operational mode (for L2 interfaces)'
+    )
+
+    class Meta:
+        model = VMInterface
+        fields = VMInterface.csv_headers
+
+    def clean_enabled(self):
+        # Make sure enabled is True when it's not included in the uploaded data
+        if 'enabled' not in self.data:
+            return True
+        else:
+            return self.cleaned_data['enabled']
+
+
 class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=VMInterface.objects.all(),
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index a7db2477f..408558779 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -189,16 +189,9 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-# TODO: Update base class to DeviceComponentViewTestCase
-# Blocked by #4721
 class VMInterfaceTestCase(
-    ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.BulkCreateObjectsViewTestCase,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase,
+    ViewTestCases.DeviceComponentViewTestCase,
 ):
     model = VMInterface
 
@@ -257,6 +250,13 @@ class VMInterfaceTestCase(
             'tags': [t.pk for t in tags],
         }
 
+        cls.csv_data = (
+            "virtual_machine,name",
+            "Virtual Machine 2,Interface 4",
+            "Virtual Machine 2,Interface 5",
+            "Virtual Machine 2,Interface 6",
+        )
+
         cls.bulk_edit_data = {
             'virtual_machine': virtualmachines[1].pk,
             'enabled': False,
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index f55a0b1ed..04e11682e 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -53,6 +53,7 @@ urlpatterns = [
     # VM interfaces
     path('interfaces/', views.InterfaceListView.as_view(), name='vminterface_list'),
     path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
+    path('interfaces/import/', views.InterfaceBulkImportView.as_view(), name='vminterface_import'),
     path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
     path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
     path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index d1d1e6145..3d1c9901d 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -349,6 +349,13 @@ class InterfaceDeleteView(ObjectDeleteView):
     queryset = VMInterface.objects.all()
 
 
+class InterfaceBulkImportView(BulkImportView):
+    queryset = VMInterface.objects.all()
+    model_form = forms.VMInterfaceCSVForm
+    table = tables.VMInterfaceTable
+    default_return_url = 'virtualization:vminterface_list'
+
+
 class InterfaceBulkEditView(BulkEditView):
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable

From afda46d587a05eb53fe5cba81386eccd38bf9007 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 23 Jun 2020 17:28:34 -0400
Subject: [PATCH 206/505] Fix VMInterface bulk creation

---
 .../virtualmachine_component_add.html         |  6 -----
 netbox/virtualization/forms.py                | 22 ++++++++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/netbox/templates/virtualization/virtualmachine_component_add.html b/netbox/templates/virtualization/virtualmachine_component_add.html
index 34a8f3c3d..aafefffa1 100644
--- a/netbox/templates/virtualization/virtualmachine_component_add.html
+++ b/netbox/templates/virtualization/virtualmachine_component_add.html
@@ -22,12 +22,6 @@
                     <strong>{{ component_type|bettertitle }}</strong>
                 </div>
                 <div class="panel-body">
-                    <div class="form-group">
-                        <label class="col-md-3 control-label required">Virtual Machine</label>
-                        <div class="col-md-9">
-                            <p class="form-control-static">{{ parent }}</p>
-                        </div>
-                    </div>
                     {% render_form form %}
                 </div>
             </div>
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index b2cb25e94..ab0e10f04 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -3,7 +3,7 @@ from django.core.exceptions import ValidationError
 
 from dcim.choices import InterfaceModeChoices
 from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN
-from dcim.forms import INTERFACE_MODE_HELP_TEXT
+from dcim.forms import INTERFACE_MODE_HELP_TEXT, InterfaceCommonForm
 from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
@@ -619,10 +619,13 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        virtual_machine = VirtualMachine.objects.get(
+            pk=self.initial.get('virtual_machine') or self.data.get('virtual_machine')
+        )
+
         # Add current site to VLANs query params
-        site = self.instance.virtual_machine.site
-        if site is not None:
-            # Add current site to VLANs query params
+        site = virtual_machine.site
+        if site:
             self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
             self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
@@ -644,9 +647,8 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
 
 
 class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
-    virtual_machine = forms.ModelChoiceField(
-        queryset=VirtualMachine.objects.all(),
-        widget=forms.HiddenInput()
+    virtual_machine = DynamicModelChoiceField(
+        queryset=VirtualMachine.objects.all()
     )
     name_pattern = ExpandableNameField(
         label='Name'
@@ -708,9 +710,9 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
             pk=self.initial.get('virtual_machine') or self.data.get('virtual_machine')
         )
 
-        site = getattr(virtual_machine.cluster, 'site', None)
-        if site is not None:
-            # Add current site to VLANs query params
+        # Add current site to VLANs query params
+        site = virtual_machine.site
+        if site:
             self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
             self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 

From d6386f739e730ddac1b2106ad51f8e6bfde700f1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 09:22:35 -0400
Subject: [PATCH 207/505] Restore interface filtering for IPAddresses

---
 netbox/ipam/filters.py            | 37 ++++++++++++++++++++-----------
 netbox/ipam/tests/test_filters.py | 30 +++++++++++++++----------
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 0876a0d1a..d6561ceb7 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -11,7 +11,7 @@ from utilities.filters import (
     BaseFilterSet, MultiValueCharFilter, MultiValueNumberFilter, NameSlugSearchFilterSet, TagFilter,
     TreeNodeMultipleChoiceFilter,
 )
-from virtualization.models import VirtualMachine
+from virtualization.models import VirtualMachine, VMInterface
 from .choices import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 
@@ -319,17 +319,28 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         field_name='pk',
         label='Virtual machine (ID)',
     )
-    # TODO: Restore filtering by assigned interface
-    # interface = django_filters.ModelMultipleChoiceFilter(
-    #     field_name='interface__name',
-    #     queryset=Interface.objects.unrestricted(),
-    #     to_field_name='name',
-    #     label='Interface (ID)',
-    # )
-    # interface_id = django_filters.ModelMultipleChoiceFilter(
-    #     queryset=Interface.objects.unrestricted(),
-    #     label='Interface (ID)',
-    # )
+    interface = django_filters.ModelMultipleChoiceFilter(
+        field_name='interface__name',
+        queryset=Interface.objects.unrestricted(),
+        to_field_name='name',
+        label='Interface (name)',
+    )
+    interface_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='interface',
+        queryset=Interface.objects.unrestricted(),
+        label='Interface (ID)',
+    )
+    vminterface = django_filters.ModelMultipleChoiceFilter(
+        field_name='vminterface__name',
+        queryset=VMInterface.objects.unrestricted(),
+        to_field_name='name',
+        label='VM interface (name)',
+    )
+    vminterface_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='vminterface',
+        queryset=VMInterface.objects.unrestricted(),
+        label='VM interface (ID)',
+    )
     assigned_to_interface = django_filters.BooleanFilter(
         method='_assigned_to_interface',
         label='Is assigned to an interface',
@@ -397,7 +408,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         for vm in virtual_machines:
             interface_ids.extend(vm.interfaces.values_list('id', flat=True))
         return queryset.filter(
-            vm_interface__in=interface_ids
+            vminterface__in=interface_ids
         )
 
     def _assigned_to_interface(self, queryset, name, value):
diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index db9241480..560313f0a 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -392,12 +392,12 @@ class IPAddressTestCase(TestCase):
         )
         VirtualMachine.objects.bulk_create(virtual_machines)
 
-        vm_interfaces = (
+        vminterfaces = (
             VMInterface(virtual_machine=virtual_machines[0], name='Interface 1'),
             VMInterface(virtual_machine=virtual_machines[1], name='Interface 2'),
             VMInterface(virtual_machine=virtual_machines[2], name='Interface 3'),
         )
-        VMInterface.objects.bulk_create(vm_interfaces)
+        VMInterface.objects.bulk_create(vminterfaces)
 
         tenant_groups = (
             TenantGroup(name='Tenant group 1', slug='tenant-group-1'),
@@ -421,9 +421,9 @@ class IPAddressTestCase(TestCase):
             IPAddress(address='10.0.0.4/24', tenant=tenants[2], vrf=vrfs[2], assigned_object=interfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
             IPAddress(address='10.0.0.1/25', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
             IPAddress(address='2001:db8::1/64', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-a'),
-            IPAddress(address='2001:db8::2/64', tenant=tenants[0], vrf=vrfs[0], assigned_object=vm_interfaces[0], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
-            IPAddress(address='2001:db8::3/64', tenant=tenants[1], vrf=vrfs[1], assigned_object=vm_interfaces[1], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
-            IPAddress(address='2001:db8::4/64', tenant=tenants[2], vrf=vrfs[2], assigned_object=vm_interfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
+            IPAddress(address='2001:db8::2/64', tenant=tenants[0], vrf=vrfs[0], assigned_object=vminterfaces[0], status=IPAddressStatusChoices.STATUS_ACTIVE, dns_name='ipaddress-b'),
+            IPAddress(address='2001:db8::3/64', tenant=tenants[1], vrf=vrfs[1], assigned_object=vminterfaces[1], status=IPAddressStatusChoices.STATUS_RESERVED, role=IPAddressRoleChoices.ROLE_VIP, dns_name='ipaddress-c'),
+            IPAddress(address='2001:db8::4/64', tenant=tenants[2], vrf=vrfs[2], assigned_object=vminterfaces[2], status=IPAddressStatusChoices.STATUS_DEPRECATED, role=IPAddressRoleChoices.ROLE_SECONDARY, dns_name='ipaddress-d'),
             IPAddress(address='2001:db8::1/65', tenant=None, vrf=None, assigned_object=None, status=IPAddressStatusChoices.STATUS_ACTIVE),
         )
         IPAddress.objects.bulk_create(ipaddresses)
@@ -486,13 +486,19 @@ class IPAddressTestCase(TestCase):
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    # TODO: Restore filtering by interface
-    # def test_interface(self):
-    #     interfaces = Interface.objects.all()[:2]
-    #     params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
-    #     self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-    #     params = {'interface': ['Interface 1', 'Interface 2']}
-    #     self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+    def test_interface(self):
+        interfaces = Interface.objects.all()[:2]
+        params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'interface': ['Interface 1', 'Interface 2']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_vminterface(self):
+        vminterfaces = VMInterface.objects.all()[:2]
+        params = {'vminterface_id': [vminterfaces[0].pk, vminterfaces[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'vminterface': ['Interface 1', 'Interface 2']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_assigned_to_interface(self):
         params = {'assigned_to_interface': 'true'}

From 6663844a86cc7d908d059b59b6da3cb48d4c0bb2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 09:27:30 -0400
Subject: [PATCH 208/505] Rename 'vm_interface' to 'vminterface'; misc cleanup

---
 netbox/ipam/forms.py                               |  2 +-
 netbox/virtualization/choices.py                   | 14 --------------
 netbox/virtualization/forms.py                     |  6 +++---
 .../virtualization/migrations/0015_vminterface.py  |  6 +++---
 .../migrations/0016_replicate_interfaces.py        | 10 +++++-----
 netbox/virtualization/models.py                    |  8 ++++----
 netbox/virtualization/tests/test_filters.py        |  2 +-
 7 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index ecb2d7c1e..83e7aa470 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1200,7 +1200,7 @@ class ServiceForm(BootstrapMixin, CustomFieldModelForm):
             )
         elif self.instance.virtual_machine:
             self.fields['ipaddresses'].queryset = IPAddress.objects.filter(
-                vm_interface__in=self.instance.virtual_machine.interfaces.values_list('id', flat=True)
+                vminterface__in=self.instance.virtual_machine.interfaces.values_list('id', flat=True)
             )
         else:
             self.fields['ipaddresses'].choices = []
diff --git a/netbox/virtualization/choices.py b/netbox/virtualization/choices.py
index 1dae88e1d..3795ddb76 100644
--- a/netbox/virtualization/choices.py
+++ b/netbox/virtualization/choices.py
@@ -1,4 +1,3 @@
-from dcim.choices import InterfaceTypeChoices
 from utilities.choices import ChoiceSet
 
 
@@ -29,16 +28,3 @@ class VirtualMachineStatusChoices(ChoiceSet):
         STATUS_ACTIVE: 1,
         STATUS_STAGED: 3,
     }
-
-
-#
-# Interface types (for VirtualMachines)
-#
-
-class VMInterfaceTypeChoices(ChoiceSet):
-
-    TYPE_VIRTUAL = InterfaceTypeChoices.TYPE_VIRTUAL
-
-    CHOICES = (
-        (TYPE_VIRTUAL, 'Virtual'),
-    )
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index ab0e10f04..e2ff841bf 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -3,7 +3,7 @@ from django.core.exceptions import ValidationError
 
 from dcim.choices import InterfaceModeChoices
 from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN
-from dcim.forms import INTERFACE_MODE_HELP_TEXT, InterfaceCommonForm
+from dcim.forms import INTERFACE_MODE_HELP_TEXT
 from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldModelForm, CustomFieldFilterForm,
@@ -357,7 +357,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect interface IPs
                 interface_ips = IPAddress.objects.prefetch_related('interface').filter(
                     address__family=family,
-                    vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
+                    vminterface__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if interface_ips:
                     ip_choices.append(
@@ -368,7 +368,7 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
                     address__family=family,
-                    nat_inside__vm_interface__in=self.instance.interfaces.values_list('id', flat=True)
+                    nat_inside__vminterface__in=self.instance.interfaces.values_list('id', flat=True)
                 )
                 if nat_ips:
                     ip_choices.append(
diff --git a/netbox/virtualization/migrations/0015_vminterface.py b/netbox/virtualization/migrations/0015_vminterface.py
index fcda6b4f3..6c5207226 100644
--- a/netbox/virtualization/migrations/0015_vminterface.py
+++ b/netbox/virtualization/migrations/0015_vminterface.py
@@ -30,9 +30,9 @@ class Migration(migrations.Migration):
                 ('mtu', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65536)])),
                 ('mode', models.CharField(blank=True, max_length=50)),
                 ('description', models.CharField(blank=True, max_length=200)),
-                ('tagged_vlans', models.ManyToManyField(blank=True, related_name='vm_interfaces_as_tagged', to='ipam.VLAN')),
-                ('tags', taggit.managers.TaggableManager(related_name='vm_interface', through='extras.TaggedItem', to='extras.Tag')),
-                ('untagged_vlan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vm_interfaces_as_untagged', to='ipam.VLAN')),
+                ('tagged_vlans', models.ManyToManyField(blank=True, related_name='vminterfaces_as_tagged', to='ipam.VLAN')),
+                ('tags', taggit.managers.TaggableManager(related_name='vminterface', through='extras.TaggedItem', to='extras.Tag')),
+                ('untagged_vlan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vminterfaces_as_untagged', to='ipam.VLAN')),
                 ('virtual_machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='virtualization.VirtualMachine')),
             ],
             options={
diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index 2df483e78..d6c0b0217 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -16,7 +16,7 @@ def replicate_interfaces(apps, schema_editor):
     # Replicate dcim.Interface instances assigned to VirtualMachines
     original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
     for interface in original_interfaces:
-        vm_interface = VMInterface(
+        vminterface = VMInterface(
             virtual_machine=interface.virtual_machine,
             name=interface.name,
             enabled=interface.enabled,
@@ -26,22 +26,22 @@ def replicate_interfaces(apps, schema_editor):
             description=interface.description,
             untagged_vlan=interface.untagged_vlan,
         )
-        vm_interface.save()
+        vminterface.save()
 
         # Copy tagged VLANs
-        vm_interface.tagged_vlans.set(interface.tagged_vlans.all())
+        vminterface.tagged_vlans.set(interface.tagged_vlans.all())
 
         # Reassign tags to the new instance
         TaggedItem.objects.filter(
             content_type=interface_ct, object_id=interface.pk
         ).update(
-            content_type=vminterface_ct, object_id=vm_interface.pk
+            content_type=vminterface_ct, object_id=vminterface.pk
         )
 
         # Update any assigned IPAddresses
         IPAddress.objects.filter(assigned_object_id=interface.pk).update(
             assigned_object_type=vminterface_ct,
-            assigned_object_id=vm_interface.pk
+            assigned_object_id=vminterface.pk
         )
 
     replicated_count = VMInterface.objects.count()
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index bed198326..4a753561a 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -394,14 +394,14 @@ class VMInterface(BaseInterface):
     untagged_vlan = models.ForeignKey(
         to='ipam.VLAN',
         on_delete=models.SET_NULL,
-        related_name='vm_interfaces_as_untagged',
+        related_name='vminterfaces_as_untagged',
         null=True,
         blank=True,
         verbose_name='Untagged VLAN'
     )
     tagged_vlans = models.ManyToManyField(
         to='ipam.VLAN',
-        related_name='vm_interfaces_as_tagged',
+        related_name='vminterfaces_as_tagged',
         blank=True,
         verbose_name='Tagged VLANs'
     )
@@ -409,11 +409,11 @@ class VMInterface(BaseInterface):
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id',
-        related_query_name='vm_interface'
+        related_query_name='vminterface'
     )
     tags = TaggableManager(
         through=TaggedItem,
-        related_name='vm_interface'
+        related_name='vminterface'
     )
 
     objects = RestrictedQuerySet.as_manager()
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index 821127b92..ad452ec51 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -365,7 +365,7 @@ class VirtualMachineTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
-class InterfaceTestCase(TestCase):
+class VMInterfaceTestCase(TestCase):
     queryset = VMInterface.objects.all()
     filterset = VMInterfaceFilterSet
 

From 9a0bc16c86bb71c0f3bc00246dd97fdca3c86d21 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 09:52:22 -0400
Subject: [PATCH 209/505] Update device/VM interface templates

---
 netbox/ipam/views.py                          |  15 +-
 netbox/templates/dcim/inc/interface.html      |   4 +-
 .../virtualization/inc/vminterface.html       | 141 ++++++++++++++++++
 .../virtualization/virtualmachine.html        |  25 ++--
 4 files changed, 163 insertions(+), 22 deletions(-)
 create mode 100644 netbox/templates/virtualization/inc/vminterface.html

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index bcbe00923..808a50ae1 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -1,6 +1,6 @@
 import netaddr
 from django.conf import settings
-from django.db.models import Count, Q
+from django.db.models import Count
 from django.db.models.expressions import RawSQL
 from django.shortcuts import get_object_or_404, redirect, render
 from django_tables2 import RequestConfig
@@ -11,7 +11,7 @@ from utilities.views import (
     BulkCreateView, BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView,
     ObjectListView,
 )
-from virtualization.models import VirtualMachine
+from virtualization.models import VirtualMachine, VMInterface
 from . import filters, forms, tables
 from .choices import *
 from .constants import *
@@ -659,13 +659,18 @@ class IPAddressEditView(ObjectEditView):
 
     def alter_obj(self, obj, request, url_args, url_kwargs):
 
-        interface_id = request.GET.get('interface')
-        if interface_id:
+        if 'interface' in request.GET:
             try:
-                obj.interface = Interface.objects.get(pk=interface_id)
+                obj.assigned_object = Interface.objects.get(pk=request.GET['interface'])
             except (ValueError, Interface.DoesNotExist):
                 pass
 
+        elif 'vminterface' in request.GET:
+            try:
+                obj.assigned_object = VMInterface.objects.get(pk=request.GET['vminterface'])
+            except (ValueError, VMInterface.DoesNotExist):
+                pass
+
         return obj
 
 
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 640fca338..75869db52 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -166,7 +166,7 @@
                     </ul>
                 </span>
             {% endif %}
-            <a href="{% if iface.device_id %}{% url 'dcim:interface_edit' pk=iface.pk %}{% else %}{% url 'virtualization:vminterface_edit' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit interface">
+            <a href="{% url 'dcim:interface_edit' pk=iface.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit interface">
                 <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
             </a>
         {% endif %}
@@ -176,7 +176,7 @@
                     <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
                 </button>
             {% else %}
-                <a href="{% if iface.device_id %}{% url 'dcim:interface_delete' pk=iface.pk %}{% else %}{% url 'virtualization:vminterface_delete' pk=iface.pk %}{% endif %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs" title="Delete interface">
+                <a href="{% url 'dcim:interface_delete' pk=iface.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs" title="Delete interface">
                     <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
                 </a>
             {% endif %}
diff --git a/netbox/templates/virtualization/inc/vminterface.html b/netbox/templates/virtualization/inc/vminterface.html
new file mode 100644
index 000000000..5410fba7a
--- /dev/null
+++ b/netbox/templates/virtualization/inc/vminterface.html
@@ -0,0 +1,141 @@
+{% load helpers %}
+<tr class="interface{% if not iface.enabled %} danger{% endif %}" id="interface_{{ iface.name }}">
+
+    {# Checkbox #}
+    {% if perms.virtualization.change_interface or perms.virtualization.delete_interface %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ iface.pk }}" />
+        </td>
+    {% endif %}
+
+    {# Name #}
+    <td>
+        <a href="{{ iface.get_absolute_url }}">{{ iface }}</a>
+    </td>
+
+    {# MAC address #}
+    <td class="text-monospace">
+        {{ iface.mac_address|default:"&mdash;" }}
+    </td>
+
+    {# MTU #}
+    <td>{{ iface.mtu|default:"&mdash;" }}</td>
+
+    {# 802.1Q mode #}
+    <td>{{ iface.get_mode_display|default:"&mdash;" }}</td>
+
+    {# Description/tags #}
+    <td>
+        {% if iface.description %}
+            {{ iface.description }}<br/>
+        {% endif %}
+        {% for tag in iface.tags.all %}
+            {% tag tag %}
+        {% empty %}
+            {% if not iface.description %}&mdash;{% endif %}
+        {% endfor %}
+    </td>
+
+    {# Buttons #}
+    <td class="text-right text-nowrap noprint">
+        {% if show_interface_graphs %}
+            <button type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#graphs_modal" data-obj="{{ virtualmachine.name }} - {{ iface.name }}" data-url="{% url 'virtualization-api:vminterface-graphs' pk=iface.pk %}" title="Show graphs">
+                <i class="glyphicon glyphicon-signal" aria-hidden="true"></i>
+            </button>
+        {% endif %}
+        {% if perms.ipam.add_ipaddress %}
+            <a href="{% url 'ipam:ipaddress_add' %}?vminterface={{ iface.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-xs btn-success" title="Add IP address">
+                <i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+        {% if perms.virtualization.change_interface %}
+            <a href="{% url 'virtualization:vminterface_edit' pk=iface.pk %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-info btn-xs" title="Edit interface">
+                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+        {% if perms.virtualization.delete_interface %}
+            <a href="{% url 'virtualization:vminterface_delete' pk=iface.pk %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs" title="Delete interface">
+                <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+            </a>
+        {% endif %}
+    </td>
+</tr>
+
+{% with ipaddresses=iface.ip_addresses.all %}
+    {% if ipaddresses %}
+        <tr class="ipaddresses">
+            {# Placeholder #}
+            {% if perms.virtualization.change_interface or perms.virtualization.delete_interface %}
+                <td></td>
+            {% endif %}
+
+            {# IP addresses table #}
+            <td colspan="9" style="padding: 0">
+                <table class="table table-condensed interface-ips">
+                    <thead>
+                        <tr class="text-muted">
+                            <th class="col-md-3">IP Address</th>
+                            <th class="col-md-2">Status/Role</th>
+                            <th class="col-md-3">VRF</th>
+                            <th class="col-md-3">Description</th>
+                            <th class="col-md-1"></th>
+                        </tr>
+                    </thead>
+                    {% for ip in iface.ip_addresses.all %}
+                        <tr>
+
+                            {# IP address #}
+                            <td>
+                                <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
+                            </td>
+
+                            {# Primary/status/role #}
+                            <td>
+                                {% if virtualmachine.primary_ip4 == ip or virtualmachine.primary_ip6 == ip %}
+                                    <span class="label label-success">Primary</span>
+                                {% endif %}
+                                <span class="label label-{{ ip.get_status_class }}">{{ ip.get_status_display }}</span>
+                                {% if ip.role %}
+                                    <span class="label label-{{ ip.get_role_class }}">{{ ip.get_role_display }}</span>
+                                {% endif %}
+                            </td>
+
+                            {# VRF #}
+                            <td>
+                                {% if ip.vrf %}
+                                    <a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}" title="{{ ip.vrf.rd }}">{{ ip.vrf.name }}</a>
+                                {% else %}
+                                    <span class="text-muted">Global</span>
+                                {% endif %}
+                            </td>
+
+                            {# Description #}
+                            <td>
+                                {% if ip.description %}
+                                    {{ ip.description }}
+                                {% else %}
+                                    <span class="text-muted">&mdash;</span>
+                                {% endif %}
+                            </td>
+
+                            {# Buttons #}
+                            <td class="text-right text-nowrap noprint">
+                                {% if perms.ipam.change_ipaddress %}
+                                    <a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-info btn-xs">
+                                        <i class="glyphicon glyphicon-pencil" aria-hidden="true" title="Edit IP address"></i>
+                                    </a>
+                                {% endif %}
+                                {% if perms.ipam.delete_ipaddress %}
+                                    <a href="{% url 'ipam:ipaddress_delete' pk=ip.pk %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <i class="glyphicon glyphicon-trash" aria-hidden="true" title="Delete IP address"></i>
+                                    </a>
+                                {% endif %}
+                            </td>
+
+                        </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+    {% endif %}
+{% endwith %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index b3ac51f37..0f2523af7 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -248,7 +248,7 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-        {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
+        {% if perms.virtualization.change_vminterface or perms.virtualization.delete_vminterface %}
             <form method="post">
             {% csrf_token %}
             <input type="hidden" name="virtual_machine" value="{{ virtualmachine.pk }}" />
@@ -268,22 +268,20 @@
             <table id="interfaces_table" class="table table-hover table-headings panel-body component-list">
                 <thead>
                     <tr>
-                        {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
+                        {% if perms.virtualization.change_vminterface or perms.virtualization.delete_vminterface %}
                             <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
                         {% endif %}
                         <th>Name</th>
-                        <th>LAG</th>
-                        <th>Description</th>
+                        <th>MAC Address</th>
                         <th>MTU</th>
                         <th>Mode</th>
-                        <th>Cable</th>
-                        <th colspan="2">Connection</th>
+                        <th>Description</th>
                         <th></th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for iface in interfaces %}
-                        {% include 'dcim/inc/interface.html' with device=virtualmachine %}
+                        {% include 'virtualization/inc/vminterface.html' %}
                     {% empty %}
                         <tr>
                             <td colspan="8" class="text-center text-muted">&mdash; No interfaces defined &mdash;</td>
@@ -291,22 +289,19 @@
                     {% endfor %}
                 </tbody>
             </table>
-            {% if perms.dcim.add_interface or perms.dcim.delete_interface %}
+            {% if perms.virtualization.add_vminterface or perms.virtualization.delete_vminterface %}
                 <div class="panel-footer noprint">
-                    {% if interfaces and perms.dcim.change_interface %}
-                        <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
-                            <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                        </button>
+                    {% if interfaces and perms.virtualization.change_vminterface %}
                         <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
                         </button>
                     {% endif %}
-                    {% if interfaces and perms.dcim.delete_interface %}
+                    {% if interfaces and perms.virtualization.delete_vminterface %}
                         <button type="submit" name="_delete" formaction="{% url 'virtualization:vminterface_bulk_delete' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
                             <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                         </button>
                     {% endif %}
-                    {% if perms.dcim.add_interface %}
+                    {% if perms.virtualization.add_vminterface %}
                         <div class="pull-right">
                             <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary btn-xs">
                                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
@@ -317,7 +312,7 @@
                  </div>
             {% endif %}
         </div>
-        {% if perms.dcim.delete_interface %}
+        {% if perms.virtualization.delete_vminterface %}
             </form>
         {% endif %}
 	</div>

From 052555c3f7bc826eeb24e0f32f5dbea6aa903b91 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 10:02:40 -0400
Subject: [PATCH 210/505] Add bulk renaming function for VM interfaces

---
 netbox/dcim/forms.py                          | 28 +--------
 netbox/dcim/views.py                          | 58 +------------------
 .../obj_bulk_rename.html}                     |  0
 .../virtualization/virtualmachine.html        |  3 +
 netbox/utilities/forms.py                     | 24 ++++++++
 netbox/utilities/views.py                     | 53 +++++++++++++++++
 netbox/virtualization/forms.py                | 13 ++++-
 netbox/virtualization/urls.py                 |  1 +
 netbox/virtualization/views.py                |  9 ++-
 9 files changed, 103 insertions(+), 86 deletions(-)
 rename netbox/templates/{dcim/bulk_rename.html => utilities/obj_bulk_rename.html} (100%)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 4d8fc9d81..099676181 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -23,12 +23,12 @@ from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
-    ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
+    BulkRenameForm, ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
     DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField,
     NumericArrayField, SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
     BOOLEAN_WITH_BLANK_CHOICES,
 )
-from virtualization.models import Cluster, ClusterGroup, VirtualMachine
+from virtualization.models import Cluster, ClusterGroup
 from .choices import *
 from .constants import *
 from .models import (
@@ -150,30 +150,6 @@ class LabeledComponentForm(BootstrapMixin, forms.Form):
             }, code='label_pattern_mismatch')
 
 
-class BulkRenameForm(forms.Form):
-    """
-    An extendable form to be used for renaming device components in bulk.
-    """
-    find = forms.CharField()
-    replace = forms.CharField()
-    use_regex = forms.BooleanField(
-        required=False,
-        initial=True,
-        label='Use regular expressions'
-    )
-
-    def clean(self):
-
-        # Validate regular expression in "find" field
-        if self.cleaned_data['use_regex']:
-            try:
-                re.compile(self.cleaned_data['find'])
-            except re.error:
-                raise forms.ValidationError({
-                    'find': "Invalid regular expression"
-                })
-
-
 #
 # Fields
 #
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 6aad18bd3..ba32a7643 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1,5 +1,4 @@
 from collections import OrderedDict
-import re
 
 from django.conf import settings
 from django.contrib import messages
@@ -25,8 +24,9 @@ from utilities.paginator import EnhancedPaginator
 from utilities.permissions import get_permission_for_model
 from utilities.utils import csv_format
 from utilities.views import (
-    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, GetReturnURLMixin,
-    ObjectView, ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView, ObjectPermissionRequiredMixin,
+    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, BulkRenameView, ComponentCreateView,
+    GetReturnURLMixin, ObjectView, ObjectImportView, ObjectDeleteView, ObjectEditView, ObjectListView,
+    ObjectPermissionRequiredMixin,
 )
 from virtualization.models import VirtualMachine
 from . import filters, forms, tables
@@ -41,58 +41,6 @@ from .models import (
 )
 
 
-class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
-    """
-    An extendable view for renaming device components in bulk.
-    """
-    queryset = None
-    form = None
-    template_name = 'dcim/bulk_rename.html'
-
-    def get_required_permission(self):
-        return get_permission_for_model(self.queryset.model, 'change')
-
-    def post(self, request):
-
-        if '_preview' in request.POST or '_apply' in request.POST:
-            form = self.form(request.POST, initial={'pk': request.POST.getlist('pk')})
-            selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
-
-            if form.is_valid():
-                for obj in selected_objects:
-                    find = form.cleaned_data['find']
-                    replace = form.cleaned_data['replace']
-                    if form.cleaned_data['use_regex']:
-                        try:
-                            obj.new_name = re.sub(find, replace, obj.name)
-                        # Catch regex group reference errors
-                        except re.error:
-                            obj.new_name = obj.name
-                    else:
-                        obj.new_name = obj.name.replace(find, replace)
-
-                if '_apply' in request.POST:
-                    for obj in selected_objects:
-                        obj.name = obj.new_name
-                        obj.save()
-                    messages.success(request, "Renamed {} {}".format(
-                        len(selected_objects),
-                        self.queryset.model._meta.verbose_name_plural
-                    ))
-                    return redirect(self.get_return_url(request))
-
-        else:
-            form = self.form(initial={'pk': request.POST.getlist('pk')})
-            selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
-
-        return render(request, self.template_name, {
-            'form': form,
-            'obj_type_plural': self.queryset.model._meta.verbose_name_plural,
-            'selected_objects': selected_objects,
-            'return_url': self.get_return_url(request),
-        })
-
-
 class BulkDisconnectView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     An extendable view for disconnection console/power/interface components in bulk.
diff --git a/netbox/templates/dcim/bulk_rename.html b/netbox/templates/utilities/obj_bulk_rename.html
similarity index 100%
rename from netbox/templates/dcim/bulk_rename.html
rename to netbox/templates/utilities/obj_bulk_rename.html
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 0f2523af7..9cc206dac 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -292,6 +292,9 @@
             {% if perms.virtualization.add_vminterface or perms.virtualization.delete_vminterface %}
                 <div class="panel-footer noprint">
                     {% if interfaces and perms.virtualization.change_vminterface %}
+                        <button type="submit" name="_rename" formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
+                            <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                        </button>
                         <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
                         </button>
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 3ac954a82..59e581ff4 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -733,6 +733,30 @@ class BulkEditForm(forms.Form):
             self.nullable_fields = self.Meta.nullable_fields
 
 
+class BulkRenameForm(forms.Form):
+    """
+    An extendable form to be used for renaming objects in bulk.
+    """
+    find = forms.CharField()
+    replace = forms.CharField()
+    use_regex = forms.BooleanField(
+        required=False,
+        initial=True,
+        label='Use regular expressions'
+    )
+
+    def clean(self):
+
+        # Validate regular expression in "find" field
+        if self.cleaned_data['use_regex']:
+            try:
+                re.compile(self.cleaned_data['find'])
+            except re.error:
+                raise forms.ValidationError({
+                    'find': "Invalid regular expression"
+                })
+
+
 class CSVModelForm(forms.ModelForm):
     """
     ModelForm used for the import of objects in CSV format.
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 22788cf64..cf282a8c0 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1,4 +1,5 @@
 import logging
+import re
 import sys
 from copy import deepcopy
 
@@ -963,6 +964,58 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         })
 
 
+class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
+    """
+    An extendable view for renaming objects in bulk.
+    """
+    queryset = None
+    form = None
+    template_name = 'utilities/obj_bulk_rename.html'
+
+    def get_required_permission(self):
+        return get_permission_for_model(self.queryset.model, 'change')
+
+    def post(self, request):
+
+        if '_preview' in request.POST or '_apply' in request.POST:
+            form = self.form(request.POST, initial={'pk': request.POST.getlist('pk')})
+            selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
+
+            if form.is_valid():
+                for obj in selected_objects:
+                    find = form.cleaned_data['find']
+                    replace = form.cleaned_data['replace']
+                    if form.cleaned_data['use_regex']:
+                        try:
+                            obj.new_name = re.sub(find, replace, obj.name)
+                        # Catch regex group reference errors
+                        except re.error:
+                            obj.new_name = obj.name
+                    else:
+                        obj.new_name = obj.name.replace(find, replace)
+
+                if '_apply' in request.POST:
+                    for obj in selected_objects:
+                        obj.name = obj.new_name
+                        obj.save()
+                    messages.success(request, "Renamed {} {}".format(
+                        len(selected_objects),
+                        self.queryset.model._meta.verbose_name_plural
+                    ))
+                    return redirect(self.get_return_url(request))
+
+        else:
+            form = self.form(initial={'pk': request.POST.getlist('pk')})
+            selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
+
+        return render(request, self.template_name, {
+            'form': form,
+            'obj_type_plural': self.queryset.model._meta.verbose_name_plural,
+            'selected_objects': selected_objects,
+            'return_url': self.get_return_url(request),
+        })
+
+
 class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     Delete objects in bulk.
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index e2ff841bf..ce6eea1e8 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -14,9 +14,9 @@ from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
     add_blank_choice, APISelect, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
-    CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
-    DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, SlugField, SmallTextarea,
-    StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
+    BulkRenameForm, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
+    DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField,
+    SlugField, SmallTextarea, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from .choices import *
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -810,6 +810,13 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
                 self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
 
 
+class VMInterfaceBulkRenameForm(BulkRenameForm):
+    pk = forms.ModelMultipleChoiceField(
+        queryset=VMInterface.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+
+
 class VMInterfaceFilterForm(forms.Form):
     model = VMInterface
     enabled = forms.NullBooleanField(
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 04e11682e..5b6cd7a88 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -55,6 +55,7 @@ urlpatterns = [
     path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
     path('interfaces/import/', views.InterfaceBulkImportView.as_view(), name='vminterface_import'),
     path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
+    path('interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'),
     path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
     path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
     path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'),
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 3d1c9901d..00ab30233 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -10,8 +10,8 @@ from extras.views import ObjectConfigContextView
 from ipam.models import Service
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.views import (
-    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, ComponentCreateView, ObjectView,
-    ObjectDeleteView, ObjectEditView, ObjectListView,
+    BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, BulkRenameView, ComponentCreateView,
+    ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
 )
 from . import filters, forms, tables
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -362,6 +362,11 @@ class InterfaceBulkEditView(BulkEditView):
     form = forms.VMInterfaceBulkEditForm
 
 
+class InterfaceBulkRenameView(BulkRenameView):
+    queryset = VMInterface.objects.all()
+    form = forms.VMInterfaceBulkRenameForm
+
+
 class InterfaceBulkDeleteView(BulkDeleteView):
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable

From 99c72c78c1659ffc3ef44f180bca4e3c12d72270 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 10:09:22 -0400
Subject: [PATCH 211/505] Update VMInterface view names

---
 netbox/virtualization/api/urls.py  |  2 +-
 netbox/virtualization/api/views.py |  2 +-
 netbox/virtualization/urls.py      | 18 +++++++++---------
 netbox/virtualization/views.py     | 18 +++++++++---------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/netbox/virtualization/api/urls.py b/netbox/virtualization/api/urls.py
index c237f1e68..3f6c56a48 100644
--- a/netbox/virtualization/api/urls.py
+++ b/netbox/virtualization/api/urls.py
@@ -21,7 +21,7 @@ router.register('clusters', views.ClusterViewSet)
 
 # VirtualMachines
 router.register('virtual-machines', views.VirtualMachineViewSet)
-router.register('interfaces', views.InterfaceViewSet)
+router.register('interfaces', views.VMInterfaceViewSet)
 
 app_name = 'virtualization-api'
 urlpatterns = router.urls
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index d5fff805b..f2a689f12 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -71,7 +71,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
         return serializers.VirtualMachineWithConfigContextSerializer
 
 
-class InterfaceViewSet(ModelViewSet):
+class VMInterfaceViewSet(ModelViewSet):
     queryset = VMInterface.objects.filter(
         virtual_machine__isnull=False
     ).prefetch_related(
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 5b6cd7a88..34172ee88 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -51,15 +51,15 @@ urlpatterns = [
     path('virtual-machines/<int:virtualmachine>/services/assign/', ServiceEditView.as_view(), name='virtualmachine_service_assign'),
 
     # VM interfaces
-    path('interfaces/', views.InterfaceListView.as_view(), name='vminterface_list'),
-    path('interfaces/add/', views.InterfaceCreateView.as_view(), name='vminterface_add'),
-    path('interfaces/import/', views.InterfaceBulkImportView.as_view(), name='vminterface_import'),
-    path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
-    path('interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'),
-    path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
-    path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='vminterface'),
-    path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='vminterface_edit'),
-    path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='vminterface_delete'),
+    path('interfaces/', views.VMInterfaceListView.as_view(), name='vminterface_list'),
+    path('interfaces/add/', views.VMInterfaceCreateView.as_view(), name='vminterface_add'),
+    path('interfaces/import/', views.VMInterfaceBulkImportView.as_view(), name='vminterface_import'),
+    path('interfaces/edit/', views.VMInterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'),
+    path('interfaces/rename/', views.VMInterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'),
+    path('interfaces/delete/', views.VMInterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'),
+    path('interfaces/<int:pk>/', views.VMInterfaceView.as_view(), name='vminterface'),
+    path('interfaces/<int:pk>/edit/', views.VMInterfaceEditView.as_view(), name='vminterface_edit'),
+    path('interfaces/<int:pk>/delete/', views.VMInterfaceDeleteView.as_view(), name='vminterface_delete'),
     path('interfaces/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='vminterface_changelog', kwargs={'model': VMInterface}),
     path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'),
 
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 00ab30233..60b5f766a 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -289,7 +289,7 @@ class VirtualMachineBulkDeleteView(BulkDeleteView):
 # VM interfaces
 #
 
-class InterfaceListView(ObjectListView):
+class VMInterfaceListView(ObjectListView):
     queryset = VMInterface.objects.prefetch_related('virtual_machine')
     filterset = filters.VMInterfaceFilterSet
     filterset_form = forms.VMInterfaceFilterForm
@@ -297,7 +297,7 @@ class InterfaceListView(ObjectListView):
     action_buttons = ('export',)
 
 
-class InterfaceView(ObjectView):
+class VMInterfaceView(ObjectView):
     queryset = VMInterface.objects.all()
 
     def get(self, request, pk):
@@ -332,42 +332,42 @@ class InterfaceView(ObjectView):
 
 
 # TODO: This should not use ComponentCreateView
-class InterfaceCreateView(ComponentCreateView):
+class VMInterfaceCreateView(ComponentCreateView):
     queryset = VMInterface.objects.all()
     form = forms.VMInterfaceCreateForm
     model_form = forms.VMInterfaceForm
     template_name = 'virtualization/virtualmachine_component_add.html'
 
 
-class InterfaceEditView(ObjectEditView):
+class VMInterfaceEditView(ObjectEditView):
     queryset = VMInterface.objects.all()
     model_form = forms.VMInterfaceForm
     template_name = 'virtualization/vminterface_edit.html'
 
 
-class InterfaceDeleteView(ObjectDeleteView):
+class VMInterfaceDeleteView(ObjectDeleteView):
     queryset = VMInterface.objects.all()
 
 
-class InterfaceBulkImportView(BulkImportView):
+class VMInterfaceBulkImportView(BulkImportView):
     queryset = VMInterface.objects.all()
     model_form = forms.VMInterfaceCSVForm
     table = tables.VMInterfaceTable
     default_return_url = 'virtualization:vminterface_list'
 
 
-class InterfaceBulkEditView(BulkEditView):
+class VMInterfaceBulkEditView(BulkEditView):
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable
     form = forms.VMInterfaceBulkEditForm
 
 
-class InterfaceBulkRenameView(BulkRenameView):
+class VMInterfaceBulkRenameView(BulkRenameView):
     queryset = VMInterface.objects.all()
     form = forms.VMInterfaceBulkRenameForm
 
 
-class InterfaceBulkDeleteView(BulkDeleteView):
+class VMInterfaceBulkDeleteView(BulkDeleteView):
     queryset = VMInterface.objects.all()
     table = tables.VMInterfaceTable
 

From 4d2c75a824cdd56bf55657ecaba725fbb2d8525a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 11:30:28 -0400
Subject: [PATCH 212/505] Restore ability to assign interface when editing an
 IPAddress

---
 netbox/ipam/forms.py                      | 111 +++++++++++++---------
 netbox/ipam/models.py                     |  31 +++---
 netbox/templates/ipam/ipaddress_edit.html |  48 +++++-----
 3 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 83e7aa470..596d353bd 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -522,11 +522,33 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
 #
 
 class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModelForm):
-    # TODO: Restore ability to select assigned object when editing IPAddress
-    # interface = forms.ModelChoiceField(
-    #     queryset=Interface.objects.all(),
-    #     required=False
-    # )
+    device = DynamicModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+        widget=APISelect(
+            filter_for={
+                'interface': 'device_id'
+            }
+        )
+    )
+    interface = DynamicModelChoiceField(
+        queryset=Interface.objects.all(),
+        required=False
+    )
+    virtual_machine = DynamicModelChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        required=False,
+        widget=APISelect(
+            filter_for={
+                'vminterface': 'virtual_machine_id'
+            }
+        )
+    )
+    vminterface = DynamicModelChoiceField(
+        queryset=VMInterface.objects.all(),
+        required=False,
+        label='Interface'
+    )
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
@@ -611,67 +633,68 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         # Initialize helper selectors
         instance = kwargs.get('instance')
         initial = kwargs.get('initial', {}).copy()
-        if instance and instance.nat_inside and instance.nat_inside.device is not None:
-            initial['nat_site'] = instance.nat_inside.device.site
-            initial['nat_rack'] = instance.nat_inside.device.rack
-            initial['nat_device'] = instance.nat_inside.device
+        if instance:
+            if type(instance.assigned_object) is Interface:
+                initial['device'] = instance.assigned_object.device
+                initial['interface'] = instance.assigned_object
+            elif type(instance.assigned_object) is VMInterface:
+                initial['virtual_machine'] = instance.assigned_object.virtual_machine
+                initial['vminterface'] = instance.assigned_object
+            if instance.nat_inside and instance.nat_inside.device is not None:
+                initial['nat_site'] = instance.nat_inside.device.site
+                initial['nat_rack'] = instance.nat_inside.device.rack
+                initial['nat_device'] = instance.nat_inside.device
         kwargs['initial'] = initial
 
         super().__init__(*args, **kwargs)
 
         self.fields['vrf'].empty_label = 'Global'
 
-        # # Limit interface selections to those belonging to the parent device/VM
-        # if self.instance and self.instance.interface:
-        #     self.fields['interface'].queryset = Interface.objects.filter(
-        #         device=self.instance.interface.device, virtual_machine=self.instance.interface.virtual_machine
-        #     ).prefetch_related(
-        #         'device__primary_ip4',
-        #         'device__primary_ip6',
-        #         'virtual_machine__primary_ip4',
-        #         'virtual_machine__primary_ip6',
-        #     )  # We prefetch the primary address fields to ensure cache invalidation does not balk on the save()
-        # else:
-        #     self.fields['interface'].choices = []
-        #
-        # # Initialize primary_for_parent if IP address is already assigned
-        # if self.instance.pk and self.instance.interface is not None:
-        #     parent = self.instance.interface.parent
-        #     if (
-        #         self.instance.address.version == 4 and parent.primary_ip4_id == self.instance.pk or
-        #         self.instance.address.version == 6 and parent.primary_ip6_id == self.instance.pk
-        #     ):
-        #         self.initial['primary_for_parent'] = True
+        # Initialize primary_for_parent if IP address is already assigned
+        if self.instance.pk and self.instance.assigned_object:
+            parent = self.instance.assigned_object.parent
+            if (
+                self.instance.address.version == 4 and parent.primary_ip4_id == self.instance.pk or
+                self.instance.address.version == 6 and parent.primary_ip6_id == self.instance.pk
+            ):
+                self.initial['primary_for_parent'] = True
 
     def clean(self):
         super().clean()
 
+        # Cannot select both a device interface and a VM interface
+        if self.cleaned_data.get('interface') and self.cleaned_data.get('vminterface'):
+            raise forms.ValidationError("Cannot select both a device interface and a virtual machine interface")
+
         # Primary IP assignment is only available if an interface has been assigned.
-        if self.cleaned_data.get('primary_for_parent') and not self.cleaned_data.get('interface'):
+        interface = self.cleaned_data.get('interface') or self.cleaned_data.get('vminterface')
+        if self.cleaned_data.get('primary_for_parent') and not interface:
             self.add_error(
                 'primary_for_parent', "Only IP addresses assigned to an interface can be designated as primary IPs."
             )
 
     def save(self, *args, **kwargs):
 
+        # Set assigned object
+        interface = self.cleaned_data.get('interface') or self.cleaned_data.get('vminterface')
+        if interface:
+            self.instance.assigned_object = interface
+
         ipaddress = super().save(*args, **kwargs)
 
         # Assign/clear this IPAddress as the primary for the associated Device/VirtualMachine.
-        if self.cleaned_data['primary_for_parent']:
-            parent = self.cleaned_data['interface'].parent
+        if interface and self.cleaned_data['primary_for_parent']:
             if ipaddress.address.version == 4:
-                parent.primary_ip4 = ipaddress
+                interface.parent.primary_ip4 = ipaddress
             else:
-                parent.primary_ip6 = ipaddress
-            parent.save()
-        # elif self.cleaned_data['interface']:
-        #     parent = self.cleaned_data['interface'].parent
-        #     if ipaddress.address.version == 4 and parent.primary_ip4 == ipaddress:
-        #         parent.primary_ip4 = None
-        #         parent.save()
-        #     elif ipaddress.address.version == 6 and parent.primary_ip6 == ipaddress:
-        #         parent.primary_ip6 = None
-        #         parent.save()
+                interface.primary_ip6 = ipaddress
+            interface.parent.save()
+        elif interface and ipaddress.address.version == 4 and interface.parent.primary_ip4 == ipaddress:
+            interface.parent.primary_ip4 = None
+            interface.parent.save()
+        elif interface and ipaddress.address.version == 6 and interface.parent.primary_ip6 == ipaddress:
+            interface.parent.primary_ip4 = None
+            interface.parent.save()
 
         return ipaddress
 
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index d2df6261f..ff564de6e 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -15,7 +15,7 @@ from extras.utils import extras_features
 from utilities.models import ChangeLoggedModel
 from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
-from virtualization.models import VirtualMachine
+from virtualization.models import VirtualMachine, VMInterface
 from .choices import *
 from .constants import *
 from .fields import IPNetworkField, IPAddressField
@@ -717,32 +717,31 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
                         )
                     })
 
-        if self.pk:
-
-            # Check for primary IP assignment that doesn't match the assigned device/VM
+        # Check for primary IP assignment that doesn't match the assigned device/VM
+        if self.pk and type(self.assigned_object) is Interface:
             device = Device.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if device:
-                if self.interface is None:
+                if self.assigned_object is None:
                     raise ValidationError({
-                        'interface': "IP address is primary for device {} but not assigned".format(device)
+                        'interface': f"IP address is primary for device {device} but not assigned to an interface"
                     })
-                elif (device.primary_ip4 == self or device.primary_ip6 == self) and self.interface.device != device:
+                elif self.assigned_object.device != device:
                     raise ValidationError({
-                        'interface': "IP address is primary for device {} but assigned to {} ({})".format(
-                            device, self.interface.device, self.interface
-                        )
+                        'interface': f"IP address is primary for device {device} but assigned to "
+                                     f"{self.assigned_object.device} ({self.assigned_object})"
                     })
+        elif self.pk and type(self.assigned_object) is VMInterface:
             vm = VirtualMachine.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if vm:
-                if self.interface is None:
+                if self.assigned_object is None:
                     raise ValidationError({
-                        'interface': "IP address is primary for virtual machine {} but not assigned".format(vm)
+                        'vminterface': f"IP address is primary for virtual machine {vm} but not assigned to an "
+                                       f"interface"
                     })
-                elif (vm.primary_ip4 == self or vm.primary_ip6 == self) and self.interface.virtual_machine != vm:
+                elif self.interface.virtual_machine != vm:
                     raise ValidationError({
-                        'interface': "IP address is primary for virtual machine {} but assigned to {} ({})".format(
-                            vm, self.interface.virtual_machine, self.interface
-                        )
+                        'vminterface': f"IP address is primary for virtual machine {vm} but assigned to "
+                                       f"{self.assigned_object.virtual_machine} ({self.assigned_object})"
                     })
 
     def save(self, *args, **kwargs):
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index 8583ec160..4e2706daf 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -28,32 +28,30 @@
             {% render_field form.tenant %}
         </div>
     </div>
-    {% if obj.assigned_object %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Interface Assignment</strong>
-            </div>
-            <div class="panel-body">
-                <div class="form-group">
-                    <label class="col-md-3 control-label">{{ obj.assigned_object.parent|meta:"verbose_name"|bettertitle }}</label>
-                    <div class="col-md-9">
-                        <p class="form-control-static">
-                            <a href="{{ obj.assigned_object.parent.get_absolute_url }}">{{ obj.assigned_object.parent }}</a>
-                        </p>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">Interface</label>
-                    <div class="col-md-9">
-                        <p class="form-control-static">
-                            <a href="{{ obj.assigned_object.get_absolute_url }}">{{ obj.assigned_object }}</a>
-                        </p>
-                    </div>
-                </div>
-                {% render_field form.primary_for_parent %}
-            </div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Interface Assignment</strong>
         </div>
-    {% endif %}
+        <div class="panel-body">
+            {% with vm_tab_active=obj.vminterface.exists %}
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation"{% if not vm_tab_active %} class="active"{% endif %}><a href="#device" role="tab" data-toggle="tab">Device</a></li>
+                    <li role="presentation"{% if vm_tab_active %} class="active"{% endif %}><a href="#virtualmachine" role="tab" data-toggle="tab">Virtual Machine</a></li>
+                </ul>
+                <div class="tab-content">
+                    <div class="tab-pane{% if not vm_tab_active %} active{% endif %}" id="device">
+                        {% render_field form.device %}
+                        {% render_field form.interface %}
+                    </div>
+                    <div class="tab-pane{% if vm_tab_active %} active{% endif %}" id="virtualmachine">
+                        {% render_field form.virtual_machine %}
+                        {% render_field form.vminterface %}
+                    </div>
+                </div>
+            {% endwith %}
+            {% render_field form.primary_for_parent %}
+        </div>
+    </div>
     <div class="panel panel-default">
         <div class="panel-heading"><strong>NAT IP (Inside)</strong></div>
         <div class="panel-body">

From 2ac53afd96e57f06150ab25160f072bbaf3916a8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 12:44:00 -0400
Subject: [PATCH 213/505] Update changelog for #4721

---
 docs/release-notes/version-2.9.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index ee259a67a..01d409290 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,4 +1,4 @@
-# NetBox v2.8
+# NetBox v2.9
 
 ## v2.9.0 (FUTURE)
 
@@ -33,9 +33,12 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 * The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
 * A `label` field has been added to all device components and component templates.
+* The IP address model now uses a generic foreign key to refer to the assigned interface. The `interface` field on the serializer has been replaced with `assigned_object_type` and `assigned_object_id` for write operations. If one exists, the assigned interface is available as `assigned_object`.
+* The serialized representation of a virtual machine interface now includes only relevant fields: `type`, `lag`, `mgmt_only`, `connected_endpoint_type`, `connected_endpoint`, and `cable` are no longer included.
 
 ### Other Changes
 
+* A new model, `VMInterface` has been introduced to represent interfaces assigned to VirtualMachine instances. Previously, these interfaces utilized the DCIM model `Interface`. Instances will be replicated automatically upon upgrade, however any custom code which references or manipulates virtual machine interfaces will need to be updated accordingly.
 * The `secrets.activate_userkey` permission no longer exists. Instead, `secrets.change_userkey` is checked to determine whether a user has the ability to activate a UserKey.
 * The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
 * Dropped backward compatibility for the `webhooks` Redis queue configuration (use `tasks` instead).

From 59c1e34024dba3f33a8a85e772611eacd22f79f0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 15:12:22 -0400
Subject: [PATCH 214/505] Initial work on #2018: Add name to VirtualChassis

---
 netbox/dcim/api/nested_serializers.py         |  2 +-
 netbox/dcim/api/serializers.py                |  4 +-
 netbox/dcim/forms.py                          | 72 ++++++++++++++++++-
 .../migrations/0110_virtualchassis_name.py    | 46 ++++++++++++
 netbox/dcim/models/__init__.py                | 31 ++++----
 netbox/dcim/signals.py                        | 12 ++--
 netbox/dcim/tables.py                         |  8 ++-
 netbox/dcim/tests/test_api.py                 | 17 ++---
 netbox/dcim/tests/test_views.py               | 24 +++----
 netbox/dcim/views.py                          | 61 ++--------------
 netbox/templates/dcim/device_list.html        |  5 --
 netbox/templates/dcim/virtualchassis.html     | 16 ++++-
 netbox/templates/dcim/virtualchassis_add.html | 22 ++++++
 netbox/templates/inc/nav_menu.html            |  5 ++
 14 files changed, 210 insertions(+), 115 deletions(-)
 create mode 100644 netbox/dcim/migrations/0110_virtualchassis_name.py
 create mode 100644 netbox/templates/dcim/virtualchassis_add.html

diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py
index 83fcd7a2a..5d9380c00 100644
--- a/netbox/dcim/api/nested_serializers.py
+++ b/netbox/dcim/api/nested_serializers.py
@@ -332,7 +332,7 @@ class NestedVirtualChassisSerializer(WritableNestedSerializer):
 
     class Meta:
         model = models.VirtualChassis
-        fields = ['id', 'url', 'master', 'member_count']
+        fields = ['id', 'name', 'url', 'master', 'member_count']
 
 
 #
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index c684b8041..45a908685 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -694,12 +694,12 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer):
 #
 
 class VirtualChassisSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
-    master = NestedDeviceSerializer()
+    master = NestedDeviceSerializer(required=False)
     member_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = VirtualChassis
-        fields = ['id', 'master', 'domain', 'tags', 'member_count']
+        fields = ['id', 'name', 'domain', 'master', 'tags', 'member_count']
 
 
 #
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 099676181..6f51160fa 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -4114,7 +4114,38 @@ class DeviceSelectionForm(forms.Form):
     )
 
 
-class VirtualChassisForm(BootstrapMixin, forms.ModelForm):
+class VirtualChassisCreateForm(BootstrapMixin, forms.ModelForm):
+    site = DynamicModelChoiceField(
+        queryset=Site.objects.all(),
+        required=False,
+        widget=APISelect(
+            filter_for={
+                'rack': 'site_id',
+                'members': 'site_id',
+            }
+        )
+    )
+    rack = DynamicModelChoiceField(
+        queryset=Rack.objects.all(),
+        required=False,
+        widget=APISelect(
+            filter_for={
+                'members': 'rack_id'
+            },
+            attrs={
+                'nullable': 'true',
+            }
+        )
+    )
+    members = DynamicModelMultipleChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+    )
+    initial_position = forms.IntegerField(
+        initial=1,
+        required=False,
+        help_text='Position of the first member device. Increases by one for each additional member.'
+    )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False
@@ -4123,12 +4154,47 @@ class VirtualChassisForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = VirtualChassis
         fields = [
-            'master', 'domain', 'tags',
+            'name', 'domain', 'site', 'rack', 'members', 'initial_position', 'tags',
+        ]
+
+    def save(self, *args, **kwargs):
+        instance = super().save(*args, **kwargs)
+
+        # Assign VC members
+        if instance.pk:
+            initial_position = self.cleaned_data.get('initial_position') or 1
+            for i, member in enumerate(self.cleaned_data['members'], start=initial_position):
+                member.virtual_chassis = instance
+                member.vc_position = i
+                member.save()
+
+        return instance
+
+
+class VirtualChassisForm(BootstrapMixin, forms.ModelForm):
+    master = forms.ModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+    )
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
+
+    class Meta:
+        model = VirtualChassis
+        fields = [
+            'name', 'domain', 'master', 'tags',
         ]
         widgets = {
             'master': SelectWithPK(),
         }
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields['master'].queryset = Device.objects.filter(virtual_chassis=self.instance)
+
 
 class BaseVCMemberFormSet(forms.BaseModelFormSet):
 
@@ -4221,7 +4287,7 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form):
         device = self.cleaned_data['device']
         if device.virtual_chassis is not None:
             raise forms.ValidationError(
-                "Device {} is already assigned to a virtual chassis.".format(device)
+                f"Device {device} is already assigned to a virtual chassis."
             )
         return device
 
diff --git a/netbox/dcim/migrations/0110_virtualchassis_name.py b/netbox/dcim/migrations/0110_virtualchassis_name.py
new file mode 100644
index 000000000..e8455d6fe
--- /dev/null
+++ b/netbox/dcim/migrations/0110_virtualchassis_name.py
@@ -0,0 +1,46 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def copy_master_name(apps, schema_editor):
+    """
+    Copy the master device's name to the VirtualChassis.
+    """
+    VirtualChassis = apps.get_model('dcim', 'VirtualChassis')
+
+    for vc in VirtualChassis.objects.prefetch_related('master'):
+        name = vc.master.name if vc.master.name else f'Unnamed VC #{vc.pk}'
+        VirtualChassis.objects.filter(pk=vc.pk).update(name=name)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0109_interface_remove_vm'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='virtualchassis',
+            options={'ordering': ['name'], 'verbose_name_plural': 'virtual chassis'},
+        ),
+        migrations.AddField(
+            model_name='virtualchassis',
+            name='name',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='virtualchassis',
+            name='master',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vc_master_for', to='dcim.Device'),
+        ),
+        migrations.RunPython(
+            code=copy_master_name,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.AlterField(
+            model_name='virtualchassis',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index d8a5f028c..f930ae02d 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -1572,9 +1572,9 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
                 raise ValidationError({
                     'primary_ip4': f"{self.primary_ip4} is not an IPv4 address."
                 })
-            if self.primary_ip4.interface in vc_interfaces:
+            if self.primary_ip4.assigned_object in vc_interfaces:
                 pass
-            elif self.primary_ip4.nat_inside is not None and self.primary_ip4.nat_inside.interface in vc_interfaces:
+            elif self.primary_ip4.nat_inside is not None and self.primary_ip4.nat_inside.assigned_object in vc_interfaces:
                 pass
             else:
                 raise ValidationError({
@@ -1585,9 +1585,9 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
                 raise ValidationError({
                     'primary_ip6': f"{self.primary_ip6} is not an IPv6 address."
                 })
-            if self.primary_ip6.interface in vc_interfaces:
+            if self.primary_ip6.assigned_object in vc_interfaces:
                 pass
-            elif self.primary_ip6.nat_inside is not None and self.primary_ip6.nat_inside.interface in vc_interfaces:
+            elif self.primary_ip6.nat_inside is not None and self.primary_ip6.nat_inside.assigned_object in vc_interfaces:
                 pass
             else:
                 raise ValidationError({
@@ -1757,7 +1757,12 @@ class VirtualChassis(ChangeLoggedModel):
     master = models.OneToOneField(
         to='Device',
         on_delete=models.PROTECT,
-        related_name='vc_master_for'
+        related_name='vc_master_for',
+        blank=True,
+        null=True
+    )
+    name = models.CharField(
+        max_length=64
     )
     domain = models.CharField(
         max_length=30,
@@ -1767,14 +1772,14 @@ class VirtualChassis(ChangeLoggedModel):
 
     objects = RestrictedQuerySet.as_manager()
 
-    csv_headers = ['master', 'domain']
+    csv_headers = ['name', 'domain', 'master']
 
     class Meta:
-        ordering = ['master']
+        ordering = ['name']
         verbose_name_plural = 'virtual chassis'
 
     def __str__(self):
-        return str(self.master) if hasattr(self, 'master') else 'New Virtual Chassis'
+        return self.name
 
     def get_absolute_url(self):
         return reverse('dcim:virtualchassis', kwargs={'pk': self.pk})
@@ -1783,9 +1788,9 @@ class VirtualChassis(ChangeLoggedModel):
 
         # Verify that the selected master device has been assigned to this VirtualChassis. (Skip when creating a new
         # VirtualChassis.)
-        if self.pk and self.master not in self.members.all():
+        if self.pk and self.master and self.master not in self.members.all():
             raise ValidationError({
-                'master': "The selected master is not assigned to this virtual chassis."
+                'master': f"The selected master ({self.master}) is not assigned to this virtual chassis."
             })
 
     def delete(self, *args, **kwargs):
@@ -1799,8 +1804,7 @@ class VirtualChassis(ChangeLoggedModel):
         )
         if interfaces:
             raise ProtectedError(
-                "Unable to delete virtual chassis {}. There are member interfaces which form a cross-chassis "
-                "LAG".format(self),
+                f"Unable to delete virtual chassis {self}. There are member interfaces which form a cross-chassis LAG",
                 interfaces
             )
 
@@ -1808,8 +1812,9 @@ class VirtualChassis(ChangeLoggedModel):
 
     def to_csv(self):
         return (
-            self.master,
+            self.name,
             self.domain,
+            self.master.name if self.master else None,
         )
 
 
diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py
index c94ecf61e..556cde6a5 100644
--- a/netbox/dcim/signals.py
+++ b/netbox/dcim/signals.py
@@ -10,14 +10,12 @@ from .models import Cable, Device, VirtualChassis
 @receiver(post_save, sender=VirtualChassis)
 def assign_virtualchassis_master(instance, created, **kwargs):
     """
-    When a VirtualChassis is created, automatically assign its master device to the VC.
+    When a VirtualChassis is created, automatically assign its master device (if any) to the VC.
     """
-    if created:
-        devices = Device.objects.filter(pk=instance.master.pk)
-        for device in devices:
-            device.virtual_chassis = instance
-            device.vc_position = None
-            device.save()
+    if created and instance.master:
+        instance.master.virtual_chassis = instance
+        instance.master.vc_position = 1
+        instance.master.save()
 
 
 @receiver(pre_delete, sender=VirtualChassis)
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 82b2414ad..6aa41ab44 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -1167,7 +1167,9 @@ class InventoryItemTable(BaseTable):
 class VirtualChassisTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(
-        accessor=Accessor('master__name'),
+        linkify=True
+    )
+    master = tables.Column(
         linkify=True
     )
     member_count = tables.Column(
@@ -1179,8 +1181,8 @@ class VirtualChassisTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = VirtualChassis
-        fields = ('pk', 'name', 'domain', 'member_count', 'tags')
-        default_columns = ('pk', 'name', 'domain', 'member_count')
+        fields = ('pk', 'name', 'domain', 'master', 'member_count', 'tags')
+        default_columns = ('pk', 'name', 'domain', 'master', 'member_count')
 
 
 #
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index cb0eed994..052a77e53 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -2003,7 +2003,7 @@ class ConnectedDeviceTest(APITestCase):
 
 class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
     model = VirtualChassis
-    brief_fields = ['id', 'master', 'member_count', 'url']
+    brief_fields = ['id', 'master', 'member_count', 'name', 'url']
 
     @classmethod
     def setUpTestData(cls):
@@ -2040,9 +2040,9 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
 
         # Create three VirtualChassis with three members each
         virtual_chassis = (
-            VirtualChassis(master=devices[0], domain='domain-1'),
-            VirtualChassis(master=devices[3], domain='domain-2'),
-            VirtualChassis(master=devices[6], domain='domain-3'),
+            VirtualChassis(name='Virtual Chassis 1', master=devices[0], domain='domain-1'),
+            VirtualChassis(name='Virtual Chassis 2', master=devices[3], domain='domain-2'),
+            VirtualChassis(name='Virtual Chassis 3', master=devices[6], domain='domain-3'),
         )
         VirtualChassis.objects.bulk_create(virtual_chassis)
         Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
@@ -2053,21 +2053,22 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
         Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
 
         cls.update_data = {
-            'master': devices[1].pk,
+            'name': 'Virtual Chassis X',
             'domain': 'domain-x',
+            'master': devices[1].pk,
         }
 
         cls.create_data = [
             {
-                'master': devices[9].pk,
+                'name': 'Virtual Chassis 4',
                 'domain': 'domain-4',
             },
             {
-                'master': devices[10].pk,
+                'name': 'Virtual Chassis 5',
                 'domain': 'domain-5',
             },
             {
-                'master': devices[11].pk,
+                'name': 'Virtual Chassis 6',
                 'domain': 'domain-6',
             },
         ]
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index b9a02b318..23e65eb05 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1563,16 +1563,7 @@ class CableTestCase(
         }
 
 
-# TODO: Change base class to PrimaryObjectViewTestCase
-# Blocked by standard creation, bulk creation views for VirtualChassis (member devices must be selected in bulk)
-class VirtualChassisTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase
-):
+class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = VirtualChassis
 
     @classmethod
@@ -1602,19 +1593,22 @@ class VirtualChassisTestCase(
         Device.objects.bulk_create(devices)
 
         # Create three VirtualChassis with two members each
-        vc1 = VirtualChassis.objects.create(master=devices[0], domain='domain-1')
+        vc1 = VirtualChassis.objects.create(name='VC1', master=devices[0], domain='domain-1')
+        Device.objects.filter(pk=devices[0].pk).update(virtual_chassis=vc1, vc_position=1)
         Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=vc1, vc_position=2)
         Device.objects.filter(pk=devices[2].pk).update(virtual_chassis=vc1, vc_position=3)
-        vc2 = VirtualChassis.objects.create(master=devices[3], domain='domain-2')
+        vc2 = VirtualChassis.objects.create(name='VC2', master=devices[3], domain='domain-2')
+        Device.objects.filter(pk=devices[3].pk).update(virtual_chassis=vc2, vc_position=1)
         Device.objects.filter(pk=devices[4].pk).update(virtual_chassis=vc2, vc_position=2)
         Device.objects.filter(pk=devices[5].pk).update(virtual_chassis=vc2, vc_position=3)
-        vc3 = VirtualChassis.objects.create(master=devices[6], domain='domain-3')
+        vc3 = VirtualChassis.objects.create(name='VC3', master=devices[6], domain='domain-3')
+        Device.objects.filter(pk=devices[6].pk).update(virtual_chassis=vc3, vc_position=1)
         Device.objects.filter(pk=devices[7].pk).update(virtual_chassis=vc3, vc_position=2)
         Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=vc3, vc_position=3)
 
         cls.form_data = {
-            'master': devices[1].pk,
-            'domain': 'domain-x',
+            'name': 'VC4',
+            'domain': 'domain-4',
             # Management form data for VC members
             'form-TOTAL_FORMS': 0,
             'form-INITIAL_FORMS': 3,
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index ba32a7643..f6fe7cf74 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2117,62 +2117,11 @@ class VirtualChassisView(ObjectView):
         })
 
 
-class VirtualChassisCreateView(ObjectPermissionRequiredMixin, View):
+class VirtualChassisCreateView(ObjectEditView):
     queryset = VirtualChassis.objects.all()
-
-    def get_required_permission(self):
-        return 'dcim.add_virtualchassis'
-
-    def post(self, request):
-
-        # Get the list of devices being added to a VirtualChassis
-        pk_form = forms.DeviceSelectionForm(request.POST)
-        pk_form.full_clean()
-        if not pk_form.cleaned_data.get('pk'):
-            messages.warning(request, "No devices were selected.")
-            return redirect('dcim:device_list')
-        device_queryset = Device.objects.filter(
-            pk__in=pk_form.cleaned_data.get('pk')
-        ).prefetch_related('rack').order_by('vc_position')
-
-        VCMemberFormSet = modelformset_factory(
-            model=Device,
-            formset=forms.BaseVCMemberFormSet,
-            form=forms.DeviceVCMembershipForm,
-            extra=0
-        )
-
-        if '_create' in request.POST:
-
-            vc_form = forms.VirtualChassisForm(request.POST)
-            vc_form.fields['master'].queryset = device_queryset
-            formset = VCMemberFormSet(request.POST, queryset=device_queryset)
-
-            if vc_form.is_valid() and formset.is_valid():
-
-                with transaction.atomic():
-
-                    # Assign each device to the VirtualChassis before saving
-                    virtual_chassis = vc_form.save()
-                    devices = formset.save(commit=False)
-                    for device in devices:
-                        device.virtual_chassis = virtual_chassis
-                        device.save()
-
-                return redirect(vc_form.cleaned_data['master'].get_absolute_url())
-
-        else:
-
-            vc_form = forms.VirtualChassisForm()
-            vc_form.fields['master'].queryset = device_queryset
-            formset = VCMemberFormSet(queryset=device_queryset)
-
-        return render(request, 'dcim/virtualchassis_edit.html', {
-            'pk_form': pk_form,
-            'vc_form': vc_form,
-            'formset': formset,
-            'return_url': reverse('dcim:device_list'),
-        })
+    model_form = forms.VirtualChassisCreateForm
+    template_name = 'dcim/virtualchassis_add.html'
+    default_return_url = 'dcim:virtualchassis_list'
 
 
 class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
@@ -2234,7 +2183,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
                 for member in members:
                     member.save()
 
-            return redirect(vc_form.cleaned_data['master'].get_absolute_url())
+            return redirect(virtual_chassis.get_absolute_url())
 
         return render(request, 'dcim/virtualchassis_edit.html', {
             'vc_form': vc_form,
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index ebee21d18..f236a0550 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -17,9 +17,4 @@
             </ul>
         </div>
     {% endif %}
-    {% if perms.dcim.add_virtualchassis %}
-        <button type="submit" name="_edit" formaction="{% url 'dcim:virtualchassis_add' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-primary btn-sm">
-            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Create Virtual Chassis
-        </button>
-    {% endif %}
 {% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index a97c42e4f..c1ad82c5d 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -9,7 +9,9 @@
         <div class="col-sm-8 col-md-9">
             <ol class="breadcrumb">
                 <li><a href="{% url 'dcim:virtualchassis_list' %}">Virtual Chassis</a></li>
-                <li><a href="{% url 'dcim:virtualchassis_list' %}?site={{ virtualchassis.master.site.slug }}">{{ virtualchassis.master.site }}</a></li>
+                {% if virtualchassis.master %}
+                    <li><a href="{% url 'dcim:virtualchassis_list' %}?site={{ virtualchassis.master.site.slug }}">{{ virtualchassis.master.site }}</a></li>
+                {% endif %}
                 <li>{{ virtualchassis }}</li>
             </ol>
         </div>
@@ -63,7 +65,17 @@
                 <tr>
                     <td>Domain</td>
                     <td>{{ virtualchassis.domain|placeholder }}</td>
-
+                </tr>
+                <tr>
+                    <td>Master</td>
+                    <td>
+                        {% if virtualchassis.master %}
+                            <a href="{{ virtualchassis.master.get_absolute_url }}">{{ virtualchassis.master }}</a>
+                        {% else %}
+                            <span class="text-muted">&mdash;</span>
+                        {% endif %}
+                    </td>
+                </tr>
             </table>
         </div>
         {% include 'extras/inc/tags_panel.html' with tags=virtualchassis.tags.all url='dcim:virtualchassis_list' %}
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html
new file mode 100644
index 000000000..07b17f378
--- /dev/null
+++ b/netbox/templates/dcim/virtualchassis_add.html
@@ -0,0 +1,22 @@
+{% extends 'utilities/obj_edit.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Virtual Chassis</strong></div>
+        <div class="panel-body">
+            {% render_field form.name %}
+            {% render_field form.domain %}
+            {% render_field form.tags %}
+        </div>
+    </div>
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Member Devices</strong></div>
+        <div class="panel-body">
+            {% render_field form.site %}
+            {% render_field form.rack %}
+            {% render_field form.members %}
+            {% render_field form.initial_position %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 4704ef613..6aa80f910 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -144,6 +144,11 @@
                             <a href="{% url 'dcim:platform_list' %}">Platforms</a>
                         </li>
                         <li{% if not perms.dcim.view_virtualchassis %} class="disabled"{% endif %}>
+                            {% if perms.dcim.add_virtualchassis %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'dcim:virtualchassis_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                </div>
+                            {% endif %}
                             <a href="{% url 'dcim:virtualchassis_list' %}">Virtual Chassis</a>
                         </li>
                         <li class="divider"></li>

From 36cf40f25cf8ad6b231cba3a2b8d387cced0abd6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 15:29:25 -0400
Subject: [PATCH 215/505] Enable CSV import for virtual chassis

---
 netbox/dcim/forms.py               | 13 +++++++++++++
 netbox/dcim/tests/test_views.py    | 13 +++++++++++--
 netbox/dcim/urls.py                |  1 +
 netbox/dcim/views.py               |  7 +++++++
 netbox/templates/inc/nav_menu.html |  1 +
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 6f51160fa..02b6eaa6e 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -4306,6 +4306,19 @@ class VirtualChassisBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm
         nullable_fields = ['domain']
 
 
+class VirtualChassisCSVForm(CSVModelForm):
+    master = CSVModelChoiceField(
+        queryset=Device.objects.all(),
+        to_field_name='name',
+        required=False,
+        help_text='Master device'
+    )
+
+    class Meta:
+        model = VirtualChassis
+        fields = VirtualChassis.csv_headers
+
+
 class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
     model = VirtualChassis
     q = forms.CharField(
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 23e65eb05..5c5e46853 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1578,7 +1578,6 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             name='Device Role', slug='device-role-1'
         )
 
-        # Create 9 member Devices
         devices = (
             Device(device_type=device_type, device_role=device_role, name='Device 1', site=site),
             Device(device_type=device_type, device_role=device_role, name='Device 2', site=site),
@@ -1589,10 +1588,13 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             Device(device_type=device_type, device_role=device_role, name='Device 7', site=site),
             Device(device_type=device_type, device_role=device_role, name='Device 8', site=site),
             Device(device_type=device_type, device_role=device_role, name='Device 9', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 10', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 11', site=site),
+            Device(device_type=device_type, device_role=device_role, name='Device 12', site=site),
         )
         Device.objects.bulk_create(devices)
 
-        # Create three VirtualChassis with two members each
+        # Create three VirtualChassis with three members each
         vc1 = VirtualChassis.objects.create(name='VC1', master=devices[0], domain='domain-1')
         Device.objects.filter(pk=devices[0].pk).update(virtual_chassis=vc1, vc_position=1)
         Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=vc1, vc_position=2)
@@ -1616,6 +1618,13 @@ class VirtualChassisTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'form-MAX_NUM_FORMS': 1000,
         }
 
+        cls.csv_data = (
+            "name,domain,master",
+            "VC4,Domain 4,Device 10",
+            "VC5,Domain 5,Device 11",
+            "VC6,Domain 6,Device 12",
+        )
+
         cls.bulk_edit_data = {
             'domain': 'domain-x',
         }
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index a0d6bdc92..347ac7064 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -321,6 +321,7 @@ urlpatterns = [
     # Virtual chassis
     path('virtual-chassis/', views.VirtualChassisListView.as_view(), name='virtualchassis_list'),
     path('virtual-chassis/add/', views.VirtualChassisCreateView.as_view(), name='virtualchassis_add'),
+    path('virtual-chassis/import/', views.VirtualChassisBulkImportView.as_view(), name='virtualchassis_import'),
     path('virtual-chassis/edit/', views.VirtualChassisBulkEditView.as_view(), name='virtualchassis_bulk_edit'),
     path('virtual-chassis/delete/', views.VirtualChassisBulkDeleteView.as_view(), name='virtualchassis_bulk_delete'),
     path('virtual-chassis/<int:pk>/', views.VirtualChassisView.as_view(), name='virtualchassis'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index f6fe7cf74..840b9890f 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2304,6 +2304,13 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL
         })
 
 
+class VirtualChassisBulkImportView(BulkImportView):
+    queryset = VirtualChassis.objects.all()
+    model_form = forms.VirtualChassisCSVForm
+    table = tables.VirtualChassisTable
+    default_return_url = 'dcim:virtualchassis_list'
+
+
 class VirtualChassisBulkEditView(BulkEditView):
     queryset = VirtualChassis.objects.all()
     filterset = filters.VirtualChassisFilterSet
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index 6aa80f910..f22baf7cc 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -147,6 +147,7 @@
                             {% if perms.dcim.add_virtualchassis %}
                                 <div class="buttons pull-right">
                                     <a href="{% url 'dcim:virtualchassis_add' %}" class="btn btn-xs btn-success" title="Add"><i class="fa fa-plus"></i></a>
+                                    <a href="{% url 'dcim:virtualchassis_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
                                 </div>
                             {% endif %}
                             <a href="{% url 'dcim:virtualchassis_list' %}">Virtual Chassis</a>

From e2398c8c0e2932d6d0adad9dd4c6033c66d394d5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 15:57:52 -0400
Subject: [PATCH 216/505] Fix signal logic

---
 netbox/dcim/signals.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/signals.py b/netbox/dcim/signals.py
index 556cde6a5..aab82e502 100644
--- a/netbox/dcim/signals.py
+++ b/netbox/dcim/signals.py
@@ -13,9 +13,10 @@ def assign_virtualchassis_master(instance, created, **kwargs):
     When a VirtualChassis is created, automatically assign its master device (if any) to the VC.
     """
     if created and instance.master:
-        instance.master.virtual_chassis = instance
-        instance.master.vc_position = 1
-        instance.master.save()
+        master = Device.objects.get(pk=instance.master.pk)
+        master.virtual_chassis = instance
+        master.vc_position = 1
+        master.save()
 
 
 @receiver(pre_delete, sender=VirtualChassis)

From 2303034c92277746219f80e134cc8ea58c292182 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 16:22:37 -0400
Subject: [PATCH 217/505] Changelog for #2018

---
 docs/release-notes/version-2.9.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 01d409290..5b98dabb0 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -10,6 +10,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 ### Enhancements
 
+* [#2018](https://github.com/netbox-community/netbox/issues/2018) - Add `name` field to virtual chassis model
 * [#3703](https://github.com/netbox-community/netbox/issues/3703) - Tags must be created administratively before being assigned to an object
 * [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
@@ -35,6 +36,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * A `label` field has been added to all device components and component templates.
 * The IP address model now uses a generic foreign key to refer to the assigned interface. The `interface` field on the serializer has been replaced with `assigned_object_type` and `assigned_object_id` for write operations. If one exists, the assigned interface is available as `assigned_object`.
 * The serialized representation of a virtual machine interface now includes only relevant fields: `type`, `lag`, `mgmt_only`, `connected_endpoint_type`, `connected_endpoint`, and `cable` are no longer included.
+* dcim.VirtualChassis: Added a mandatory `name` field
 
 ### Other Changes
 
@@ -43,3 +45,5 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
 * Dropped backward compatibility for the `webhooks` Redis queue configuration (use `tasks` instead).
 * Dropped backward compatibility for the `/admin/webhook-backend-status` URL (moved to `/admin/background-tasks/`).
+* Virtual chassis are now created by navigating to `/dcim/virtual-chassis/add` rather than via the devices list.
+* A name is required when creating a virtual chassis.

From ba138de53bd2f529aaf8ba9b904b9002da955ed8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 24 Jun 2020 16:27:44 -0400
Subject: [PATCH 218/505] Fix display of tags

---
 netbox/templates/extras/inc/tags_panel.html | 2 +-
 netbox/utilities/tables.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
index 7eeab8ec9..2024d4ab7 100644
--- a/netbox/templates/extras/inc/tags_panel.html
+++ b/netbox/templates/extras/inc/tags_panel.html
@@ -4,7 +4,7 @@
         <strong>Tags</strong>
     </div>
     <div class="panel-body">
-        {% for tag in tags.unrestricted %}
+        {% for tag in tags.all %}
             {% tag tag url %}
         {% empty %}
             <span class="text-muted">No tags assigned</span>
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 5e277e633..10e408b43 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -151,7 +151,7 @@ class TagColumn(tables.TemplateColumn):
     Display a list of tags assigned to the object.
     """
     template_code = """
-    {% for tag in value.all.unrestricted %}
+    {% for tag in value.all %}
         {% include 'utilities/templatetags/tag.html' %}
     {% empty %}
         <span class="text-muted">&mdash;</span>

From 68ef5177f0519d1bb889a51974fdd5f075c8b0f0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 10:48:21 -0400
Subject: [PATCH 219/505] Introduce template filters for checking dynamic
 permissions

---
 netbox/utilities/templatetags/perms.py | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 netbox/utilities/templatetags/perms.py

diff --git a/netbox/utilities/templatetags/perms.py b/netbox/utilities/templatetags/perms.py
new file mode 100644
index 000000000..f1bbf7549
--- /dev/null
+++ b/netbox/utilities/templatetags/perms.py
@@ -0,0 +1,30 @@
+from django import template
+
+register = template.Library()
+
+
+def _check_permission(user, instance, action):
+    return user.has_perm(
+        perm=f'{instance._meta.app_label}.{action}_{instance._meta.model_name}',
+        obj=instance
+    )
+
+
+@register.filter()
+def can_view(user, instance):
+    return _check_permission(user, instance, 'view')
+
+
+@register.filter()
+def can_add(user, instance):
+    return _check_permission(user, instance, 'add')
+
+
+@register.filter()
+def can_change(user, instance):
+    return _check_permission(user, instance, 'change')
+
+
+@register.filter()
+def can_delete(user, instance):
+    return _check_permission(user, instance, 'delete')

From 2f19350ff57a3d538a6ca4477d2084303e05d734 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 10:49:30 -0400
Subject: [PATCH 220/505] Tweak url_name template filter to work with URLs
 which need a PK

---
 netbox/utilities/templatetags/helpers.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index a70e917d8..425a2fca2 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -5,7 +5,6 @@ import re
 import yaml
 from django import template
 from django.conf import settings
-from django.urls import NoReverseMatch, reverse
 from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
 from markdown import markdown
@@ -79,14 +78,7 @@ def url_name(model, action):
     """
     Return the URL name for the given model and action, or None if invalid.
     """
-    url_name = '{}:{}_{}'.format(model._meta.app_label, model._meta.model_name, action)
-    try:
-        # Validate and return the URL name. We don't return the actual URL yet because many of the templates
-        # are written to pass a name to {% url %}.
-        reverse(url_name)
-        return url_name
-    except NoReverseMatch:
-        return None
+    return '{}:{}_{}'.format(model._meta.app_label, model._meta.model_name, action)
 
 
 @register.filter()

From 909ddd653c3072c2fcad8bb27115015ee15a8dc4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 10:53:00 -0400
Subject: [PATCH 221/505] Extend ObjectView to provide a default get() method

---
 netbox/utilities/views.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index cf282a8c0..0fdb2f89e 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -127,6 +127,25 @@ class ObjectView(ObjectPermissionRequiredMixin, View):
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'view')
 
+    def get_template_name(self):
+        """
+        Return self.template_name if set. Otherwise, resolve the template path by model app_label and name.
+        """
+        if hasattr(self, 'template_name'):
+            return self.template_name
+        model_opts = self.queryset.model._meta
+        return f'{model_opts.app_label}/{model_opts.model_name}.html'
+
+    def get(self, request, pk):
+        """
+        Generic GET handler for accessing an object by PK
+        """
+        instance = get_object_or_404(self.queryset, pk=pk)
+
+        return render(request, self.get_template_name(), {
+            'instance': instance,
+        })
+
 
 class ObjectListView(ObjectPermissionRequiredMixin, View):
     """

From ecf40e1525c07ca029d4a5ff8d4c251707d7cccd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 11:00:25 -0400
Subject: [PATCH 222/505] Add/update device component templates

---
 netbox/templates/dcim/consoleport.html       |  95 +++++++++++++++++
 netbox/templates/dcim/consoleserverport.html |  95 +++++++++++++++++
 netbox/templates/dcim/device_component.html  |  39 +++++++
 netbox/templates/dcim/devicebay.html         |  62 +++++++++++
 netbox/templates/dcim/frontport.html         |  83 +++++++++++++++
 netbox/templates/dcim/interface.html         |  79 ++++----------
 netbox/templates/dcim/poweroutlet.html       | 103 +++++++++++++++++++
 netbox/templates/dcim/powerport.html         | 103 +++++++++++++++++++
 netbox/templates/dcim/rearport.html          |  77 ++++++++++++++
 9 files changed, 679 insertions(+), 57 deletions(-)
 create mode 100644 netbox/templates/dcim/consoleport.html
 create mode 100644 netbox/templates/dcim/consoleserverport.html
 create mode 100644 netbox/templates/dcim/device_component.html
 create mode 100644 netbox/templates/dcim/devicebay.html
 create mode 100644 netbox/templates/dcim/frontport.html
 create mode 100644 netbox/templates/dcim/poweroutlet.html
 create mode 100644 netbox/templates/dcim/powerport.html
 create mode 100644 netbox/templates/dcim/rearport.html

diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
new file mode 100644
index 000000000..f1f2c4c1c
--- /dev/null
+++ b/netbox/templates/dcim/consoleport.html
@@ -0,0 +1,95 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Console Port</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        {% if instance.connected_endpoint %}
+                            <tr>
+                                <td>Device</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.device.get_absolute_url }}">{{ instance.connected_endpoint.device }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Name</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.get_absolute_url }}">{{ instance.connected_endpoint.name }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Type</td>
+                                <td>{{ instance.connected_endpoint.get_type_display|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>{{ instance.connected_endpoint.description|placeholder }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:consoleport_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.connection_status %}
+                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
new file mode 100644
index 000000000..8d7ca0b43
--- /dev/null
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -0,0 +1,95 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Console Server Port</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        {% if instance.connected_endpoint %}
+                            <tr>
+                                <td>Device</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.device.get_absolute_url }}">{{ instance.connected_endpoint.device }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Name</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.get_absolute_url }}">{{ instance.connected_endpoint.name }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Type</td>
+                                <td>{{ instance.connected_endpoint.get_type_display|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>{{ instance.connected_endpoint.description|placeholder }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:consoleserverport_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.connection_status %}
+                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html
new file mode 100644
index 000000000..d2a1ad660
--- /dev/null
+++ b/netbox/templates/dcim/device_component.html
@@ -0,0 +1,39 @@
+{% extends 'base.html' %}
+{% load helpers %}
+{% load perms %}
+
+{% block header %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
+                <li><a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a></li>
+                <li><a href="{% url instance|url_name:"list" %}?device_id={{ instance.device.pk }}">{{ instance|meta:"verbose_name_plural"|bettertitle }}</a></li>
+                <li>{{ instance }}</li>
+            </ol>
+        </div>
+    </div>
+    <div class="pull-right noprint">
+        {% if request.user|can_change:instance %}
+            <a href="{% url instance|url_name:"edit" pk=instance.pk %}" class="btn btn-warning">
+                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
+            </a>
+        {% endif %}
+        {% if request.user|can_delete:instance %}
+            <a href="{% url instance|url_name:"delete" pk=instance.pk %}" class="btn btn-danger">
+                <span class="fa fa-trash" aria-hidden="true"></span> Delete
+            </a>
+        {% endif %}
+    </div>
+    <h1>{% block title %}{{ instance.device }} / {{ instance }}{% endblock %}</h1>
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ instance.get_absolute_url }}">{{ instance|meta:"verbose_name"|bettertitle }}</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url instance|url_name:"changelog" pk=instance.pk %}">Change Log</a>
+            </li>
+        {% endif %}
+    </ul>
+{% endblock %}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
new file mode 100644
index 000000000..b257cd471
--- /dev/null
+++ b/netbox/templates/dcim/devicebay.html
@@ -0,0 +1,62 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Device Bay</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Installed Device</strong>
+                </div>
+                {% if instance.installed_device %}
+                    {% with device=instance.installed_device %}
+                        <table class="table table-hover panel-body attr-table">
+                            <tr>
+                                <td>Device</td>
+                                <td>
+                                    <a href="{{ device.get_absolute_url }}">{{ device }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Device Type</td>
+                                <td>{{ device.device_type }}</td>
+                            </tr>
+                        </table>
+                    {% endwith %}
+                {% else %}
+                    <div class="panel-body text-muted">
+                        None
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
new file mode 100644
index 000000000..33ce03eb8
--- /dev/null
+++ b/netbox/templates/dcim/frontport.html
@@ -0,0 +1,83 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Front Port</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Rear Port</td>
+                        <td>
+                            <a href="{{ instance.rear_port.get_absolute_url }}">{{ instance.rear_port }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Rear Port Position</td>
+                        <td>{{ instance.rear_port_position }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:frontport_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.cable.status %}
+                                    <span class="label label-success">{{ instance.cable.get_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.cable.get_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 5165169ff..b3163c413 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -1,41 +1,6 @@
-{% extends 'base.html' %}
+{% extends 'dcim/device_component.html' %}
 {% load helpers %}
 
-{% block header %}
-    <div class="row noprint">
-        <div class="col-md-12">
-            <ol class="breadcrumb">
-                <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
-                <li><a href="{{ interface.device.get_absolute_url }}">{{ interface.device }}</a></li>
-                <li>{{ interface }}</li>
-            </ol>
-        </div>
-    </div>
-    <div class="pull-right noprint">
-        {% if perms.dcim.change_interface %}
-            <a href="{% url 'dcim:interface_edit' pk=interface.pk %}" class="btn btn-warning">
-                <span class="fa fa-pencil" aria-hidden="true"></span> Edit
-            </a>
-        {% endif %}
-        {% if perms.dcim.delete_interface %}
-            <a href="{% url 'dcim:interface_delete' pk=interface.pk %}" class="btn btn-danger">
-                <span class="fa fa-trash" aria-hidden="true"></span> Delete
-            </a>
-        {% endif %}
-    </div>
-    <h1>{% block title %}{{ interface.device }} / {{ interface.name }}{% endblock %}</h1>
-    <ul class="nav nav-tabs">
-        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
-            <a href="{{ interface.get_absolute_url }}">Interface</a>
-        </li>
-        {% if perms.extras.view_objectchange %}
-            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
-                <a href="{% url 'dcim:interface_changelog' pk=interface.pk %}">Change Log</a>
-            </li>
-        {% endif %}
-    </ul>
-{% endblock %}
-
 {% block content %}
 <div class="row">
 	<div class="col-md-6">
@@ -47,25 +12,25 @@
                 <tr>
                     <td>Device</td>
                     <td>
-                        <a href="{{ interface.device.get_absolute_url }}">{{ interface.device }}</a>
+                        <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
                     </td>
                 </tr>
                 <tr>
                     <td>Name</td>
-                    <td>{{ interface.name }}</td>
+                    <td>{{ instance.name }}</td>
                 </tr>
                 <tr>
                     <td>Label</td>
-                    <td>{{ interface.label|placeholder }}</td>
+                    <td>{{ instance.label|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Type</td>
-                    <td>{{ interface.get_type_display }}</td>
+                    <td>{{ instance.get_type_display }}</td>
                 </tr>
                 <tr>
                     <td>Enabled</td>
                     <td>
-                        {% if interface.enabled %}
+                        {% if instance.enabled %}
                             <span class="text-success"><i class="fa fa-check"></i></span>
                         {% else %}
                             <span class="text-danger"><i class="fa fa-close"></i></span>
@@ -75,8 +40,8 @@
                 <tr>
                     <td>LAG</td>
                     <td>
-                        {% if interface.lag%}
-                            <a href="{{ interface.lag.get_absolute_url }}">{{ interface.lag }}</a>
+                        {% if instance.lag%}
+                            <a href="{{ instance.lag.get_absolute_url }}">{{ instance.lag }}</a>
                         {% else %}
                             <span class="text-muted">None</span>
                         {% endif %}
@@ -84,31 +49,31 @@
                 </tr>
                 <tr>
                     <td>Description</td>
-                    <td>{{ interface.description|placeholder }} </td>
+                    <td>{{ instance.description|placeholder }} </td>
                 </tr>
                 <tr>
                     <td>MTU</td>
-                    <td>{{ interface.mtu|placeholder }}</td>
+                    <td>{{ instance.mtu|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>MAC Address</td>
-                    <td><span class="text-monospace">{{ interface.mac_address|placeholder }}</span></td>
+                    <td><span class="text-monospace">{{ instance.mac_address|placeholder }}</span></td>
                 </tr>
                 <tr>
                     <td>802.1Q Mode</td>
-                    <td>{{ interface.get_mode_display }}</td>
+                    <td>{{ instance.get_mode_display }}</td>
                 </tr>
             </table>
         </div>
-        {% include 'extras/inc/tags_panel.html' with tags=interface.tags.all %}
+        {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
     </div>
 	<div class="col-md-6">
-        {% if interface.is_connectable %}
+        {% if instance.is_connectable %}
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <strong>Connection</strong>
                 </div>
-                {% if interface.cable %}
+                {% if instance.cable %}
                     <table class="table table-hover panel-body attr-table">
                         {% if connected_interface %}
                             <tr>
@@ -182,8 +147,8 @@
                         <tr>
                             <td>Cable</td>
                             <td>
-                                <a href="{{ interface.cable.get_absolute_url }}">{{ interface.cable }}</a>
-                                <a href="{% url 'dcim:interface_trace' pk=interface.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:interface_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
                                     <i class="fa fa-share-alt" aria-hidden="true"></i>
                                 </a>
                             </td>
@@ -191,10 +156,10 @@
                         <tr>
                             <td>Connection Status</td>
                             <td>
-                                {% if interface.connection_status %}
-                                    <span class="label label-success">{{ interface.get_connection_status_display }}</span>
+                                {% if instance.connection_status %}
+                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
                                 {% else %}
-                                    <span class="label label-info">{{ interface.get_connection_status_display }}</span>
+                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
                                 {% endif %}
                             </td>
                         </tr>
@@ -206,7 +171,7 @@
                 {% endif %}
             </div>
         {% endif %}
-        {% if interface.is_lag %}
+        {% if instance.is_lag %}
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>LAG Members</strong></div>
                 <table class="table table-hover table-headings panel-body">
@@ -218,7 +183,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        {% for member in interface.member_interfaces.all %}
+                        {% for member in instance.member_interfaces.all %}
                             <tr>
                                 <td>
                                     <a href="{{ member.device.get_absolute_url }}">{{ member.device }}</a>
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
new file mode 100644
index 000000000..519bd01df
--- /dev/null
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -0,0 +1,103 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Power Outlet</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Power Port</td>
+                        <td>{{ instance.power_port }}</td>
+                    </tr>
+                    <tr>
+                        <td>Feed Leg</td>
+                        <td>{{ instance.get_feed_leg_display }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        {% if instance.connected_endpoint %}
+                            <tr>
+                                <td>Device</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.device.get_absolute_url }}">{{ instance.connected_endpoint.device }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Name</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.get_absolute_url }}">{{ instance.connected_endpoint.name }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Type</td>
+                                <td>{{ instance.connected_endpoint.get_type_display|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>{{ instance.connected_endpoint.description|placeholder }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:poweroutlet_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.connection_status %}
+                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
new file mode 100644
index 000000000..e7c103c9d
--- /dev/null
+++ b/netbox/templates/dcim/powerport.html
@@ -0,0 +1,103 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Power Port</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Maximum Draw</td>
+                        <td>{{ instance.maximum_draw|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Allocated Draw</td>
+                        <td>{{ instance.allocated_draw|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        {% if instance.connected_endpoint %}
+                            <tr>
+                                <td>Device</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.device.get_absolute_url }}">{{ instance.connected_endpoint.device }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Name</td>
+                                <td>
+                                    <a href="{{ instance.connected_endpoint.get_absolute_url }}">{{ instance.connected_endpoint.name }}</a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Type</td>
+                                <td>{{ instance.connected_endpoint.get_type_display|placeholder }}</td>
+                            </tr>
+                            <tr>
+                                <td>Description</td>
+                                <td>{{ instance.connected_endpoint.description|placeholder }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:powerport_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.connection_status %}
+                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
new file mode 100644
index 000000000..480f26d2c
--- /dev/null
+++ b/netbox/templates/dcim/rearport.html
@@ -0,0 +1,77 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Rear Port</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Positions</td>
+                        <td>{{ instance.positions }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Connection</strong>
+                </div>
+                {% if instance.cable %}
+                    <table class="table table-hover panel-body attr-table">
+                        <tr>
+                            <td>Cable</td>
+                            <td>
+                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                <a href="{% url 'dcim:rearport_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                </a>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Connection Status</td>
+                            <td>
+                                {% if instance.cable.status %}
+                                    <span class="label label-success">{{ instance.cable.get_status_display }}</span>
+                                {% else %}
+                                    <span class="label label-info">{{ instance.cable.get_status_display }}</span>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% else %}
+                    <div class="panel-body text-muted">
+                        Not connected
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+{% endblock %}

From b08d9a5a8e06bb1c2051991923c6d62495f66fc4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 11:01:18 -0400
Subject: [PATCH 223/505] Add individual views for device components

---
 netbox/dcim/models/device_components.py | 16 ++++++++----
 netbox/dcim/urls.py                     | 34 +++++++++++++++++--------
 netbox/dcim/views.py                    | 30 +++++++++++++++++++++-
 3 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 30a276c7d..d94e2484f 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -268,7 +268,7 @@ class ConsolePort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def get_absolute_url(self):
-        return self.device.get_absolute_url()
+        return reverse('dcim:consoleport', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
@@ -325,7 +325,7 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def get_absolute_url(self):
-        return self.device.get_absolute_url()
+        return reverse('dcim:consoleserverport', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
@@ -408,7 +408,7 @@ class PowerPort(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def get_absolute_url(self):
-        return self.device.get_absolute_url()
+        return reverse('dcim:powerport', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
@@ -560,7 +560,7 @@ class PowerOutlet(CableTermination, ComponentModel):
         unique_together = ('device', 'name')
 
     def get_absolute_url(self):
-        return self.device.get_absolute_url()
+        return reverse('dcim:poweroutlet', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
@@ -881,6 +881,9 @@ class FrontPort(CableTermination, ComponentModel):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse('dcim:frontport', kwargs={'pk': self.pk})
+
     def to_csv(self):
         return (
             self.device.identifier,
@@ -946,6 +949,9 @@ class RearPort(CableTermination, ComponentModel):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse('dcim:rearport', kwargs={'pk': self.pk})
+
     def to_csv(self):
         return (
             self.device.identifier,
@@ -1005,7 +1011,7 @@ class DeviceBay(ComponentModel):
         return '{} - {}'.format(self.device.name, self.name)
 
     def get_absolute_url(self):
-        return self.device.get_absolute_url()
+        return reverse('dcim:devicebay', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 347ac7064..2014427b7 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -4,9 +4,9 @@ from extras.views import ObjectChangeLogView, ImageAttachmentEditView
 from ipam.views import ServiceEditView
 from . import views
 from .models import (
-    Cable, ConsolePort, ConsoleServerPort, Device, DeviceRole, DeviceType, FrontPort, Interface, Manufacturer, Platform,
-    PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole, RearPort, Region, Site,
-    VirtualChassis,
+    Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceRole, DeviceType, FrontPort, Interface,
+    Manufacturer, Platform, PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole,
+    RearPort, Region, Site, VirtualChassis,
 )
 
 app_name = 'dcim'
@@ -189,10 +189,12 @@ urlpatterns = [
     path('console-ports/edit/', views.ConsolePortBulkEditView.as_view(), name='consoleport_bulk_edit'),
     # TODO: Bulk rename, disconnect views for ConsolePorts
     path('console-ports/delete/', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'),
-    path('console-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}),
+    path('console-ports/<int:pk>/', views.ConsolePortView.as_view(), name='consoleport'),
     path('console-ports/<int:pk>/edit/', views.ConsolePortEditView.as_view(), name='consoleport_edit'),
     path('console-ports/<int:pk>/delete/', views.ConsolePortDeleteView.as_view(), name='consoleport_delete'),
+    path('console-ports/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='consoleport_changelog', kwargs={'model': ConsolePort}),
     path('console-ports/<int:pk>/trace/', views.CableTraceView.as_view(), name='consoleport_trace', kwargs={'model': ConsolePort}),
+    path('console-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='consoleport_connect', kwargs={'termination_a_type': ConsolePort}),
     path('devices/console-ports/add/', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'),
 
     # Console server ports
@@ -203,10 +205,12 @@ urlpatterns = [
     path('console-server-ports/rename/', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'),
     path('console-server-ports/disconnect/', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'),
     path('console-server-ports/delete/', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'),
-    path('console-server-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}),
+    path('console-server-ports/<int:pk>/', views.ConsoleServerPortView.as_view(), name='consoleserverport'),
     path('console-server-ports/<int:pk>/edit/', views.ConsoleServerPortEditView.as_view(), name='consoleserverport_edit'),
     path('console-server-ports/<int:pk>/delete/', views.ConsoleServerPortDeleteView.as_view(), name='consoleserverport_delete'),
+    path('console-server-ports/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='consoleserverport_changelog', kwargs={'model': ConsoleServerPort}),
     path('console-server-ports/<int:pk>/trace/', views.CableTraceView.as_view(), name='consoleserverport_trace', kwargs={'model': ConsoleServerPort}),
+    path('console-server-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='consoleserverport_connect', kwargs={'termination_a_type': ConsoleServerPort}),
     path('devices/console-server-ports/add/', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'),
 
     # Power ports
@@ -216,10 +220,12 @@ urlpatterns = [
     path('power-ports/edit/', views.PowerPortBulkEditView.as_view(), name='powerport_bulk_edit'),
     # TODO: Bulk rename, disconnect views for PowerPorts
     path('power-ports/delete/', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'),
-    path('power-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}),
+    path('power-ports/<int:pk>/', views.PowerPortView.as_view(), name='powerport'),
     path('power-ports/<int:pk>/edit/', views.PowerPortEditView.as_view(), name='powerport_edit'),
     path('power-ports/<int:pk>/delete/', views.PowerPortDeleteView.as_view(), name='powerport_delete'),
+    path('power-ports/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='powerport_changelog', kwargs={'model': PowerPort}),
     path('power-ports/<int:pk>/trace/', views.CableTraceView.as_view(), name='powerport_trace', kwargs={'model': PowerPort}),
+    path('power-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='powerport_connect', kwargs={'termination_a_type': PowerPort}),
     path('devices/power-ports/add/', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'),
 
     # Power outlets
@@ -230,10 +236,12 @@ urlpatterns = [
     path('power-outlets/rename/', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'),
     path('power-outlets/disconnect/', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'),
     path('power-outlets/delete/', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'),
-    path('power-outlets/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}),
+    path('power-outlets/<int:pk>/', views.PowerOutletView.as_view(), name='poweroutlet'),
     path('power-outlets/<int:pk>/edit/', views.PowerOutletEditView.as_view(), name='poweroutlet_edit'),
     path('power-outlets/<int:pk>/delete/', views.PowerOutletDeleteView.as_view(), name='poweroutlet_delete'),
+    path('power-outlets/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='poweroutlet_changelog', kwargs={'model': PowerOutlet}),
     path('power-outlets/<int:pk>/trace/', views.CableTraceView.as_view(), name='poweroutlet_trace', kwargs={'model': PowerOutlet}),
+    path('power-outlets/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='poweroutlet_connect', kwargs={'termination_a_type': PowerOutlet}),
     path('devices/power-outlets/add/', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'),
 
     # Interfaces
@@ -244,12 +252,12 @@ urlpatterns = [
     path('interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'),
     path('interfaces/disconnect/', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'),
     path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'),
-    path('interfaces/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}),
     path('interfaces/<int:pk>/', views.InterfaceView.as_view(), name='interface'),
     path('interfaces/<int:pk>/edit/', views.InterfaceEditView.as_view(), name='interface_edit'),
     path('interfaces/<int:pk>/delete/', views.InterfaceDeleteView.as_view(), name='interface_delete'),
     path('interfaces/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='interface_changelog', kwargs={'model': Interface}),
     path('interfaces/<int:pk>/trace/', views.CableTraceView.as_view(), name='interface_trace', kwargs={'model': Interface}),
+    path('interfaces/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='interface_connect', kwargs={'termination_a_type': Interface}),
     path('devices/interfaces/add/', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'),
 
     # Front ports
@@ -260,10 +268,12 @@ urlpatterns = [
     path('front-ports/rename/', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'),
     path('front-ports/disconnect/', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'),
     path('front-ports/delete/', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'),
-    path('front-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}),
+    path('front-ports/<int:pk>/', views.FrontPortView.as_view(), name='frontport'),
     path('front-ports/<int:pk>/edit/', views.FrontPortEditView.as_view(), name='frontport_edit'),
     path('front-ports/<int:pk>/delete/', views.FrontPortDeleteView.as_view(), name='frontport_delete'),
+    path('front-ports/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='frontport_changelog', kwargs={'model': FrontPort}),
     path('front-ports/<int:pk>/trace/', views.CableTraceView.as_view(), name='frontport_trace', kwargs={'model': FrontPort}),
+    path('front-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='frontport_connect', kwargs={'termination_a_type': FrontPort}),
     # path('devices/front-ports/add/', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'),
 
     # Rear ports
@@ -274,10 +284,12 @@ urlpatterns = [
     path('rear-ports/rename/', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'),
     path('rear-ports/disconnect/', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'),
     path('rear-ports/delete/', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'),
-    path('rear-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}),
+    path('rear-ports/<int:pk>/', views.RearPortView.as_view(), name='rearport'),
     path('rear-ports/<int:pk>/edit/', views.RearPortEditView.as_view(), name='rearport_edit'),
     path('rear-ports/<int:pk>/delete/', views.RearPortDeleteView.as_view(), name='rearport_delete'),
+    path('rear-ports/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='rearport_changelog', kwargs={'model': RearPort}),
     path('rear-ports/<int:pk>/trace/', views.CableTraceView.as_view(), name='rearport_trace', kwargs={'model': RearPort}),
+    path('rear-ports/<int:termination_a_id>/connect/<str:termination_b_type>/', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}),
     path('devices/rear-ports/add/', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'),
 
     # Device bays
@@ -287,8 +299,10 @@ urlpatterns = [
     path('device-bays/edit/', views.DeviceBayBulkEditView.as_view(), name='devicebay_bulk_edit'),
     path('device-bays/rename/', views.DeviceBayBulkRenameView.as_view(), name='devicebay_bulk_rename'),
     path('device-bays/delete/', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'),
+    path('device-bays/<int:pk>/', views.DeviceBayView.as_view(), name='devicebay'),
     path('device-bays/<int:pk>/edit/', views.DeviceBayEditView.as_view(), name='devicebay_edit'),
     path('device-bays/<int:pk>/delete/', views.DeviceBayDeleteView.as_view(), name='devicebay_delete'),
+    path('device-bays/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='devicebay_changelog', kwargs={'model': DeviceBay}),
     path('device-bays/<int:pk>/populate/', views.DeviceBayPopulateView.as_view(), name='devicebay_populate'),
     path('device-bays/<int:pk>/depopulate/', views.DeviceBayDepopulateView.as_view(), name='devicebay_depopulate'),
     path('devices/device-bays/add/', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 840b9890f..4cf787e3e 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1165,6 +1165,10 @@ class ConsolePortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class ConsolePortView(ObjectView):
+    queryset = ConsolePort.objects.all()
+
+
 class ConsolePortCreateView(ComponentCreateView):
     queryset = ConsolePort.objects.all()
     form = forms.ConsolePortCreateForm
@@ -1214,6 +1218,10 @@ class ConsoleServerPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class ConsoleServerPortView(ObjectView):
+    queryset = ConsoleServerPort.objects.all()
+
+
 class ConsoleServerPortCreateView(ComponentCreateView):
     queryset = ConsoleServerPort.objects.all()
     form = forms.ConsoleServerPortCreateForm
@@ -1273,6 +1281,10 @@ class PowerPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class PowerPortView(ObjectView):
+    queryset = PowerPort.objects.all()
+
+
 class PowerPortCreateView(ComponentCreateView):
     queryset = PowerPort.objects.all()
     form = forms.PowerPortCreateForm
@@ -1322,6 +1334,10 @@ class PowerOutletListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class PowerOutletView(ObjectView):
+    queryset = PowerOutlet.objects.all()
+
+
 class PowerOutletCreateView(ComponentCreateView):
     queryset = PowerOutlet.objects.all()
     form = forms.PowerOutletCreateForm
@@ -1409,7 +1425,7 @@ class InterfaceView(ObjectView):
         )
 
         return render(request, 'dcim/interface.html', {
-            'interface': interface,
+            'instance': interface,
             'connected_interface': interface._connected_interface,
             'connected_circuittermination': interface._connected_circuittermination,
             'ipaddress_table': ipaddress_table,
@@ -1477,6 +1493,10 @@ class FrontPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class FrontPortView(ObjectView):
+    queryset = FrontPort.objects.all()
+
+
 class FrontPortCreateView(ComponentCreateView):
     queryset = FrontPort.objects.all()
     form = forms.FrontPortCreateForm
@@ -1536,6 +1556,10 @@ class RearPortListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class RearPortView(ObjectView):
+    queryset = RearPort.objects.all()
+
+
 class RearPortCreateView(ComponentCreateView):
     queryset = RearPort.objects.all()
     form = forms.RearPortCreateForm
@@ -1597,6 +1621,10 @@ class DeviceBayListView(ObjectListView):
     action_buttons = ('import', 'export')
 
 
+class DeviceBayView(ObjectView):
+    queryset = DeviceBay.objects.all()
+
+
 class DeviceBayCreateView(ComponentCreateView):
     queryset = DeviceBay.objects.all()
     form = forms.DeviceBayCreateForm

From 3badfd756c597a1a1f59609ae25a3efe9d6c88fd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 11:04:42 -0400
Subject: [PATCH 224/505] Extend DeviceComponentViewTestCase to include
 GetObjectViewTestCase

---
 netbox/dcim/tests/test_views.py           | 16 +++++++++++-----
 netbox/utilities/testing/views.py         |  1 +
 netbox/virtualization/tests/test_views.py |  5 +----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 5c5e46853..079f26fdf 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1194,10 +1194,7 @@ class PowerOutletTestCase(ViewTestCases.DeviceComponentViewTestCase):
         )
 
 
-class InterfaceTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.DeviceComponentViewTestCase,
-):
+class InterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
     model = Interface
 
     @classmethod
@@ -1425,7 +1422,16 @@ class DeviceBayTestCase(ViewTestCases.DeviceComponentViewTestCase):
         )
 
 
-class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
+# TODO: Convert to DeviceComponentViewTestCase?
+class InventoryItemTestCase(
+    ViewTestCases.EditObjectViewTestCase,
+    ViewTestCases.DeleteObjectViewTestCase,
+    ViewTestCases.ListObjectsViewTestCase,
+    ViewTestCases.BulkCreateObjectsViewTestCase,
+    ViewTestCases.BulkImportObjectsViewTestCase,
+    ViewTestCases.BulkEditObjectsViewTestCase,
+    ViewTestCases.BulkDeleteObjectsViewTestCase
+):
     model = InventoryItem
 
     @classmethod
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 774ceac85..2cf32616c 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -917,6 +917,7 @@ class ViewTestCases:
         maxDiff = None
 
     class DeviceComponentViewTestCase(
+        GetObjectViewTestCase,
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
         ListObjectsViewTestCase,
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 408558779..ec4159dd4 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -189,10 +189,7 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         }
 
 
-class VMInterfaceTestCase(
-    ViewTestCases.GetObjectViewTestCase,
-    ViewTestCases.DeviceComponentViewTestCase,
-):
+class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
     model = VMInterface
 
     @classmethod

From 2001cfe864e0b80e13ac9ac666f82182c7077a05 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 11:56:31 -0400
Subject: [PATCH 225/505] Update and simplify device component tables

---
 netbox/dcim/tables.py | 238 +++++++++---------------------------------
 netbox/dcim/views.py  |  50 +++++----
 2 files changed, 75 insertions(+), 213 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 6aa41ab44..9979bea1a 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -490,18 +490,6 @@ class ConsolePortTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class ConsolePortImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = ConsolePort
-        fields = ('device', 'name', 'description')
-        empty_text = False
-
-
 class ConsoleServerPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('consoleserverporttemplate'),
@@ -515,18 +503,6 @@ class ConsoleServerPortTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class ConsoleServerPortImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = ConsoleServerPort
-        fields = ('device', 'name', 'description')
-        empty_text = False
-
-
 class PowerPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('powerporttemplate'),
@@ -540,18 +516,6 @@ class PowerPortTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class PowerPortImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = PowerPort
-        fields = ('device', 'name', 'description', 'maximum_draw', 'allocated_draw')
-        empty_text = False
-
-
 class PowerOutletTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('poweroutlettemplate'),
@@ -565,18 +529,6 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class PowerOutletImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = PowerOutlet
-        fields = ('device', 'name', 'description', 'power_port', 'feed_leg')
-        empty_text = False
-
-
 class InterfaceTemplateTable(ComponentTemplateTable):
     mgmt_only = BooleanColumn(
         verbose_name='Management Only'
@@ -593,20 +545,6 @@ class InterfaceTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class InterfaceImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = Interface
-        fields = (
-            'device', 'name', 'description', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'mode',
-        )
-        empty_text = False
-
-
 class FrontPortTemplateTable(ComponentTemplateTable):
     rear_port_position = tables.Column(
         verbose_name='Position'
@@ -623,18 +561,6 @@ class FrontPortTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class FrontPortImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = FrontPort
-        fields = ('device', 'name', 'description', 'type', 'rear_port', 'rear_port_position')
-        empty_text = False
-
-
 class RearPortTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('rearporttemplate'),
@@ -648,18 +574,6 @@ class RearPortTemplateTable(ComponentTemplateTable):
         empty_text = "None"
 
 
-class RearPortImportTable(BaseTable):
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
-    )
-
-    class Meta(BaseTable.Meta):
-        model = RearPort
-        fields = ('device', 'name', 'description', 'type', 'position')
-        empty_text = False
-
-
 class DeviceBayTemplateTable(ComponentTemplateTable):
     actions = tables.TemplateColumn(
         template_code=get_component_template_actions('devicebaytemplate'),
@@ -855,144 +769,94 @@ class DeviceImportTable(BaseTable):
 # Device components
 #
 
-class DeviceComponentDetailTable(BaseTable):
+class DeviceComponentTable(BaseTable):
     pk = ToggleColumn()
-    device = tables.LinkColumn()
-    name = tables.Column(order_by=('_name',))
-    cable = tables.LinkColumn()
+    device = tables.Column(
+        linkify=True
+    )
+    name = tables.Column(
+        linkify=True,
+        order_by=('_name',)
+    )
+    cable = tables.Column(
+        linkify=True
+    )
 
     class Meta(BaseTable.Meta):
         order_by = ('device', 'name')
-        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
-        sequence = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
 
 
-class ConsolePortTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
+class ConsolePortTable(DeviceComponentTable):
 
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = ConsolePort
-        fields = ('name', 'label', 'type')
+        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'description')
 
 
-class ConsolePortDetailTable(DeviceComponentDetailTable):
+class ConsoleServerPortTable(DeviceComponentTable):
 
-    class Meta(DeviceComponentDetailTable.Meta, ConsolePortTable.Meta):
-        pass
-
-
-class ConsoleServerPortTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
-
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = ConsoleServerPort
-        fields = ('name', 'label', 'description')
+        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'description')
 
 
-class ConsoleServerPortDetailTable(DeviceComponentDetailTable):
+class PowerPortTable(DeviceComponentTable):
 
-    class Meta(DeviceComponentDetailTable.Meta, ConsoleServerPortTable.Meta):
-        pass
-
-
-class PowerPortTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
-
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = PowerPort
-        fields = ('name', 'label', 'type')
+        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'maximum_draw', 'allocated_draw', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description')
 
 
-class PowerPortDetailTable(DeviceComponentDetailTable):
+class PowerOutletTable(DeviceComponentTable):
 
-    class Meta(DeviceComponentDetailTable.Meta, PowerPortTable.Meta):
-        pass
-
-
-class PowerOutletTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
-
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = PowerOutlet
-        fields = ('name', 'label', 'type', 'description')
+        fields = ('pk', 'device', 'name', 'label', 'type', 'description', 'power_port', 'feed_leg', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description')
 
 
-class PowerOutletDetailTable(DeviceComponentDetailTable):
-
-    class Meta(DeviceComponentDetailTable.Meta, PowerOutletTable.Meta):
-        pass
-
-
-class InterfaceTable(BaseTable):
-
-    class Meta(BaseTable.Meta):
-        model = Interface
-        fields = ('name', 'label', 'type', 'lag', 'enabled', 'mgmt_only', 'description')
-
-
-class InterfaceDetailTable(DeviceComponentDetailTable):
+class InterfaceTable(DeviceComponentTable):
     enabled = BooleanColumn()
 
-    class Meta(DeviceComponentDetailTable.Meta, InterfaceTable.Meta):
-        fields = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description', 'cable')
-        sequence = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description', 'cable')
+    class Meta(DeviceComponentTable.Meta):
+        model = Interface
+        fields = (
+            'pk', 'device', 'name', 'label', 'enabled', 'type', 'mgmt_only', 'mtu', 'mode', 'description', 'cable',
+        )
+        default_columns = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description')
 
 
-class FrontPortTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
+class FrontPortTable(DeviceComponentTable):
+    rear_port_position = tables.Column(
+        verbose_name='Position'
+    )
 
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = FrontPort
-        fields = ('name', 'label', 'type', 'rear_port', 'rear_port_position', 'description')
-        empty_text = "None"
+        fields = ('pk', 'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description')
 
 
-class FrontPortDetailTable(DeviceComponentDetailTable):
+class RearPortTable(DeviceComponentTable):
 
-    class Meta(DeviceComponentDetailTable.Meta, FrontPortTable.Meta):
-        pass
-
-
-class RearPortTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
-
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = RearPort
-        fields = ('name', 'label', 'type', 'positions', 'description')
-        empty_text = "None"
+        fields = ('pk', 'device', 'name', 'label', 'type', 'positions', 'description', 'cable')
+        default_columns = ('pk', 'device', 'name', 'label', 'type', 'description')
 
 
-class RearPortDetailTable(DeviceComponentDetailTable):
+class DeviceBayTable(DeviceComponentTable):
+    installed_device = tables.Column(
+        linkify=True
+    )
 
-    class Meta(DeviceComponentDetailTable.Meta, RearPortTable.Meta):
-        pass
-
-
-class DeviceBayTable(BaseTable):
-    name = tables.Column(order_by=('_name',))
-
-    class Meta(BaseTable.Meta):
+    class Meta(DeviceComponentTable.Meta):
         model = DeviceBay
-        fields = ('name', 'label', 'description')
-
-
-class DeviceBayDetailTable(DeviceComponentDetailTable):
-    installed_device = tables.LinkColumn()
-
-    class Meta(DeviceBayTable.Meta):
         fields = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
-        sequence = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
-        exclude = ('cable',)
-
-
-class DeviceBayImportTable(BaseTable):
-    device = tables.LinkColumn('dcim:device', args=[Accessor('device.pk')], verbose_name='Device')
-    installed_device = tables.LinkColumn('dcim:device', args=[Accessor('installed_device.pk')], verbose_name='Installed Device')
-
-    class Meta(BaseTable.Meta):
-        model = DeviceBay
-        fields = ('device', 'name', 'installed_device', 'description')
-        empty_text = False
+        default_columns = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
 
 
 #
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 4cf787e3e..1f3b61a42 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1158,10 +1158,10 @@ class DeviceBulkDeleteView(BulkDeleteView):
 #
 
 class ConsolePortListView(ObjectListView):
-    queryset = ConsolePort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = ConsolePort.objects.prefetch_related('device', 'cable')
     filterset = filters.ConsolePortFilterSet
     filterset_form = forms.ConsolePortFilterForm
-    table = tables.ConsolePortDetailTable
+    table = tables.ConsolePortTable
     action_buttons = ('import', 'export')
 
 
@@ -1188,7 +1188,7 @@ class ConsolePortDeleteView(ObjectDeleteView):
 class ConsolePortBulkImportView(BulkImportView):
     queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortCSVForm
-    table = tables.ConsolePortImportTable
+    table = tables.ConsolePortTable
     default_return_url = 'dcim:consoleport_list'
 
 
@@ -1211,10 +1211,10 @@ class ConsolePortBulkDeleteView(BulkDeleteView):
 #
 
 class ConsoleServerPortListView(ObjectListView):
-    queryset = ConsoleServerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = ConsoleServerPort.objects.prefetch_related('device', 'cable')
     filterset = filters.ConsoleServerPortFilterSet
     filterset_form = forms.ConsoleServerPortFilterForm
-    table = tables.ConsoleServerPortDetailTable
+    table = tables.ConsoleServerPortTable
     action_buttons = ('import', 'export')
 
 
@@ -1241,7 +1241,7 @@ class ConsoleServerPortDeleteView(ObjectDeleteView):
 class ConsoleServerPortBulkImportView(BulkImportView):
     queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortCSVForm
-    table = tables.ConsoleServerPortImportTable
+    table = tables.ConsoleServerPortTable
     default_return_url = 'dcim:consoleserverport_list'
 
 
@@ -1274,10 +1274,10 @@ class ConsoleServerPortBulkDeleteView(BulkDeleteView):
 #
 
 class PowerPortListView(ObjectListView):
-    queryset = PowerPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = PowerPort.objects.prefetch_related('device', 'cable')
     filterset = filters.PowerPortFilterSet
     filterset_form = forms.PowerPortFilterForm
-    table = tables.PowerPortDetailTable
+    table = tables.PowerPortTable
     action_buttons = ('import', 'export')
 
 
@@ -1304,7 +1304,7 @@ class PowerPortDeleteView(ObjectDeleteView):
 class PowerPortBulkImportView(BulkImportView):
     queryset = PowerPort.objects.all()
     model_form = forms.PowerPortCSVForm
-    table = tables.PowerPortImportTable
+    table = tables.PowerPortTable
     default_return_url = 'dcim:powerport_list'
 
 
@@ -1327,10 +1327,10 @@ class PowerPortBulkDeleteView(BulkDeleteView):
 #
 
 class PowerOutletListView(ObjectListView):
-    queryset = PowerOutlet.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = PowerOutlet.objects.prefetch_related('device', 'cable')
     filterset = filters.PowerOutletFilterSet
     filterset_form = forms.PowerOutletFilterForm
-    table = tables.PowerOutletDetailTable
+    table = tables.PowerOutletTable
     action_buttons = ('import', 'export')
 
 
@@ -1357,7 +1357,7 @@ class PowerOutletDeleteView(ObjectDeleteView):
 class PowerOutletBulkImportView(BulkImportView):
     queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletCSVForm
-    table = tables.PowerOutletImportTable
+    table = tables.PowerOutletTable
     default_return_url = 'dcim:poweroutlet_list'
 
 
@@ -1390,10 +1390,10 @@ class PowerOutletBulkDeleteView(BulkDeleteView):
 #
 
 class InterfaceListView(ObjectListView):
-    queryset = Interface.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = Interface.objects.prefetch_related('device', 'cable')
     filterset = filters.InterfaceFilterSet
     filterset_form = forms.InterfaceFilterForm
-    table = tables.InterfaceDetailTable
+    table = tables.InterfaceTable
     action_buttons = ('import', 'export')
 
 
@@ -1453,7 +1453,7 @@ class InterfaceDeleteView(ObjectDeleteView):
 class InterfaceBulkImportView(BulkImportView):
     queryset = Interface.objects.all()
     model_form = forms.InterfaceCSVForm
-    table = tables.InterfaceImportTable
+    table = tables.InterfaceTable
     default_return_url = 'dcim:interface_list'
 
 
@@ -1486,10 +1486,10 @@ class InterfaceBulkDeleteView(BulkDeleteView):
 #
 
 class FrontPortListView(ObjectListView):
-    queryset = FrontPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = FrontPort.objects.prefetch_related('device', 'cable')
     filterset = filters.FrontPortFilterSet
     filterset_form = forms.FrontPortFilterForm
-    table = tables.FrontPortDetailTable
+    table = tables.FrontPortTable
     action_buttons = ('import', 'export')
 
 
@@ -1516,7 +1516,7 @@ class FrontPortDeleteView(ObjectDeleteView):
 class FrontPortBulkImportView(BulkImportView):
     queryset = FrontPort.objects.all()
     model_form = forms.FrontPortCSVForm
-    table = tables.FrontPortImportTable
+    table = tables.FrontPortTable
     default_return_url = 'dcim:frontport_list'
 
 
@@ -1549,10 +1549,10 @@ class FrontPortBulkDeleteView(BulkDeleteView):
 #
 
 class RearPortListView(ObjectListView):
-    queryset = RearPort.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable')
+    queryset = RearPort.objects.prefetch_related('device', 'cable')
     filterset = filters.RearPortFilterSet
     filterset_form = forms.RearPortFilterForm
-    table = tables.RearPortDetailTable
+    table = tables.RearPortTable
     action_buttons = ('import', 'export')
 
 
@@ -1579,7 +1579,7 @@ class RearPortDeleteView(ObjectDeleteView):
 class RearPortBulkImportView(BulkImportView):
     queryset = RearPort.objects.all()
     model_form = forms.RearPortCSVForm
-    table = tables.RearPortImportTable
+    table = tables.RearPortTable
     default_return_url = 'dcim:rearport_list'
 
 
@@ -1612,12 +1612,10 @@ class RearPortBulkDeleteView(BulkDeleteView):
 #
 
 class DeviceBayListView(ObjectListView):
-    queryset = DeviceBay.objects.prefetch_related(
-        'device', 'device__site', 'installed_device', 'installed_device__site'
-    )
+    queryset = DeviceBay.objects.prefetch_related('device', 'installed_device')
     filterset = filters.DeviceBayFilterSet
     filterset_form = forms.DeviceBayFilterForm
-    table = tables.DeviceBayDetailTable
+    table = tables.DeviceBayTable
     action_buttons = ('import', 'export')
 
 
@@ -1711,7 +1709,7 @@ class DeviceBayDepopulateView(ObjectEditView):
 class DeviceBayBulkImportView(BulkImportView):
     queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayCSVForm
-    table = tables.DeviceBayImportTable
+    table = tables.DeviceBayTable
     default_return_url = 'dcim:devicebay_list'
 
 

From 8695714c657a802b16a08d6783b3ce508e5e5698 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 12:09:56 -0400
Subject: [PATCH 226/505] Fix device component changelog display

---
 netbox/extras/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index ff8ce75e0..af5106a33 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -296,6 +296,7 @@ class ObjectChangeLogView(View):
 
         return render(request, 'extras/object_changelog.html', {
             object_var: obj,
+            'instance': obj,  # We'll eventually standardize on 'instance` for the object variable name
             'table': objectchanges_table,
             'base_template': base_template,
             'active_tab': 'changelog',

From 0fcdd639417d606f8127ce71425a4eb93983917d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 12:21:25 -0400
Subject: [PATCH 227/505] Linkify components under device view

---
 netbox/templates/dcim/inc/consoleport.html       | 3 ++-
 netbox/templates/dcim/inc/consoleserverport.html | 3 ++-
 netbox/templates/dcim/inc/devicebay.html         | 3 ++-
 netbox/templates/dcim/inc/frontport.html         | 3 ++-
 netbox/templates/dcim/inc/poweroutlet.html       | 3 ++-
 netbox/templates/dcim/inc/powerport.html         | 3 ++-
 netbox/templates/dcim/inc/rearport.html          | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html
index 9089f19b4..02afd8f99 100644
--- a/netbox/templates/dcim/inc/consoleport.html
+++ b/netbox/templates/dcim/inc/consoleport.html
@@ -2,7 +2,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-keyboard-o"></i> {{ cp }}
+        <i class="fa fa-fw fa-keyboard-o"></i>
+        <a href="{{ cp.get_absolute_url }}">{{ cp }}</a>
     </td>
 
     {# Type #}
diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html
index 0d649f812..dcf168ae7 100644
--- a/netbox/templates/dcim/inc/consoleserverport.html
+++ b/netbox/templates/dcim/inc/consoleserverport.html
@@ -11,7 +11,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-keyboard-o"></i> {{ csp }}
+        <i class="fa fa-fw fa-keyboard-o"></i>
+        <a href="{{ csp.get_absolute_url }}">{{ csp }}</a>
     </td>
 
     {# Type #}
diff --git a/netbox/templates/dcim/inc/devicebay.html b/netbox/templates/dcim/inc/devicebay.html
index 70ce7e8df..ee6a66d8f 100644
--- a/netbox/templates/dcim/inc/devicebay.html
+++ b/netbox/templates/dcim/inc/devicebay.html
@@ -9,7 +9,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-{% if devicebay.installed_device %}dot-circle-o{% else %}circle-o{% endif %}"></i> {{ devicebay.name }}
+        <i class="fa fa-fw fa-{% if devicebay.installed_device %}dot-circle-o{% else %}circle-o{% endif %}"></i>
+        <a href="{{ devicebay.get_absolute_url }}">{{ devicebay.name }}</a>
     </td>
 
     {# Status #}
diff --git a/netbox/templates/dcim/inc/frontport.html b/netbox/templates/dcim/inc/frontport.html
index 12915f64d..f267479f3 100644
--- a/netbox/templates/dcim/inc/frontport.html
+++ b/netbox/templates/dcim/inc/frontport.html
@@ -10,7 +10,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-square{% if not frontport.cable %}-o{% endif %}"></i> {{ frontport }}
+        <i class="fa fa-fw fa-square{% if not frontport.cable %}-o{% endif %}"></i>
+        <a href="{{ frontport.get_absolute_url }}">{{ frontport }}</a>
     </td>
 
     {# Type #}
diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html
index 1c0630310..d9a77d647 100644
--- a/netbox/templates/dcim/inc/poweroutlet.html
+++ b/netbox/templates/dcim/inc/poweroutlet.html
@@ -11,7 +11,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-bolt"></i> {{ po }}
+        <i class="fa fa-fw fa-bolt"></i>
+        <a href="{{ po.get_absolute_url }}">{{ po }}</a>
     </td>
 
     {# Type #}
diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html
index 045b25dfd..c3293e959 100644
--- a/netbox/templates/dcim/inc/powerport.html
+++ b/netbox/templates/dcim/inc/powerport.html
@@ -2,7 +2,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-bolt"></i> {{ pp }}
+        <i class="fa fa-fw fa-bolt"></i>
+        <a href="{{ pp.get_absolute_url }}">{{ pp }}</a>
     </td>
 
     {# Type #}
diff --git a/netbox/templates/dcim/inc/rearport.html b/netbox/templates/dcim/inc/rearport.html
index 73ccd6b70..c1e5482d0 100644
--- a/netbox/templates/dcim/inc/rearport.html
+++ b/netbox/templates/dcim/inc/rearport.html
@@ -10,7 +10,8 @@
 
     {# Name #}
     <td>
-        <i class="fa fa-fw fa-square{% if not rearport.cable %}-o{% endif %}"></i> {{ rearport }}
+        <i class="fa fa-fw fa-square{% if not rearport.cable %}-o{% endif %}"></i>
+        <a href="{{ rearport.get_absolute_url }}">{{ rearport }}</a>
     </td>
 
     {# Type #}

From 103a44991aed8246e2792d8f54da1f0725bba0e3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 12:22:21 -0400
Subject: [PATCH 228/505] Changelog for #4788

---
 docs/release-notes/version-2.9.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 5b98dabb0..39d763bb5 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -14,6 +14,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#3703](https://github.com/netbox-community/netbox/issues/3703) - Tags must be created administratively before being assigned to an object
 * [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
+* [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
 
 ### Configuration Changes
 

From 5aa2a6eefe022593ddc334f9902aaf101fa927c6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 13:27:01 -0400
Subject: [PATCH 229/505] Add plugin buttons & content to device component
 views

---
 netbox/templates/dcim/consoleport.html       |   8 +
 netbox/templates/dcim/consoleserverport.html |   8 +
 netbox/templates/dcim/device_component.html  |   2 +
 netbox/templates/dcim/devicebay.html         |   8 +
 netbox/templates/dcim/frontport.html         |   8 +
 netbox/templates/dcim/interface.html         | 420 ++++++++++---------
 netbox/templates/dcim/poweroutlet.html       |   8 +
 netbox/templates/dcim/powerport.html         |   8 +
 netbox/templates/dcim/rearport.html          |   8 +
 9 files changed, 272 insertions(+), 206 deletions(-)

diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index f1f2c4c1c..63916bcc5 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -34,6 +35,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -90,6 +92,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 8d7ca0b43..cdc43142e 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -34,6 +35,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -90,6 +92,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html
index d2a1ad660..616655066 100644
--- a/netbox/templates/dcim/device_component.html
+++ b/netbox/templates/dcim/device_component.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load helpers %}
 {% load perms %}
+{% load plugins %}
 
 {% block header %}
     <div class="row noprint">
@@ -14,6 +15,7 @@
         </div>
     </div>
     <div class="pull-right noprint">
+        {% plugin_buttons instance %}
         {% if request.user|can_change:instance %}
             <a href="{% url instance|url_name:"edit" pk=instance.pk %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span> Edit
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index b257cd471..3d65e8bde 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -30,6 +31,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -57,6 +59,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 33ce03eb8..8ab51cb30 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -44,6 +45,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -78,6 +80,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index b3163c413..4c0b453ad 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -1,219 +1,227 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
-<div class="row">
-	<div class="col-md-6">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Interface</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Device</td>
-                    <td>
-                        <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Name</td>
-                    <td>{{ instance.name }}</td>
-                </tr>
-                <tr>
-                    <td>Label</td>
-                    <td>{{ instance.label|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Type</td>
-                    <td>{{ instance.get_type_display }}</td>
-                </tr>
-                <tr>
-                    <td>Enabled</td>
-                    <td>
-                        {% if instance.enabled %}
-                            <span class="text-success"><i class="fa fa-check"></i></span>
-                        {% else %}
-                            <span class="text-danger"><i class="fa fa-close"></i></span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>LAG</td>
-                    <td>
-                        {% if instance.lag%}
-                            <a href="{{ instance.lag.get_absolute_url }}">{{ instance.lag }}</a>
-                        {% else %}
-                            <span class="text-muted">None</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ instance.description|placeholder }} </td>
-                </tr>
-                <tr>
-                    <td>MTU</td>
-                    <td>{{ instance.mtu|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>MAC Address</td>
-                    <td><span class="text-monospace">{{ instance.mac_address|placeholder }}</span></td>
-                </tr>
-                <tr>
-                    <td>802.1Q Mode</td>
-                    <td>{{ instance.get_mode_display }}</td>
-                </tr>
-            </table>
-        </div>
-        {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
-    </div>
-	<div class="col-md-6">
-        {% if instance.is_connectable %}
+    <div class="row">
+        <div class="col-md-6">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <strong>Connection</strong>
+                    <strong>Interface</strong>
                 </div>
-                {% if instance.cable %}
-                    <table class="table table-hover panel-body attr-table">
-                        {% if connected_interface %}
-                            <tr>
-                                <td>Device</td>
-                                <td>
-                                    <a href="{{ connected_interface.device.get_absolute_url }}">{{ connected_interface.device }}</a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Name</td>
-                                <td>
-                                    <a href="{{ connected_interface.get_absolute_url }}">{{ connected_interface.name }}</a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Type</td>
-                                <td>{{ connected_interface.get_type_display }}</td>
-                            </tr>
-                            <tr>
-                                <td>Enabled</td>
-                                <td>
-                                    {% if connected_interface.enabled %}
-                                        <span class="text-success"><i class="fa fa-check"></i></span>
-                                    {% else %}
-                                        <span class="text-danger"><i class="fa fa-close"></i></span>
-                                    {% endif %}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>LAG</td>
-                                <td>
-                                    {% if connected_interface.lag%}
-                                        <a href="{{ connected_interface.lag.get_absolute_url }}">{{ connected_interface.lag }}</a>
-                                    {% else %}
-                                        <span class="text-muted">None</span>
-                                    {% endif %}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Description</td>
-                                <td>{{ connected_interface.description|placeholder }}</td>
-                            </tr>
-                            <tr>
-                                <td>MTU</td>
-                                <td>{{ connected_interface.mtu|placeholder }}</td>
-                            </tr>
-                            <tr>
-                                <td>MAC Address</td>
-                                <td>{{ connected_interface.mac_address|placeholder }}</td>
-                            </tr>
-                            <tr>
-                                <td>802.1Q Mode</td>
-                                <td>{{ connected_interface.get_mode_display }}</td>
-                            </tr>
-                        {% elif connected_circuittermination %}
-                            {% with ct=connected_circuittermination %}
-                                <tr>
-                                    <td>Provider</td>
-                                    <td><a href="{{ ct.circuit.provider.get_absolute_url }}">{{ ct.circuit.provider }}</a></td>
-                                </tr>
-                                <tr>
-                                    <td>Circuit</td>
-                                    <td><a href="{{ ct.circuit.get_absolute_url }}">{{ ct.circuit }}</a></td>
-                                </tr>
-                                <tr>
-                                    <td>Side</td>
-                                    <td>{{ ct.term_side }}</td>
-                                </tr>
-                            {% endwith %}
-                        {% endif %}
-                        <tr>
-                            <td>Cable</td>
-                            <td>
-                                <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
-                                <a href="{% url 'dcim:interface_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                                    <i class="fa fa-share-alt" aria-hidden="true"></i>
-                                </a>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Connection Status</td>
-                            <td>
-                                {% if instance.connection_status %}
-                                    <span class="label label-success">{{ instance.get_connection_status_display }}</span>
-                                {% else %}
-                                    <span class="label label-info">{{ instance.get_connection_status_display }}</span>
-                                {% endif %}
-                            </td>
-                        </tr>
-                    </table>
-                {% else %}
-                    <div class="panel-body text-muted">
-                        Not connected
-                    </div>
-                {% endif %}
-            </div>
-        {% endif %}
-        {% if instance.is_lag %}
-            <div class="panel panel-default">
-                <div class="panel-heading"><strong>LAG Members</strong></div>
-                <table class="table table-hover table-headings panel-body">
-                    <thead>
-                        <tr>
-                            <th>Parent</th>
-                            <th>Interface</th>
-                            <th>Type</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for member in instance.member_interfaces.all %}
-                            <tr>
-                                <td>
-                                    <a href="{{ member.device.get_absolute_url }}">{{ member.device }}</a>
-                                </td>
-                                <td>
-                                    <a href="{{ member.get_absolute_url }}">{{ member }}</a>
-                                </td>
-                                <td>
-                                    {{ member.get_type_display }}
-                                </td>
-                            </tr>
-                        {% empty %}
-                            <tr>
-                                <td colspan="3" class="text-muted">No member interfaces</td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Type</td>
+                        <td>{{ instance.get_type_display }}</td>
+                    </tr>
+                    <tr>
+                        <td>Enabled</td>
+                        <td>
+                            {% if instance.enabled %}
+                                <span class="text-success"><i class="fa fa-check"></i></span>
+                            {% else %}
+                                <span class="text-danger"><i class="fa fa-close"></i></span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>LAG</td>
+                        <td>
+                            {% if instance.lag%}
+                                <a href="{{ instance.lag.get_absolute_url }}">{{ instance.lag }}</a>
+                            {% else %}
+                                <span class="text-muted">None</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }} </td>
+                    </tr>
+                    <tr>
+                        <td>MTU</td>
+                        <td>{{ instance.mtu|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>MAC Address</td>
+                        <td><span class="text-monospace">{{ instance.mac_address|placeholder }}</span></td>
+                    </tr>
+                    <tr>
+                        <td>802.1Q Mode</td>
+                        <td>{{ instance.get_mode_display }}</td>
+                    </tr>
                 </table>
             </div>
-        {% endif %}
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
+        </div>
+        <div class="col-md-6">
+            {% if instance.is_connectable %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <strong>Connection</strong>
+                    </div>
+                    {% if instance.cable %}
+                        <table class="table table-hover panel-body attr-table">
+                            {% if connected_interface %}
+                                <tr>
+                                    <td>Device</td>
+                                    <td>
+                                        <a href="{{ connected_interface.device.get_absolute_url }}">{{ connected_interface.device }}</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Name</td>
+                                    <td>
+                                        <a href="{{ connected_interface.get_absolute_url }}">{{ connected_interface.name }}</a>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Type</td>
+                                    <td>{{ connected_interface.get_type_display }}</td>
+                                </tr>
+                                <tr>
+                                    <td>Enabled</td>
+                                    <td>
+                                        {% if connected_interface.enabled %}
+                                            <span class="text-success"><i class="fa fa-check"></i></span>
+                                        {% else %}
+                                            <span class="text-danger"><i class="fa fa-close"></i></span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>LAG</td>
+                                    <td>
+                                        {% if connected_interface.lag%}
+                                            <a href="{{ connected_interface.lag.get_absolute_url }}">{{ connected_interface.lag }}</a>
+                                        {% else %}
+                                            <span class="text-muted">None</span>
+                                        {% endif %}
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Description</td>
+                                    <td>{{ connected_interface.description|placeholder }}</td>
+                                </tr>
+                                <tr>
+                                    <td>MTU</td>
+                                    <td>{{ connected_interface.mtu|placeholder }}</td>
+                                </tr>
+                                <tr>
+                                    <td>MAC Address</td>
+                                    <td>{{ connected_interface.mac_address|placeholder }}</td>
+                                </tr>
+                                <tr>
+                                    <td>802.1Q Mode</td>
+                                    <td>{{ connected_interface.get_mode_display }}</td>
+                                </tr>
+                            {% elif connected_circuittermination %}
+                                {% with ct=connected_circuittermination %}
+                                    <tr>
+                                        <td>Provider</td>
+                                        <td><a href="{{ ct.circuit.provider.get_absolute_url }}">{{ ct.circuit.provider }}</a></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Circuit</td>
+                                        <td><a href="{{ ct.circuit.get_absolute_url }}">{{ ct.circuit }}</a></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Side</td>
+                                        <td>{{ ct.term_side }}</td>
+                                    </tr>
+                                {% endwith %}
+                            {% endif %}
+                            <tr>
+                                <td>Cable</td>
+                                <td>
+                                    <a href="{{ instance.cable.get_absolute_url }}">{{ instance.cable }}</a>
+                                    <a href="{% url 'dcim:interface_trace' pk=instance.pk %}" class="btn btn-primary btn-xs" title="Trace">
+                                        <i class="fa fa-share-alt" aria-hidden="true"></i>
+                                    </a>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Connection Status</td>
+                                <td>
+                                    {% if instance.connection_status %}
+                                        <span class="label label-success">{{ instance.get_connection_status_display }}</span>
+                                    {% else %}
+                                        <span class="label label-info">{{ instance.get_connection_status_display }}</span>
+                                    {% endif %}
+                                </td>
+                            </tr>
+                        </table>
+                    {% else %}
+                        <div class="panel-body text-muted">
+                            Not connected
+                        </div>
+                    {% endif %}
+                </div>
+            {% endif %}
+            {% if instance.is_lag %}
+                <div class="panel panel-default">
+                    <div class="panel-heading"><strong>LAG Members</strong></div>
+                    <table class="table table-hover table-headings panel-body">
+                        <thead>
+                            <tr>
+                                <th>Parent</th>
+                                <th>Interface</th>
+                                <th>Type</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for member in instance.member_interfaces.all %}
+                                <tr>
+                                    <td>
+                                        <a href="{{ member.device.get_absolute_url }}">{{ member.device }}</a>
+                                    </td>
+                                    <td>
+                                        <a href="{{ member.get_absolute_url }}">{{ member }}</a>
+                                    </td>
+                                    <td>
+                                        {{ member.get_type_display }}
+                                    </td>
+                                </tr>
+                            {% empty %}
+                                <tr>
+                                    <td colspan="3" class="text-muted">No member interfaces</td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            {% endif %}
+            {% plugin_right_page device %}
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-        {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'panel_table.html' with table=ipaddress_table heading="IP Addresses" %}
+        </div>
     </div>
-</div>
-<div class="row">
-    <div class="col-md-12">
-        {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+    <div class="row">
+        <div class="col-md-12">
+            {% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
+        </div>
     </div>
-</div>
 {% endblock %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 519bd01df..cddcffd6f 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -42,6 +43,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -98,6 +100,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index e7c103c9d..8642bd8fb 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -42,6 +43,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -98,6 +100,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 480f26d2c..982d53eaa 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -1,5 +1,6 @@
 {% extends 'dcim/device_component.html' %}
 {% load helpers %}
+{% load plugins %}
 
 {% block content %}
     <div class="row">
@@ -38,6 +39,7 @@
                 </table>
             </div>
             {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
         </div>
         <div class="col-md-6">
             <div class="panel panel-default">
@@ -72,6 +74,12 @@
                     </div>
                 {% endif %}
             </div>
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
         </div>
     </div>
 {% endblock %}

From ec9b33ac977759a6a4671b46362227d49cb79766 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 13:36:54 -0400
Subject: [PATCH 230/505] Fix typo

---
 netbox/templates/dcim/interface.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 4c0b453ad..e3d67eb2c 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -206,7 +206,7 @@
                     </table>
                 </div>
             {% endif %}
-            {% plugin_right_page device %}
+            {% plugin_right_page instance %}
         </div>
     </div>
     <div class="row">

From 1dbae5b64c757ca2a4bf92704b1511dd57ba7640 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 14:18:29 -0400
Subject: [PATCH 231/505] Closes #4792: Add bulk rename capability for console
 and power ports

---
 docs/release-notes/version-2.9.md          |   1 +
 netbox/dcim/forms.py                       |  44 +-
 netbox/dcim/urls.py                        |   6 +-
 netbox/dcim/views.py                       |  14 +-
 netbox/templates/dcim/device.html          | 550 +++++++++++----------
 netbox/templates/dcim/inc/consoleport.html |   7 +
 netbox/templates/dcim/inc/powerport.html   |   7 +
 netbox/utilities/views.py                  |  15 +-
 8 files changed, 328 insertions(+), 316 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 39d763bb5..799acbcfe 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -15,6 +15,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 * [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
+* [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
 
 ### Configuration Changes
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 02b6eaa6e..e4beaa56d 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -23,7 +23,7 @@ from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
-    BulkRenameForm, ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
+    ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
     DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField,
     NumericArrayField, SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
     BOOLEAN_WITH_BLANK_CHOICES,
@@ -2375,13 +2375,6 @@ class ConsoleServerPortBulkEditForm(
         ]
 
 
-class ConsoleServerPortBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ConsoleServerPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
-
 class ConsoleServerPortBulkDisconnectForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=ConsoleServerPort.objects.all(),
@@ -2610,13 +2603,6 @@ class PowerOutletBulkEditForm(
             self.fields['power_port'].widget.attrs['disabled'] = True
 
 
-class PowerOutletBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerOutlet.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class PowerOutletBulkDisconnectForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=PowerOutlet.objects.all(),
@@ -2922,13 +2908,6 @@ class InterfaceBulkEditForm(
             self.cleaned_data['tagged_vlans'] = []
 
 
-class InterfaceBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
-
 class InterfaceBulkDisconnectForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Interface.objects.all(),
@@ -3115,13 +3094,6 @@ class FrontPortBulkEditForm(
         ]
 
 
-class FrontPortBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=FrontPort.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class FrontPortBulkDisconnectForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=FrontPort.objects.all(),
@@ -3245,13 +3217,6 @@ class RearPortBulkEditForm(
         ]
 
 
-class RearPortBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RearPort.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class RearPortBulkDisconnectForm(ConfirmationForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=RearPort.objects.all(),
@@ -3354,13 +3319,6 @@ class DeviceBayBulkEditForm(
         )
 
 
-class DeviceBayBulkRenameForm(BulkRenameForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=DeviceBay.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
-
 class DeviceBayCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 2014427b7..43fa259bd 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -187,7 +187,8 @@ urlpatterns = [
     path('console-ports/add/', views.ConsolePortCreateView.as_view(), name='consoleport_add'),
     path('console-ports/import/', views.ConsolePortBulkImportView.as_view(), name='consoleport_import'),
     path('console-ports/edit/', views.ConsolePortBulkEditView.as_view(), name='consoleport_bulk_edit'),
-    # TODO: Bulk rename, disconnect views for ConsolePorts
+    path('console-ports/rename/', views.ConsolePortBulkRenameView.as_view(), name='consoleport_bulk_rename'),
+    # TODO: Bulk disconnect view for ConsolePorts
     path('console-ports/delete/', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'),
     path('console-ports/<int:pk>/', views.ConsolePortView.as_view(), name='consoleport'),
     path('console-ports/<int:pk>/edit/', views.ConsolePortEditView.as_view(), name='consoleport_edit'),
@@ -218,7 +219,8 @@ urlpatterns = [
     path('power-ports/add/', views.PowerPortCreateView.as_view(), name='powerport_add'),
     path('power-ports/import/', views.PowerPortBulkImportView.as_view(), name='powerport_import'),
     path('power-ports/edit/', views.PowerPortBulkEditView.as_view(), name='powerport_bulk_edit'),
-    # TODO: Bulk rename, disconnect views for PowerPorts
+    path('power-ports/rename/', views.PowerPortBulkRenameView.as_view(), name='powerport_bulk_rename'),
+    # TODO: Bulk disconnect view for PowerPorts
     path('power-ports/delete/', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'),
     path('power-ports/<int:pk>/', views.PowerPortView.as_view(), name='powerport'),
     path('power-ports/<int:pk>/edit/', views.PowerPortEditView.as_view(), name='powerport_edit'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 1f3b61a42..7ca150e3d 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1199,6 +1199,10 @@ class ConsolePortBulkEditView(BulkEditView):
     form = forms.ConsolePortBulkEditForm
 
 
+class ConsolePortBulkRenameView(BulkRenameView):
+    queryset = ConsolePort.objects.all()
+
+
 class ConsolePortBulkDeleteView(BulkDeleteView):
     queryset = ConsolePort.objects.all()
     filterset = filters.ConsolePortFilterSet
@@ -1254,7 +1258,6 @@ class ConsoleServerPortBulkEditView(BulkEditView):
 
 class ConsoleServerPortBulkRenameView(BulkRenameView):
     queryset = ConsoleServerPort.objects.all()
-    form = forms.ConsoleServerPortBulkRenameForm
 
 
 class ConsoleServerPortBulkDisconnectView(BulkDisconnectView):
@@ -1315,6 +1318,10 @@ class PowerPortBulkEditView(BulkEditView):
     form = forms.PowerPortBulkEditForm
 
 
+class PowerPortBulkRenameView(BulkRenameView):
+    queryset = PowerPort.objects.all()
+
+
 class PowerPortBulkDeleteView(BulkDeleteView):
     queryset = PowerPort.objects.all()
     filterset = filters.PowerPortFilterSet
@@ -1370,7 +1377,6 @@ class PowerOutletBulkEditView(BulkEditView):
 
 class PowerOutletBulkRenameView(BulkRenameView):
     queryset = PowerOutlet.objects.all()
-    form = forms.PowerOutletBulkRenameForm
 
 
 class PowerOutletBulkDisconnectView(BulkDisconnectView):
@@ -1466,7 +1472,6 @@ class InterfaceBulkEditView(BulkEditView):
 
 class InterfaceBulkRenameView(BulkRenameView):
     queryset = Interface.objects.all()
-    form = forms.InterfaceBulkRenameForm
 
 
 class InterfaceBulkDisconnectView(BulkDisconnectView):
@@ -1529,7 +1534,6 @@ class FrontPortBulkEditView(BulkEditView):
 
 class FrontPortBulkRenameView(BulkRenameView):
     queryset = FrontPort.objects.all()
-    form = forms.FrontPortBulkRenameForm
 
 
 class FrontPortBulkDisconnectView(BulkDisconnectView):
@@ -1592,7 +1596,6 @@ class RearPortBulkEditView(BulkEditView):
 
 class RearPortBulkRenameView(BulkRenameView):
     queryset = RearPort.objects.all()
-    form = forms.RearPortBulkRenameForm
 
 
 class RearPortBulkDisconnectView(BulkDisconnectView):
@@ -1722,7 +1725,6 @@ class DeviceBayBulkEditView(BulkEditView):
 
 class DeviceBayBulkRenameView(BulkRenameView):
     queryset = DeviceBay.objects.all()
-    form = forms.DeviceBayBulkRenameForm
 
 
 class DeviceBayBulkDeleteView(BulkDeleteView):
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index a42250a3d..c7f58aa4d 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -326,34 +326,79 @@
             {% plugin_left_page device %}
         </div>
         <div class="col-md-6">
-            {% if console_ports or power_ports %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Console / Power</strong>
-                    </div>
-                    <table class="table table-hover panel-body component-list">
-                        {% for cp in console_ports %}
-                            {% include 'dcim/inc/consoleport.html' %}
-                        {% endfor %}
-                        {% for pp in power_ports %}
-                            {% include 'dcim/inc/powerport.html' %}
-                        {% endfor %}
-                    </table>
-                    {% if perms.dcim.add_interface or perms.dcim.add_consoleport or perms.dcim.add_powerport %}
-                        <div class="panel-footer text-right noprint">
-                            {% if perms.dcim.add_consoleport %}
-                                <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
-                                </a>
+            {% if console_ports %}
+                <form method="post">
+                    {% csrf_token %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Console Ports</strong>
+                        </div>
+                        <table class="table table-hover panel-body component-list">
+                            {% for cp in console_ports %}
+                                {% include 'dcim/inc/consoleport.html' %}
+                            {% endfor %}
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if console_ports and perms.dcim.change_consoleport %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                                <button type="submit" name="_edit" formaction="{% url 'dcim:consoleport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                </button>
                             {% endif %}
-                            {% if perms.dcim.add_powerport %}
-                                <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
-                                </a>
+                            {% if console_ports and perms.dcim.delete_consoleport %}
+                                <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                </button>
+                            {% endif %}
+                            {% if console_ports and perms.dcim.change_consoleport %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
+                                    </a>
+                                </div>
                             {% endif %}
                         </div>
-                    {% endif %}
-                </div>
+                    </div>
+                </form>
+            {% endif %}
+            {% if power_ports %}
+                <form method="post">
+                    {% csrf_token %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Power Ports</strong>
+                        </div>
+                        <table class="table table-hover panel-body component-list">
+                            {% for pp in power_ports %}
+                                {% include 'dcim/inc/powerport.html' %}
+                            {% endfor %}
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if power_ports and perms.dcim.change_powerport %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                                <button type="submit" name="_edit" formaction="{% url 'dcim:powerport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                </button>
+                            {% endif %}
+                            {% if power_ports and perms.dcim.delete_powerport %}
+                                <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                </button>
+                            {% endif %}
+                            {% if power_ports and perms.dcim.change_powerport %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
+                                    </a>
+                                </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                </form>
             {% endif %}
             {% if power_ports and poweroutlets %}
                 <div class="panel panel-default">
@@ -501,262 +546,242 @@
     <div class="row">
         <div class="col-md-12">
             {% if device_bays or device.device_type.is_parent_device %}
-                {% if perms.dcim.delete_devicebay %}
-                    <form method="post">
+                <form method="post">
                     {% csrf_token %}
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Device Bays</strong>
-                    </div>
-                    <table class="table table-hover table-headings panel-body component-list">
-                        <thead>
-                            <tr>
-                                {% if perms.dcim.change_devicebay or perms.dcim.delete_devicebay %}
-                                    <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                {% endif %}
-                                <th>Name</th>
-                                <th>Status</th>
-                                <th>Description</th>
-                                <th colspan="2">Installed Device</th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for devicebay in device_bays %}
-                                {% include 'dcim/inc/devicebay.html' %}
-                            {% empty %}
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Device Bays</strong>
+                        </div>
+                        <table class="table table-hover table-headings panel-body component-list">
+                            <thead>
                                 <tr>
-                                    <td colspan="5" class="text-center text-muted">&mdash; No device bays defined &mdash;</td>
+                                    {% if perms.dcim.change_devicebay or perms.dcim.delete_devicebay %}
+                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                    {% endif %}
+                                    <th>Name</th>
+                                    <th>Status</th>
+                                    <th>Description</th>
+                                    <th colspan="2">Installed Device</th>
+                                    <th></th>
                                 </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    <div class="panel-footer noprint">
-                        {% if device_bays and perms.dcim.change_devicebay %}
-                            <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                            </button>
-                        {% endif %}
-                        {% if device_bays and perms.dcim.delete_devicebay %}
-                            <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete selected
-                            </button>
-                        {% endif %}
-                        {% if perms.dcim.add_devicebay %}
-                            <div class="pull-right">
-                                <a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add device bays
-                                </a>
-                            </div>
-                            <div class="clearfix"></div>
-                        {% endif %}
-                     </div>
-                </div>
-                {% if perms.dcim.delete_devicebay %}
-                    </form>
-                {% endif %}
+                            </thead>
+                            <tbody>
+                                {% for devicebay in device_bays %}
+                                    {% include 'dcim/inc/devicebay.html' %}
+                                {% empty %}
+                                    <tr>
+                                        <td colspan="5" class="text-center text-muted">&mdash; No device bays defined &mdash;</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if device_bays and perms.dcim.change_devicebay %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                            {% endif %}
+                            {% if device_bays and perms.dcim.delete_devicebay %}
+                                <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete selected
+                                </button>
+                            {% endif %}
+                            {% if perms.dcim.add_devicebay %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add device bays
+                                    </a>
+                                </div>
+                                <div class="clearfix"></div>
+                            {% endif %}
+                         </div>
+                    </div>
+                </form>
             {% endif %}
             {% if interfaces %}
-                {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
-                    <form method="post">
+                <form method="post">
                     {% csrf_token %}
-                    <input type="hidden" name="device" value="{{ device.pk }}" />
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Interfaces</strong>
-                        <div class="pull-right noprint">
-                            <button class="btn btn-default btn-xs toggle-ips" selected="selected">
-                                <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
-                            </button>
-                        </div>
-                        <div class="col-md-2 pull-right noprint">
-                            <input class="form-control interface-filter" type="text" placeholder="Filter" title="RegEx-enabled" style="height: 23px" />
-                        </div>
-                    </div>
-                    <table id="interfaces_table" class="table table-hover table-headings panel-body component-list">
-                        <thead>
-                            <tr>
-                                {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
-                                    <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                {% endif %}
-                                <th>Name</th>
-                                <th>LAG</th>
-                                <th>Description</th>
-                                <th>MTU</th>
-                                <th>Mode</th>
-                                <th>Cable</th>
-                                <th colspan="2">Connection</th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for iface in interfaces %}
-                                {% include 'dcim/inc/interface.html' %}
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    <div class="panel-footer noprint">
-                        {% if interfaces and perms.dcim.change_interface %}
-                            <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                            </button>
-                            <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                            </button>
-                        {% endif %}
-                        {% if interfaces and perms.dcim.change_interface %}
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                            </button>
-                        {% endif %}
-                        {% if interfaces and perms.dcim.delete_interface %}
-                            <button type="submit" name="_delete" formaction="{% url 'dcim:interface_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                            </button>
-                        {% endif %}
-                        {% if perms.dcim.add_interface %}
-                            <div class="pull-right">
-                                <a href="{% url 'dcim:interface_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
-                                </a>
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Interfaces</strong>
+                            <div class="pull-right noprint">
+                                <button class="btn btn-default btn-xs toggle-ips" selected="selected">
+                                    <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
+                                </button>
                             </div>
-                            <div class="clearfix"></div>
-                        {% endif %}
-                     </div>
-                </div>
-                {% if perms.dcim.delete_interface %}
-                    </form>
-                {% endif %}
+                            <div class="col-md-2 pull-right noprint">
+                                <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
+                            </div>
+                        </div>
+                        <table id="interfaces_table" class="table table-hover table-headings panel-body component-list">
+                            <thead>
+                                <tr>
+                                    {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
+                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                    {% endif %}
+                                    <th>Name</th>
+                                    <th>LAG</th>
+                                    <th>Description</th>
+                                    <th>MTU</th>
+                                    <th>Mode</th>
+                                    <th>Cable</th>
+                                    <th colspan="2">Connection</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for iface in interfaces %}
+                                    {% include 'dcim/inc/interface.html' %}
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if interfaces and perms.dcim.change_interface %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                                <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                </button>
+                            {% endif %}
+                            {% if interfaces and perms.dcim.change_interface %}
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
+                            {% endif %}
+                            {% if interfaces and perms.dcim.delete_interface %}
+                                <button type="submit" name="_delete" formaction="{% url 'dcim:interface_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                </button>
+                            {% endif %}
+                            {% if perms.dcim.add_interface %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:interface_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
+                                    </a>
+                                </div>
+                                <div class="clearfix"></div>
+                            {% endif %}
+                         </div>
+                    </div>
+                </form>
             {% endif %}
             {% if consoleserverports %}
-                {% if perms.dcim.delete_consoleserverport %}
-                    <form method="post">
+                <form method="post">
                     {% csrf_token %}
-                    <input type="hidden" name="device" value="{{ device.pk }}" />
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Console Server Ports</strong>
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Console Server Ports</strong>
+                        </div>
+                        <table class="table table-hover table-headings panel-body component-list">
+                            <thead>
+                                <tr>
+                                    {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
+                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                    {% endif %}
+                                    <th>Name</th>
+                                    <th>Type</th>
+                                    <th>Description</th>
+                                    <th>Cable</th>
+                                    <th colspan="2">Connection</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for csp in consoleserverports %}
+                                    {% include 'dcim/inc/consoleserverport.html' %}
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if consoleserverports and perms.dcim.change_consoleport %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                                <button type="submit" name="_edit" formaction="{% url 'dcim:consoleserverport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
+                            {% endif %}
+                            {% if consoleserverports and perms.dcim.delete_consoleserverport %}
+                                <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                </button>
+                            {% endif %}
+                            {% if perms.dcim.add_consoleserverport %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:consoleserverport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console server ports
+                                    </a>
+                                </div>
+                                <div class="clearfix"></div>
+                            {% endif %}
+                        </div>
                     </div>
-                    <table class="table table-hover table-headings panel-body component-list">
-                        <thead>
-                            <tr>
-                                {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
-                                    <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                {% endif %}
-                                <th>Name</th>
-                                <th>Type</th>
-                                <th>Description</th>
-                                <th>Cable</th>
-                                <th colspan="2">Connection</th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for csp in consoleserverports %}
-                                {% include 'dcim/inc/consoleserverport.html' %}
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    <div class="panel-footer noprint">
-                        {% if consoleserverports and perms.dcim.change_consoleport %}
-                            <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                            </button>
-                            <button type="submit" name="_edit" formaction="{% url 'dcim:consoleserverport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                            </button>
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                            </button>
-                        {% endif %}
-                        {% if consoleserverports and perms.dcim.delete_consoleserverport %}
-                            <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                            </button>
-                        {% endif %}
-                        {% if perms.dcim.add_consoleserverport %}
-                            <div class="pull-right">
-                                <a href="{% url 'dcim:consoleserverport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console server ports
-                                </a>
-                            </div>
-                            <div class="clearfix"></div>
-                        {% endif %}
-                    </div>
-                </div>
-                {% if perms.dcim.delete_consoleserverport %}
-                    </form>
-                {% endif %}
+                </form>
             {% endif %}
             {% if poweroutlets %}
-                {% if perms.dcim.delete_poweroutlet %}
-                    <form method="post">
+                <form method="post">
                     {% csrf_token %}
-                    <input type="hidden" name="device" value="{{ device.pk }}" />
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <strong>Power Outlets</strong>
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <strong>Power Outlets</strong>
+                        </div>
+                        <table class="table table-hover table-headings panel-body component-list">
+                            <thead>
+                                <tr>
+                                    {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
+                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                    {% endif %}
+                                    <th>Name</th>
+                                <th>Type</th>
+                                    <th>Input/Leg</th>
+                                    <th>Description</th>
+                                    <th>Cable</th>
+                                    <th colspan="3">Connection</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for po in poweroutlets %}
+                                    {% include 'dcim/inc/poweroutlet.html' %}
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                        <div class="panel-footer noprint">
+                            {% if poweroutlets and perms.dcim.change_powerport %}
+                                <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                </button>
+                                <button type="submit" name="_edit" formaction="{% url 'dcim:poweroutlet_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
+                            {% endif %}
+                            {% if poweroutlets and perms.dcim.delete_poweroutlet %}
+                                <button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                </button>
+                            {% endif %}
+                            {% if perms.dcim.add_poweroutlet %}
+                                <div class="pull-right">
+                                    <a href="{% url 'dcim:poweroutlet_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power outlets
+                                    </a>
+                                </div>
+                                <div class="clearfix"></div>
+                            {% endif %}
+                        </div>
                     </div>
-                    <table class="table table-hover table-headings panel-body component-list">
-                        <thead>
-                            <tr>
-                                {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
-                                    <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                {% endif %}
-                                <th>Name</th>
-                            <th>Type</th>
-                                <th>Input/Leg</th>
-                                <th>Description</th>
-                                <th>Cable</th>
-                                <th colspan="3">Connection</th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for po in poweroutlets %}
-                                {% include 'dcim/inc/poweroutlet.html' %}
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                    <div class="panel-footer noprint">
-                        {% if poweroutlets and perms.dcim.change_powerport %}
-                            <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                            </button>
-                            <button type="submit" name="_edit" formaction="{% url 'dcim:poweroutlet_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                            </button>
-                            <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                            </button>
-                        {% endif %}
-                        {% if poweroutlets and perms.dcim.delete_poweroutlet %}
-                            <button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                            </button>
-                        {% endif %}
-                        {% if perms.dcim.add_poweroutlet %}
-                            <div class="pull-right">
-                                <a href="{% url 'dcim:poweroutlet_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power outlets
-                                </a>
-                            </div>
-                            <div class="clearfix"></div>
-                        {% endif %}
-                    </div>
-                </div>
-                {% if perms.dcim.delete_poweroutlet %}
-                    </form>
-                {% endif %}
+                </form>
             {% endif %}
             {% if front_ports %}
                 <form method="post">
                     {% csrf_token %}
-                    <input type="hidden" name="device" value="{{ device.pk }}" />
                     <div class="panel panel-default">
                         <div class="panel-heading">
                             <strong>Front Ports</strong>
@@ -815,7 +840,6 @@
             {% if rear_ports %}
                 <form method="post">
                     {% csrf_token %}
-                    <input type="hidden" name="device" value="{{ device.pk }}" />
                     <div class="panel panel-default">
                         <div class="panel-heading">
                             <strong>Rear Ports</strong>
diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html
index 02afd8f99..61b4fe045 100644
--- a/netbox/templates/dcim/inc/consoleport.html
+++ b/netbox/templates/dcim/inc/consoleport.html
@@ -1,5 +1,12 @@
 <tr class="consoleport{% if cp.cable %} {{ cp.cable.get_status_class }}{% endif %}">
 
+    {# Checkbox #}
+    {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ cp.pk }}" />
+        </td>
+    {% endif %}
+
     {# Name #}
     <td>
         <i class="fa fa-fw fa-keyboard-o"></i>
diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html
index c3293e959..58eed145a 100644
--- a/netbox/templates/dcim/inc/powerport.html
+++ b/netbox/templates/dcim/inc/powerport.html
@@ -1,5 +1,12 @@
 <tr class="powerport{% if pp.cable %} {{ pp.cable.get_status_class }}{% endif %}">
 
+    {# Checkbox #}
+    {% if perms.dcim.change_powerport or perms.dcim.delete_powerport %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ pp.pk }}" />
+        </td>
+    {% endif %}
+
     {# Name #}
     <td>
         <i class="fa fa-fw fa-bolt"></i>
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 0fdb2f89e..5785da93f 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -28,7 +28,7 @@ from django_tables2 import RequestConfig
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
 from utilities.exceptions import AbortTransaction
-from utilities.forms import BootstrapMixin, CSVDataField, TableConfigForm
+from utilities.forms import BootstrapMixin, BulkRenameForm, CSVDataField, TableConfigForm
 from utilities.permissions import get_permission_for_model, resolve_permission
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
@@ -988,9 +988,20 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     An extendable view for renaming objects in bulk.
     """
     queryset = None
-    form = None
     template_name = 'utilities/obj_bulk_rename.html'
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Create a new Form class from BulkRenameForm
+        class _Form(BulkRenameForm):
+            pk = ModelMultipleChoiceField(
+                queryset=self.queryset,
+                widget=MultipleHiddenInput()
+            )
+
+        self.form = _Form
+
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'change')
 

From 2e272132b00baa22bd585718e83fcd8509455be7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 15:43:47 -0400
Subject: [PATCH 232/505] Add test method for changelog view

---
 netbox/utilities/testing/views.py | 39 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 2cf32616c..25ef5df5e 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -177,27 +177,23 @@ class ModelViewTestCase(TestCase):
 
     def _get_url(self, action, instance=None):
         """
-        Return the URL name for a specific action. An instance must be specified for
-        get/edit/delete views.
+        Return the URL name for a specific action and optionally a specific instance
         """
         url_format = self._get_base_url()
 
-        if action in ('list', 'add', 'import', 'bulk_edit', 'bulk_delete'):
+        # If no instance was provided, assume we don't need a unique identifier
+        if instance is None:
             return reverse(url_format.format(action))
 
-        elif action in ('get', 'edit', 'delete'):
-            if instance is None:
-                raise Exception("Resolving {} URL requires specifying an instance".format(action))
-            # Attempt to resolve using slug first
-            if hasattr(self.model, 'slug'):
-                try:
-                    return reverse(url_format.format(action), kwargs={'slug': instance.slug})
-                except NoReverseMatch:
-                    pass
-            return reverse(url_format.format(action), kwargs={'pk': instance.pk})
+        # Attempt to resolve using slug as the unique identifier if one exists
+        if hasattr(self.model, 'slug'):
+            try:
+                return reverse(url_format.format(action), kwargs={'slug': instance.slug})
+            except NoReverseMatch:
+                pass
 
-        else:
-            raise Exception("Invalid action for URL resolution: {}".format(action))
+        # Default to using the numeric PK to retrieve the URL for an object
+        return reverse(url_format.format(action), kwargs={'pk': instance.pk})
 
 
 class ViewTestCases:
@@ -257,6 +253,16 @@ class ViewTestCases:
             # Try GET to non-permitted object
             self.assertHttpStatus(self.client.get(instance2.get_absolute_url()), 404)
 
+    class GetObjectChangelogViewTestCase(ModelViewTestCase):
+        """
+        View the changelog for an instance.
+        """
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_get_object_changelog(self):
+            url = self._get_url('changelog', self.model.objects.first())
+            response = self.client.get(url)
+            self.assertHttpStatus(response, 200)
+
     class CreateObjectViewTestCase(ModelViewTestCase):
         """
         Create a single new instance.
@@ -879,6 +885,7 @@ class ViewTestCases:
 
     class PrimaryObjectViewTestCase(
         GetObjectViewTestCase,
+        GetObjectChangelogViewTestCase,
         CreateObjectViewTestCase,
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
@@ -893,6 +900,7 @@ class ViewTestCases:
         maxDiff = None
 
     class OrganizationalObjectViewTestCase(
+        GetObjectChangelogViewTestCase,
         CreateObjectViewTestCase,
         EditObjectViewTestCase,
         ListObjectsViewTestCase,
@@ -918,6 +926,7 @@ class ViewTestCases:
 
     class DeviceComponentViewTestCase(
         GetObjectViewTestCase,
+        GetObjectChangelogViewTestCase,
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
         ListObjectsViewTestCase,

From 6f8f3f98b40bbfbbc8775f0ab4e18f46a94258b2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 15:58:13 -0400
Subject: [PATCH 233/505] Tweak ObjectChangeLogView to work with both
 restricted and unrestricted querysets

---
 netbox/extras/views.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index af5106a33..222332962 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -261,9 +261,11 @@ class ObjectChangeLogView(View):
 
     def get(self, request, model, **kwargs):
 
-        # Get object my model and kwargs (e.g. slug='foo')
-        queryset = model.objects.restrict(request.user, 'view')
-        obj = get_object_or_404(queryset, **kwargs)
+        # Handle QuerySet restriction of parent object if needed
+        if hasattr(model.objects, 'restrict'):
+            obj = get_object_or_404(model.objects.restrict(request.user, 'view'), **kwargs)
+        else:
+            obj = get_object_or_404(model, **kwargs)
 
         # Gather all changes for this object (and its related objects)
         content_type = ContentType.objects.get_for_model(model)

From 128327b8a3e4953234832856a8280f854e2b2f8b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 16:50:35 -0400
Subject: [PATCH 234/505] Split url_name template filter into viewname() and
 validated_viewname()

---
 netbox/templates/dcim/device_component.html |  8 ++++----
 netbox/templates/utilities/obj_list.html    |  6 +++---
 netbox/utilities/templatetags/helpers.py    | 22 ++++++++++++++++++---
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html
index 616655066..9fa66502e 100644
--- a/netbox/templates/dcim/device_component.html
+++ b/netbox/templates/dcim/device_component.html
@@ -9,7 +9,7 @@
             <ol class="breadcrumb">
                 <li><a href="{% url 'dcim:device_list' %}">Devices</a></li>
                 <li><a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a></li>
-                <li><a href="{% url instance|url_name:"list" %}?device_id={{ instance.device.pk }}">{{ instance|meta:"verbose_name_plural"|bettertitle }}</a></li>
+                <li><a href="{% url instance|viewname:"list" %}?device_id={{ instance.device.pk }}">{{ instance|meta:"verbose_name_plural"|bettertitle }}</a></li>
                 <li>{{ instance }}</li>
             </ol>
         </div>
@@ -17,12 +17,12 @@
     <div class="pull-right noprint">
         {% plugin_buttons instance %}
         {% if request.user|can_change:instance %}
-            <a href="{% url instance|url_name:"edit" pk=instance.pk %}" class="btn btn-warning">
+            <a href="{% url instance|viewname:"edit" pk=instance.pk %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span> Edit
             </a>
         {% endif %}
         {% if request.user|can_delete:instance %}
-            <a href="{% url instance|url_name:"delete" pk=instance.pk %}" class="btn btn-danger">
+            <a href="{% url instance|viewname:"delete" pk=instance.pk %}" class="btn btn-danger">
                 <span class="fa fa-trash" aria-hidden="true"></span> Delete
             </a>
         {% endif %}
@@ -34,7 +34,7 @@
         </li>
         {% if perms.extras.view_objectchange %}
             <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
-                <a href="{% url instance|url_name:"changelog" pk=instance.pk %}">Change Log</a>
+                <a href="{% url instance|viewname:"changelog" pk=instance.pk %}">Change Log</a>
             </li>
         {% endif %}
     </ul>
diff --git a/netbox/templates/utilities/obj_list.html b/netbox/templates/utilities/obj_list.html
index 85ff050ed..47f11e1c1 100644
--- a/netbox/templates/utilities/obj_list.html
+++ b/netbox/templates/utilities/obj_list.html
@@ -9,10 +9,10 @@
         <button type="button" class="btn btn-default" data-toggle="modal" data-target="#tableconfig" title="Configure table"><i class="fa fa-cog"></i> Configure</button>
     {% endif %}
     {% if permissions.add and 'add' in action_buttons %}
-        {% add_button content_type.model_class|url_name:"add" %}
+        {% add_button content_type.model_class|validated_viewname:"add" %}
     {% endif %}
     {% if permissions.add and 'import' in action_buttons %}
-        {% import_button content_type.model_class|url_name:"import" %}
+        {% import_button content_type.model_class|validated_viewname:"import" %}
     {% endif %}
     {% if 'export' in action_buttons %}
         {% export_button content_type %}
@@ -21,7 +21,7 @@
 <h1>{% block title %}{{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}{% endblock %}</h1>
 <div class="row">
     <div class="col-md-{% if filter_form %}9{% else %}12{% endif %}">
-        {% with bulk_edit_url=content_type.model_class|url_name:"bulk_edit" bulk_delete_url=content_type.model_class|url_name:"bulk_delete" %}
+        {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
         {% if permissions.change or permissions.delete %}
             <form method="post" class="form form-horizontal">
                 {% csrf_token %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 425a2fca2..e6a245a04 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -5,6 +5,7 @@ import re
 import yaml
 from django import template
 from django.conf import settings
+from django.urls import NoReverseMatch, reverse
 from django.utils.html import strip_tags
 from django.utils.safestring import mark_safe
 from markdown import markdown
@@ -74,11 +75,26 @@ def meta(obj, attr):
 
 
 @register.filter()
-def url_name(model, action):
+def viewname(model, action):
     """
-    Return the URL name for the given model and action, or None if invalid.
+    Return the view name for the given model and action. Does not perform any validation.
     """
-    return '{}:{}_{}'.format(model._meta.app_label, model._meta.model_name, action)
+    return f'{model._meta.app_label}:{model._meta.model_name}_{action}'
+
+
+@register.filter()
+def validated_viewname(model, action):
+    """
+    Return the view name for the given model and action if valid, or None if invalid.
+    """
+    viewname = f'{model._meta.app_label}:{model._meta.model_name}_{action}'
+    try:
+        # Validate and return the view name. We don't return the actual URL yet because many of the templates
+        # are written to pass a name to {% url %}.
+        reverse(viewname)
+        return viewname
+    except NoReverseMatch:
+        return None
 
 
 @register.filter()

From 319799b5ce4ab4908f4858e5b0c53c3626d16351 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 25 Jun 2020 17:08:51 -0400
Subject: [PATCH 235/505] Closes #4795: Add bulk disconnect capability for
 console and power ports

---
 docs/release-notes/version-2.9.md |  1 +
 netbox/dcim/forms.py              | 35 -------------------------------
 netbox/dcim/urls.py               |  4 ++--
 netbox/dcim/views.py              | 28 ++++++++++++++++++-------
 netbox/templates/dcim/device.html |  6 ++++++
 5 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 799acbcfe..3fefd8569 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -16,6 +16,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 * [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
+* [#4795](https://github.com/netbox-community/netbox/issues/4795) - Add bulk disconnect capability for console and power ports
 
 ### Configuration Changes
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index e4beaa56d..deb61729f 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2375,13 +2375,6 @@ class ConsoleServerPortBulkEditForm(
         ]
 
 
-class ConsoleServerPortBulkDisconnectForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=ConsoleServerPort.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
-
 class ConsoleServerPortCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
@@ -2603,13 +2596,6 @@ class PowerOutletBulkEditForm(
             self.fields['power_port'].widget.attrs['disabled'] = True
 
 
-class PowerOutletBulkDisconnectForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=PowerOutlet.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class PowerOutletCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
@@ -2908,13 +2894,6 @@ class InterfaceBulkEditForm(
             self.cleaned_data['tagged_vlans'] = []
 
 
-class InterfaceBulkDisconnectForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=Interface.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-
-
 class InterfaceCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
@@ -3094,13 +3073,6 @@ class FrontPortBulkEditForm(
         ]
 
 
-class FrontPortBulkDisconnectForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=FrontPort.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class FrontPortCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
@@ -3217,13 +3189,6 @@ class RearPortBulkEditForm(
         ]
 
 
-class RearPortBulkDisconnectForm(ConfirmationForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=RearPort.objects.all(),
-        widget=forms.MultipleHiddenInput
-    )
-
-
 class RearPortCSVForm(CSVModelForm):
     device = CSVModelChoiceField(
         queryset=Device.objects.all(),
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 43fa259bd..45b10cd0c 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -188,7 +188,7 @@ urlpatterns = [
     path('console-ports/import/', views.ConsolePortBulkImportView.as_view(), name='consoleport_import'),
     path('console-ports/edit/', views.ConsolePortBulkEditView.as_view(), name='consoleport_bulk_edit'),
     path('console-ports/rename/', views.ConsolePortBulkRenameView.as_view(), name='consoleport_bulk_rename'),
-    # TODO: Bulk disconnect view for ConsolePorts
+    path('console-ports/disconnect/', views.ConsolePortBulkDisconnectView.as_view(), name='consoleport_bulk_disconnect'),
     path('console-ports/delete/', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'),
     path('console-ports/<int:pk>/', views.ConsolePortView.as_view(), name='consoleport'),
     path('console-ports/<int:pk>/edit/', views.ConsolePortEditView.as_view(), name='consoleport_edit'),
@@ -220,7 +220,7 @@ urlpatterns = [
     path('power-ports/import/', views.PowerPortBulkImportView.as_view(), name='powerport_import'),
     path('power-ports/edit/', views.PowerPortBulkEditView.as_view(), name='powerport_bulk_edit'),
     path('power-ports/rename/', views.PowerPortBulkRenameView.as_view(), name='powerport_bulk_rename'),
-    # TODO: Bulk disconnect view for PowerPorts
+    path('power-ports/disconnect/', views.PowerPortBulkDisconnectView.as_view(), name='powerport_bulk_disconnect'),
     path('power-ports/delete/', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'),
     path('power-ports/<int:pk>/', views.PowerPortView.as_view(), name='powerport'),
     path('power-ports/<int:pk>/edit/', views.PowerPortEditView.as_view(), name='powerport_edit'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 7ca150e3d..3ec77d356 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import EmptyPage, PageNotAnInteger
 from django.db import transaction
 from django.db.models import Count, F
-from django.forms import modelformset_factory
+from django.forms import ModelMultipleChoiceField, MultipleHiddenInput, modelformset_factory
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.html import escape
@@ -46,9 +46,20 @@ class BulkDisconnectView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View)
     An extendable view for disconnection console/power/interface components in bulk.
     """
     queryset = None
-    form = None
     template_name = 'dcim/bulk_disconnect.html'
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Create a new Form class from ConfirmationForm
+        class _Form(ConfirmationForm):
+            pk = ModelMultipleChoiceField(
+                queryset=self.queryset,
+                widget=MultipleHiddenInput()
+            )
+
+        self.form = _Form
+
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'change')
 
@@ -1203,6 +1214,10 @@ class ConsolePortBulkRenameView(BulkRenameView):
     queryset = ConsolePort.objects.all()
 
 
+class ConsolePortBulkDisconnectView(BulkDisconnectView):
+    queryset = ConsolePort.objects.all()
+
+
 class ConsolePortBulkDeleteView(BulkDeleteView):
     queryset = ConsolePort.objects.all()
     filterset = filters.ConsolePortFilterSet
@@ -1262,7 +1277,6 @@ class ConsoleServerPortBulkRenameView(BulkRenameView):
 
 class ConsoleServerPortBulkDisconnectView(BulkDisconnectView):
     queryset = ConsoleServerPort.objects.all()
-    form = forms.ConsoleServerPortBulkDisconnectForm
 
 
 class ConsoleServerPortBulkDeleteView(BulkDeleteView):
@@ -1322,6 +1336,10 @@ class PowerPortBulkRenameView(BulkRenameView):
     queryset = PowerPort.objects.all()
 
 
+class PowerPortBulkDisconnectView(BulkDisconnectView):
+    queryset = PowerPort.objects.all()
+
+
 class PowerPortBulkDeleteView(BulkDeleteView):
     queryset = PowerPort.objects.all()
     filterset = filters.PowerPortFilterSet
@@ -1381,7 +1399,6 @@ class PowerOutletBulkRenameView(BulkRenameView):
 
 class PowerOutletBulkDisconnectView(BulkDisconnectView):
     queryset = PowerOutlet.objects.all()
-    form = forms.PowerOutletBulkDisconnectForm
 
 
 class PowerOutletBulkDeleteView(BulkDeleteView):
@@ -1476,7 +1493,6 @@ class InterfaceBulkRenameView(BulkRenameView):
 
 class InterfaceBulkDisconnectView(BulkDisconnectView):
     queryset = Interface.objects.all()
-    form = forms.InterfaceBulkDisconnectForm
 
 
 class InterfaceBulkDeleteView(BulkDeleteView):
@@ -1538,7 +1554,6 @@ class FrontPortBulkRenameView(BulkRenameView):
 
 class FrontPortBulkDisconnectView(BulkDisconnectView):
     queryset = FrontPort.objects.all()
-    form = forms.FrontPortBulkDisconnectForm
 
 
 class FrontPortBulkDeleteView(BulkDeleteView):
@@ -1600,7 +1615,6 @@ class RearPortBulkRenameView(BulkRenameView):
 
 class RearPortBulkDisconnectView(BulkDisconnectView):
     queryset = RearPort.objects.all()
-    form = forms.RearPortBulkDisconnectForm
 
 
 class RearPortBulkDeleteView(BulkDeleteView):
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index c7f58aa4d..03ca0f8b4 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -346,6 +346,9 @@
                                 <button type="submit" name="_edit" formaction="{% url 'dcim:consoleport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                     <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
                                 </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
                             {% endif %}
                             {% if console_ports and perms.dcim.delete_consoleport %}
                                 <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
@@ -383,6 +386,9 @@
                                 <button type="submit" name="_edit" formaction="{% url 'dcim:powerport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                     <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
                                 </button>
+                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:powerport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                </button>
                             {% endif %}
                             {% if power_ports and perms.dcim.delete_powerport %}
                                 <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">

From 6e3a32567ce954caa818a6b5b67f77910d56ac25 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 11:56:30 -0400
Subject: [PATCH 236/505] Move utility functions to utils.py

---
 netbox/ipam/utils.py | 93 ++++++++++++++++++++++++++++++++++++++++++++
 netbox/ipam/views.py | 90 +-----------------------------------------
 2 files changed, 94 insertions(+), 89 deletions(-)
 create mode 100644 netbox/ipam/utils.py

diff --git a/netbox/ipam/utils.py b/netbox/ipam/utils.py
new file mode 100644
index 000000000..f3cc0cb52
--- /dev/null
+++ b/netbox/ipam/utils.py
@@ -0,0 +1,93 @@
+import netaddr
+
+from .constants import *
+from .models import Prefix, VLAN
+
+
+def add_available_prefixes(parent, prefix_list):
+    """
+    Create fake Prefix objects for all unallocated space within a prefix.
+    """
+
+    # Find all unallocated space
+    available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
+    available_prefixes = [Prefix(prefix=p) for p in available_prefixes.iter_cidrs()]
+
+    # Concatenate and sort complete list of children
+    prefix_list = list(prefix_list) + available_prefixes
+    prefix_list.sort(key=lambda p: p.prefix)
+
+    return prefix_list
+
+
+def add_available_ipaddresses(prefix, ipaddress_list, is_pool=False):
+    """
+    Annotate ranges of available IP addresses within a given prefix. If is_pool is True, the first and last IP will be
+    considered usable (regardless of mask length).
+    """
+
+    output = []
+    prev_ip = None
+
+    # Ignore the network and broadcast addresses for non-pool IPv4 prefixes larger than /31.
+    if prefix.version == 4 and prefix.prefixlen < 31 and not is_pool:
+        first_ip_in_prefix = netaddr.IPAddress(prefix.first + 1)
+        last_ip_in_prefix = netaddr.IPAddress(prefix.last - 1)
+    else:
+        first_ip_in_prefix = netaddr.IPAddress(prefix.first)
+        last_ip_in_prefix = netaddr.IPAddress(prefix.last)
+
+    if not ipaddress_list:
+        return [(
+            int(last_ip_in_prefix - first_ip_in_prefix + 1),
+            '{}/{}'.format(first_ip_in_prefix, prefix.prefixlen)
+        )]
+
+    # Account for any available IPs before the first real IP
+    if ipaddress_list[0].address.ip > first_ip_in_prefix:
+        skipped_count = int(ipaddress_list[0].address.ip - first_ip_in_prefix)
+        first_skipped = '{}/{}'.format(first_ip_in_prefix, prefix.prefixlen)
+        output.append((skipped_count, first_skipped))
+
+    # Iterate through existing IPs and annotate free ranges
+    for ip in ipaddress_list:
+        if prev_ip:
+            diff = int(ip.address.ip - prev_ip.address.ip)
+            if diff > 1:
+                first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
+                output.append((diff - 1, first_skipped))
+        output.append(ip)
+        prev_ip = ip
+
+    # Include any remaining available IPs
+    if prev_ip.address.ip < last_ip_in_prefix:
+        skipped_count = int(last_ip_in_prefix - prev_ip.address.ip)
+        first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
+        output.append((skipped_count, first_skipped))
+
+    return output
+
+
+def add_available_vlans(vlan_group, vlans):
+    """
+    Create fake records for all gaps between used VLANs
+    """
+    if not vlans:
+        return [{'vid': VLAN_VID_MIN, 'available': VLAN_VID_MAX - VLAN_VID_MIN + 1}]
+
+    prev_vid = VLAN_VID_MAX
+    new_vlans = []
+    for vlan in vlans:
+        if vlan.vid - prev_vid > 1:
+            new_vlans.append({'vid': prev_vid + 1, 'available': vlan.vid - prev_vid - 1})
+        prev_vid = vlan.vid
+
+    if vlans[0].vid > VLAN_VID_MIN:
+        new_vlans.append({'vid': VLAN_VID_MIN, 'available': vlans[0].vid - VLAN_VID_MIN})
+    if prev_vid < VLAN_VID_MAX:
+        new_vlans.append({'vid': prev_vid + 1, 'available': VLAN_VID_MAX - prev_vid})
+
+    vlans = list(vlans) + new_vlans
+    vlans.sort(key=lambda v: v.vid if type(v) == VLAN else v['vid'])
+
+    return vlans
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 808a50ae1..2d339af52 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -16,95 +16,7 @@ from . import filters, forms, tables
 from .choices import *
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
-
-
-def add_available_prefixes(parent, prefix_list):
-    """
-    Create fake Prefix objects for all unallocated space within a prefix.
-    """
-
-    # Find all unallocated space
-    available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
-    available_prefixes = [Prefix(prefix=p) for p in available_prefixes.iter_cidrs()]
-
-    # Concatenate and sort complete list of children
-    prefix_list = list(prefix_list) + available_prefixes
-    prefix_list.sort(key=lambda p: p.prefix)
-
-    return prefix_list
-
-
-def add_available_ipaddresses(prefix, ipaddress_list, is_pool=False):
-    """
-    Annotate ranges of available IP addresses within a given prefix. If is_pool is True, the first and last IP will be
-    considered usable (regardless of mask length).
-    """
-
-    output = []
-    prev_ip = None
-
-    # Ignore the network and broadcast addresses for non-pool IPv4 prefixes larger than /31.
-    if prefix.version == 4 and prefix.prefixlen < 31 and not is_pool:
-        first_ip_in_prefix = netaddr.IPAddress(prefix.first + 1)
-        last_ip_in_prefix = netaddr.IPAddress(prefix.last - 1)
-    else:
-        first_ip_in_prefix = netaddr.IPAddress(prefix.first)
-        last_ip_in_prefix = netaddr.IPAddress(prefix.last)
-
-    if not ipaddress_list:
-        return [(
-            int(last_ip_in_prefix - first_ip_in_prefix + 1),
-            '{}/{}'.format(first_ip_in_prefix, prefix.prefixlen)
-        )]
-
-    # Account for any available IPs before the first real IP
-    if ipaddress_list[0].address.ip > first_ip_in_prefix:
-        skipped_count = int(ipaddress_list[0].address.ip - first_ip_in_prefix)
-        first_skipped = '{}/{}'.format(first_ip_in_prefix, prefix.prefixlen)
-        output.append((skipped_count, first_skipped))
-
-    # Iterate through existing IPs and annotate free ranges
-    for ip in ipaddress_list:
-        if prev_ip:
-            diff = int(ip.address.ip - prev_ip.address.ip)
-            if diff > 1:
-                first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
-                output.append((diff - 1, first_skipped))
-        output.append(ip)
-        prev_ip = ip
-
-    # Include any remaining available IPs
-    if prev_ip.address.ip < last_ip_in_prefix:
-        skipped_count = int(last_ip_in_prefix - prev_ip.address.ip)
-        first_skipped = '{}/{}'.format(prev_ip.address.ip + 1, prefix.prefixlen)
-        output.append((skipped_count, first_skipped))
-
-    return output
-
-
-def add_available_vlans(vlan_group, vlans):
-    """
-    Create fake records for all gaps between used VLANs
-    """
-    if not vlans:
-        return [{'vid': VLAN_VID_MIN, 'available': VLAN_VID_MAX - VLAN_VID_MIN + 1}]
-
-    prev_vid = VLAN_VID_MAX
-    new_vlans = []
-    for vlan in vlans:
-        if vlan.vid - prev_vid > 1:
-            new_vlans.append({'vid': prev_vid + 1, 'available': vlan.vid - prev_vid - 1})
-        prev_vid = vlan.vid
-
-    if vlans[0].vid > VLAN_VID_MIN:
-        new_vlans.append({'vid': VLAN_VID_MIN, 'available': vlans[0].vid - VLAN_VID_MIN})
-    if prev_vid < VLAN_VID_MAX:
-        new_vlans.append({'vid': prev_vid + 1, 'available': VLAN_VID_MAX - prev_vid})
-
-    vlans = list(vlans) + new_vlans
-    vlans.sort(key=lambda v: v.vid if type(v) == VLAN else v['vid'])
-
-    return vlans
+from .utils import add_available_ipaddresses, add_available_prefixes, add_available_vlans
 
 
 #

From 9777f25b9f185bcc80bb03503a03999712dae0dd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 11:57:07 -0400
Subject: [PATCH 237/505] Set the default action to 'view' for restrict()

---
 netbox/utilities/querysets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 04bc4c542..5a867c04d 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -59,13 +59,13 @@ class RestrictedQuerySet(QuerySet):
         self.allow_evaluation = True
         return self
 
-    def restrict(self, user, action):
+    def restrict(self, user, action='view'):
         """
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
         permission.
 
         :param user: User instance
-        :param action: The action which must be permitted (e.g. "view" for "dcim.view_site")
+        :param action: The action which must be permitted (e.g. "view" for "dcim.view_site"); default is 'view'
         """
         # Resolve the full name of the required permission
         app_label = self.model._meta.app_label

From 95965d65c9266bc46c6629734510302b9cec9a37 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 12:22:02 -0400
Subject: [PATCH 238/505] Fix some instances where RestrictedQuerySet is
 evaluated prematurely

---
 netbox/dcim/views.py                      | 19 +++++++++++++------
 netbox/extras/views.py                    | 17 ++++++++++++++++-
 netbox/ipam/models.py                     |  7 +++++--
 netbox/ipam/views.py                      | 12 ++++++++----
 netbox/templates/dcim/devicetype.html     |  2 +-
 netbox/templates/dcim/virtualchassis.html |  2 +-
 netbox/virtualization/views.py            | 21 ++++++++++++++++-----
 7 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 3ec77d356..0ce35aa19 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -5,7 +5,7 @@ from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.core.paginator import EmptyPage, PageNotAnInteger
 from django.db import transaction
-from django.db.models import Count, F
+from django.db.models import Count, F, Prefetch
 from django.forms import ModelMultipleChoiceField, MultipleHiddenInput, modelformset_factory
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -16,7 +16,7 @@ from django.views.generic import View
 from circuits.models import Circuit
 from extras.models import Graph
 from extras.views import ObjectConfigContextView
-from ipam.models import Prefix, Service, VLAN
+from ipam.models import IPAddress, Prefix, Service, VLAN
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from secrets.models import Secret
 from utilities.forms import ConfirmationForm
@@ -517,6 +517,7 @@ class DeviceTypeView(ObjectView):
     def get(self, request, pk):
 
         devicetype = get_object_or_404(self.queryset, pk=pk)
+        instance_count = Device.objects.restrict(request.user).filter(device_type=devicetype).count()
 
         # Component tables
         consoleport_table = tables.ConsolePortTemplateTable(
@@ -563,6 +564,7 @@ class DeviceTypeView(ObjectView):
 
         return render(request, 'dcim/devicetype.html', {
             'devicetype': devicetype,
+            'instance_count': instance_count,
             'consoleport_table': consoleport_table,
             'consoleserverport_table': consoleserverport_table,
             'powerport_table': powerport_table,
@@ -987,8 +989,10 @@ class DeviceView(ObjectView):
 
         # Interfaces
         interfaces = device.vc_interfaces.restrict(request.user, 'view').filter(device=device).prefetch_related(
+            Prefetch('ip_addresses', queryset=IPAddress.objects.restrict(request.user)),
+            Prefetch('member_interfaces', queryset=Interface.objects.restrict(request.user)),
             'lag', '_connected_interface__device', '_connected_circuittermination__circuit', 'cable',
-            'cable__termination_a', 'cable__termination_b', 'ip_addresses', 'tags'
+            'cable__termination_a', 'cable__termination_b', 'tags'
         )
 
         # Front ports
@@ -1438,7 +1442,7 @@ class InterfaceView(ObjectView):
         if interface.untagged_vlan is not None:
             vlans.append(interface.untagged_vlan)
             vlans[0].tagged = False
-        for vlan in interface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
+        for vlan in interface.tagged_vlans.restrict(request.user).prefetch_related('site', 'group', 'tenant', 'role'):
             vlan.tagged = True
             vlans.append(vlan)
         vlan_table = InterfaceVLANTable(
@@ -2149,13 +2153,15 @@ class VirtualChassisListView(ObjectListView):
 
 
 class VirtualChassisView(ObjectView):
-    queryset = VirtualChassis.objects.prefetch_related('members')
+    queryset = VirtualChassis.objects.all()
 
     def get(self, request, pk):
         virtualchassis = get_object_or_404(self.queryset, pk=pk)
+        members = Device.objects.restrict(request.user).filter(virtual_chassis=virtualchassis)
 
         return render(request, 'dcim/virtualchassis.html', {
             'virtualchassis': virtualchassis,
+            'members': members,
         })
 
 
@@ -2389,8 +2395,9 @@ class PowerPanelView(ObjectView):
     def get(self, request, pk):
 
         powerpanel = get_object_or_404(self.queryset, pk=pk)
+        power_feeds = PowerFeed.objects.restrict(request.user).filter(power_panel=powerpanel).prefetch_related('rack')
         powerfeed_table = tables.PowerFeedTable(
-            data=PowerFeed.objects.filter(power_panel=powerpanel).prefetch_related('rack'),
+            data=power_feeds,
             orderable=False
         )
         powerfeed_table.exclude = ['power_panel']
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 222332962..5f4a21448 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -2,13 +2,15 @@ from django import template
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Count, Q
+from django.db.models import Count, Prefetch, Q
 from django.http import Http404, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.safestring import mark_safe
 from django.views.generic import View
 from django_tables2 import RequestConfig
 
+from dcim.models import DeviceRole, Platform, Region, Site
+from tenancy.models import Tenant, TenantGroup
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
 from utilities.utils import shallow_compare_dict
@@ -16,6 +18,7 @@ from utilities.views import (
     BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
     ObjectPermissionRequiredMixin,
 )
+from virtualization.models import Cluster, ClusterGroup
 from . import filters, forms, tables
 from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem
 from .reports import get_report, get_reports
@@ -120,6 +123,18 @@ class ConfigContextView(ObjectView):
     queryset = ConfigContext.objects.all()
 
     def get(self, request, pk):
+        # Extend queryset to prefetch related objects
+        self.queryset = self.queryset.prefetch_related(
+            Prefetch('regions', queryset=Region.objects.restrict(request.user)),
+            Prefetch('sites', queryset=Site.objects.restrict(request.user)),
+            Prefetch('roles', queryset=DeviceRole.objects.restrict(request.user)),
+            Prefetch('platforms', queryset=Platform.objects.restrict(request.user)),
+            Prefetch('clusters', queryset=Cluster.objects.restrict(request.user)),
+            Prefetch('cluster_groups', queryset=ClusterGroup.objects.restrict(request.user)),
+            Prefetch('tenants', queryset=Tenant.objects.restrict(request.user)),
+            Prefetch('tenant_groups', queryset=TenantGroup.objects.restrict(request.user)),
+        )
+
         configcontext = get_object_or_404(self.queryset, pk=pk)
 
         # Determine user's preferred output format
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index ff564de6e..4fe0b6e06 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -255,7 +255,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
         """
         Determine the prefix utilization of the aggregate and return it as a percentage.
         """
-        queryset = Prefix.objects.filter(prefix__net_contained_or_equal=str(self.prefix))
+        queryset = Prefix.objects.unrestricted().filter(prefix__net_contained_or_equal=str(self.prefix))
         child_prefixes = netaddr.IPSet([p.prefix for p in queryset])
         return int(float(child_prefixes.size) / self.prefix.size * 100)
 
@@ -553,7 +553,10 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         "container", calculate utilization based on child prefixes. For all others, count child IP addresses.
         """
         if self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            queryset = Prefix.objects.filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
+            queryset = Prefix.objects.unrestricted().filter(
+                prefix__net_contained=str(self.prefix),
+                vrf=self.vrf
+            )
             child_prefixes = netaddr.IPSet([p.prefix for p in queryset])
             return int(float(child_prefixes.size) / self.prefix.size * 100)
         else:
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 2d339af52..e33cb3c6e 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -1,6 +1,6 @@
 import netaddr
 from django.conf import settings
-from django.db.models import Count
+from django.db.models import Count, Prefetch
 from django.db.models.expressions import RawSQL
 from django.shortcuts import get_object_or_404, redirect, render
 from django_tables2 import RequestConfig
@@ -108,10 +108,12 @@ class RIRListView(ObjectListView):
                 'deprecated': 0,
                 'available': 0,
             }
-            aggregate_list = Aggregate.objects.filter(prefix__family=family, rir=rir)
+            aggregate_list = Aggregate.objects.restrict(request.user).filter(prefix__family=family, rir=rir)
             for aggregate in aggregate_list:
 
-                queryset = Prefix.objects.filter(prefix__net_contained_or_equal=str(aggregate.prefix))
+                queryset = Prefix.objects.restrict(request.user).filter(
+                    prefix__net_contained_or_equal=str(aggregate.prefix)
+                )
 
                 # Find all consumed space for each prefix status (we ignore containers for this purpose).
                 active_prefixes = netaddr.cidr_merge(
@@ -699,7 +701,9 @@ class VLANGroupVLANsView(ObjectView):
     def get(self, request, pk):
         vlan_group = get_object_or_404(self.queryset, pk=pk)
 
-        vlans = VLAN.objects.restrict(request.user, 'view').filter(group_id=pk)
+        vlans = VLAN.objects.restrict(request.user, 'view').filter(group_id=pk).prefetch_related(
+            Prefetch('prefixes', queryset=Prefix.objects.restrict(request.user))
+        )
         vlans = add_available_vlans(vlan_group, vlans)
 
         vlan_table = tables.VLANDetailTable(vlans)
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 2479d58d2..669456c10 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -131,7 +131,7 @@
                 </tr>
                 <tr>
                     <td>Instances</td>
-                    <td><a href="{% url 'dcim:device_list' %}?device_type_id={{ devicetype.pk }}">{{ devicetype.instances.count }}</a></td>
+                    <td><a href="{% url 'dcim:device_list' %}?device_type_id={{ devicetype.pk }}">{{ instance_count }}</a></td>
                 </tr>
             </table>
         </div>
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index c1ad82c5d..18ec8c4e7 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -93,7 +93,7 @@
                     <th>Master</th>
                     <th>Priority</th>
                 </tr>
-                {% for vc_member in virtualchassis.members.all %}
+                {% for vc_member in members %}
                     <tr{% if vc_member == device %} class="info"{% endif %}>
                         <td>
                             <a href="{{ vc_member.get_absolute_url }}">{{ vc_member }}</a>
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 60b5f766a..fadd614c3 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -1,13 +1,13 @@
 from django.contrib import messages
 from django.db import transaction
-from django.db.models import Count
+from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 
 from dcim.models import Device
 from dcim.tables import DeviceTable
 from extras.views import ObjectConfigContextView
-from ipam.models import Service
+from ipam.models import IPAddress, Service
 from ipam.tables import InterfaceIPAddressTable, InterfaceVLANTable
 from utilities.views import (
     BulkComponentCreateView, BulkDeleteView, BulkEditView, BulkImportView, BulkRenameView, ComponentCreateView,
@@ -88,6 +88,9 @@ class ClusterView(ObjectView):
     queryset = Cluster.objects.all()
 
     def get(self, request, pk):
+        self.queryset = self.queryset.prefetch_related(
+            Prefetch('virtual_machines', queryset=VirtualMachine.objects.restrict(request.user))
+        )
 
         cluster = get_object_or_404(self.queryset, pk=pk)
         devices = Device.objects.restrict(request.user, 'view').filter(cluster=cluster).prefetch_related(
@@ -236,8 +239,16 @@ class VirtualMachineView(ObjectView):
     def get(self, request, pk):
 
         virtualmachine = get_object_or_404(self.queryset, pk=pk)
-        interfaces = VMInterface.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
-        services = Service.objects.restrict(request.user, 'view').filter(virtual_machine=virtualmachine)
+        interfaces = VMInterface.objects.restrict(request.user, 'view').filter(
+            virtual_machine=virtualmachine
+        ).prefetch_related(
+            Prefetch('ip_addresses', queryset=IPAddress.objects.restrict(request.user))
+        )
+        services = Service.objects.restrict(request.user, 'view').filter(
+            virtual_machine=virtualmachine
+        ).prefetch_related(
+            Prefetch('ipaddresses', queryset=IPAddress.objects.restrict(request.user))
+        )
 
         return render(request, 'virtualization/virtualmachine.html', {
             'virtualmachine': virtualmachine,
@@ -315,7 +326,7 @@ class VMInterfaceView(ObjectView):
         if vminterface.untagged_vlan is not None:
             vlans.append(vminterface.untagged_vlan)
             vlans[0].tagged = False
-        for vlan in vminterface.tagged_vlans.prefetch_related('site', 'group', 'tenant', 'role'):
+        for vlan in vminterface.tagged_vlans.restrict(request.user).prefetch_related('site', 'group', 'tenant', 'role'):
             vlan.tagged = True
             vlans.append(vlan)
         vlan_table = InterfaceVLANTable(

From 8412f9481cacc3dac9173b97703621edd023f79f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 13:18:12 -0400
Subject: [PATCH 239/505] Force restriction of RestrictedQuerySet even for
 superusers

---
 netbox/utilities/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 50401dfd1..2e2d7f7f5 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -327,7 +327,7 @@ class ModelViewSet(_ModelViewSet):
     def initial(self, request, *args, **kwargs):
         super().initial(request, *args, **kwargs)
 
-        if not request.user.is_authenticated or request.user.is_superuser:
+        if not request.user.is_authenticated:
             return
 
         # TODO: Reconcile this with TokenPermissions.perms_map

From edc65a6a34aeefbf4a419687a32999878e834a8a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 13:59:53 -0400
Subject: [PATCH 240/505] Introduce restrict_form_fields() to automatically
 restrict field querysets based on user

---
 netbox/utilities/forms.py | 11 +++++++++++
 netbox/utilities/views.py |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 59e581ff4..0d15d34df 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -15,6 +15,7 @@ from django.forms import BoundField
 from django.forms.models import fields_for_model
 from django.urls import reverse
 
+from utilities.querysets import RestrictedQuerySet
 from .choices import ColorChoices, unpack_grouped_choices
 from .validators import EnhancedURLValidator
 
@@ -138,6 +139,16 @@ def form_from_model(model, fields):
     return type('FormFromModel', (forms.Form,), form_fields)
 
 
+def restrict_form_fields(form, user, action='view'):
+    """
+    Restrict all form fields which reference a RestrictedQuerySet. This ensures that users see only permitted objects
+    as available choices.
+    """
+    for field in form.fields.values():
+        if hasattr(field, 'queryset') and issubclass(field.queryset.__class__, RestrictedQuerySet):
+            field.queryset = field.queryset.restrict(user, action)
+
+
 #
 # Widgets
 #
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 5785da93f..7fd41804b 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -28,7 +28,7 @@ from django_tables2 import RequestConfig
 from extras.models import CustomField, CustomFieldValue, ExportTemplate
 from extras.querysets import CustomFieldQueryset
 from utilities.exceptions import AbortTransaction
-from utilities.forms import BootstrapMixin, BulkRenameForm, CSVDataField, TableConfigForm
+from utilities.forms import BootstrapMixin, BulkRenameForm, CSVDataField, TableConfigForm, restrict_form_fields
 from utilities.permissions import get_permission_for_model, resolve_permission
 from utilities.utils import csv_format, prepare_cloned_fields
 from .error_handlers import handle_protectederror
@@ -352,6 +352,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         # Parse initial data manually to avoid setting field values as lists
         initial_data = {k: request.GET[k] for k in request.GET}
         form = self.model_form(instance=obj, initial=initial_data)
+        restrict_form_fields(form, request.user)
 
         return render(request, self.template_name, {
             'obj': obj,
@@ -368,6 +369,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             files=request.FILES,
             instance=obj
         )
+        restrict_form_fields(form, request.user)
 
         if form.is_valid():
             logger.debug("Form validation was successful")

From 2c354c7f86db78c751829a81b4d4e03f301e4712 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 14:29:24 -0400
Subject: [PATCH 241/505] Fix automatic creation of UserConfig for user created
 via admin UI

---
 netbox/users/admin.py  | 6 +++---
 netbox/users/models.py | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index cc7a1b379..25703966c 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
-from django.contrib.auth.models import Group as StockGroup, User as StockUser
+from django.contrib.auth.models import Group, User
 from django.core.exceptions import FieldError, ValidationError
 
 from extras.admin import order_content_types
@@ -13,8 +13,8 @@ from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig
 #
 
 # Unregister the built-in GroupAdmin and UserAdmin classes so that we can use our custom admin classes below
-admin.site.unregister(StockGroup)
-admin.site.unregister(StockUser)
+admin.site.unregister(Group)
+admin.site.unregister(User)
 
 
 @admin.register(AdminGroup)
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 7987ccb7a..bce3bd704 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -159,6 +159,7 @@ class UserConfig(models.Model):
 
 
 @receiver(post_save, sender=User)
+@receiver(post_save, sender=AdminUser)
 def create_userconfig(instance, created, **kwargs):
     """
     Automatically create a new UserConfig when a new User is created.

From 84db1adfaffd88c1e31f96fd65db21f7395b8379 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 14:48:04 -0400
Subject: [PATCH 242/505] Fix create, edit view test methods

---
 netbox/utilities/testing/views.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 25ef5df5e..392a26fb2 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -271,7 +271,6 @@ class ViewTestCases:
         """
         form_data = {}
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_create_object_without_permission(self):
 
             # Try GET without permission
@@ -287,7 +286,7 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_create_object_with_permission(self):
             initial_count = self.model.objects.count()
 
@@ -311,7 +310,7 @@ class ViewTestCases:
             self.assertEqual(initial_count + 1, self.model.objects.count())
             self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_create_object_with_constrained_permission(self):
             initial_count = self.model.objects.count()
 
@@ -356,7 +355,6 @@ class ViewTestCases:
         """
         form_data = {}
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_edit_object_without_permission(self):
             instance = self.model.objects.first()
 
@@ -372,7 +370,7 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_edit_object_with_permission(self):
             instance = self.model.objects.first()
 
@@ -395,7 +393,7 @@ class ViewTestCases:
             self.assertHttpStatus(self.client.post(**request), 302)
             self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_edit_object_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 
@@ -433,7 +431,6 @@ class ViewTestCases:
         """
         Delete a single instance.
         """
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_delete_object_without_permission(self):
             instance = self.model.objects.first()
 
@@ -449,7 +446,7 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(**request), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_delete_object_with_permission(self):
             instance = self.model.objects.first()
 
@@ -473,7 +470,7 @@ class ViewTestCases:
             with self.assertRaises(ObjectDoesNotExist):
                 self.model.objects.get(pk=instance.pk)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_delete_object_with_constrained_permission(self):
             instance1, instance2 = self.model.objects.all()[:2]
 

From 6128ef4b3700f7ca558057dee3c84dca4f00a971 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 15:00:47 -0400
Subject: [PATCH 243/505] Remove redundant ObjectPermissionViewTestCase

---
 netbox/netbox/tests/test_authentication.py | 350 ---------------------
 1 file changed, 350 deletions(-)

diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py
index 7e5ce89b7..3ae203c29 100644
--- a/netbox/netbox/tests/test_authentication.py
+++ b/netbox/netbox/tests/test_authentication.py
@@ -168,356 +168,6 @@ class ExternalAuthenticationTestCase(TestCase):
         self.assertTrue(new_user.has_perms(['dcim.add_site', 'dcim.change_site']))
 
 
-class ObjectPermissionViewTestCase(TestCase):
-
-    @classmethod
-    def setUpTestData(cls):
-
-        cls.sites = (
-            Site(name='Site 1', slug='site-1'),
-            Site(name='Site 2', slug='site-2'),
-            Site(name='Site 3', slug='site-3'),
-        )
-        Site.objects.bulk_create(cls.sites)
-
-        cls.prefixes = (
-            Prefix(prefix=IPNetwork('10.0.0.0/24'), site=cls.sites[0]),
-            Prefix(prefix=IPNetwork('10.0.1.0/24'), site=cls.sites[0]),
-            Prefix(prefix=IPNetwork('10.0.2.0/24'), site=cls.sites[0]),
-            Prefix(prefix=IPNetwork('10.0.3.0/24'), site=cls.sites[1]),
-            Prefix(prefix=IPNetwork('10.0.4.0/24'), site=cls.sites[1]),
-            Prefix(prefix=IPNetwork('10.0.5.0/24'), site=cls.sites[1]),
-            Prefix(prefix=IPNetwork('10.0.6.0/24'), site=cls.sites[2]),
-            Prefix(prefix=IPNetwork('10.0.7.0/24'), site=cls.sites[2]),
-            Prefix(prefix=IPNetwork('10.0.8.0/24'), site=cls.sites[2]),
-        )
-        Prefix.objects.bulk_create(cls.prefixes)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_get_object(self):
-
-        # Attempt to retrieve object without permission
-        response = self.client.get(self.prefixes[0].get_absolute_url())
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Retrieve permitted object
-        response = self.client.get(self.prefixes[0].get_absolute_url())
-        self.assertHttpStatus(response, 200)
-
-        # Attempt to retrieve non-permitted object
-        response = self.client.get(self.prefixes[3].get_absolute_url())
-        self.assertHttpStatus(response, 404)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_list_objects(self):
-
-        # Attempt to list objects without permission
-        response = self.client.get(reverse('ipam:prefix_list'))
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Retrieve all objects. Only permitted objects should be returned.
-        response = self.client.get(reverse('ipam:prefix_list'))
-        self.assertHttpStatus(response, 200)
-        self.assertIn(str(self.prefixes[0].prefix), str(response.content))
-        self.assertNotIn(str(self.prefixes[3].prefix), str(response.content))
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_create_object(self):
-        initial_count = Prefix.objects.count()
-        form_data = {
-            'prefix': '10.0.9.0/24',
-            'site': self.sites[1].pk,
-            'status': PrefixStatusChoices.STATUS_ACTIVE,
-        }
-
-        # Attempt to create an object without permission
-        request = {
-            'path': reverse('ipam:prefix_add'),
-            'data': form_data,
-            'follow': False,  # Do not follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-        self.assertEqual(initial_count, Prefix.objects.count())
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view', 'add']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Attempt to create a non-permitted object
-        request = {
-            'path': reverse('ipam:prefix_add'),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertEqual(Prefix.objects.count(), initial_count)
-
-        # Create a permitted object
-        form_data['site'] = self.sites[0].pk
-        request = {
-            'path': reverse('ipam:prefix_add'),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertEqual(Prefix.objects.count(), initial_count + 1)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_edit_object(self):
-        form_data = {
-            'prefix': '10.0.9.0/24',
-            'site': self.sites[0].pk,
-            'status': PrefixStatusChoices.STATUS_RESERVED,
-        }
-
-        # Attempt to edit an object without permission
-        request = {
-            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[0].pk}),
-            'data': form_data,
-            'follow': False,  # Do not follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view', 'change']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Attempt to edit a non-permitted object
-        request = {
-            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[3].pk}),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 404)
-
-        # Edit a permitted object
-        request = {
-            'path': reverse('ipam:prefix_edit', kwargs={'pk': self.prefixes[0].pk}),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        prefix = Prefix.objects.get(pk=self.prefixes[0].pk)
-        self.assertEqual(prefix.status, PrefixStatusChoices.STATUS_RESERVED)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_delete_object(self):
-        form_data = {
-            'confirm': True
-        }
-
-        # Attempt to delete object without permission
-        request = {
-            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[0].pk}),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view', 'delete']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Delete permitted object
-        request = {
-            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[0].pk}),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertFalse(Prefix.objects.filter(pk=self.prefixes[0].pk).exists())
-
-        # Attempt to delete non-permitted object
-        request = {
-            'path': reverse('ipam:prefix_delete', kwargs={'pk': self.prefixes[3].pk}),
-            'data': form_data,
-            'follow': True,  # Follow 302 redirects
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 404)
-        self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_bulk_import_objects(self):
-        initial_count = Prefix.objects.count()
-        form_data = {
-            'csv': "prefix,status,site\n"
-                   "10.0.9.0/24,Active,Site 1\n"
-                   "10.0.10.0/24,Active,Site 2\n"
-                   "10.0.11.0/24,Active,Site 3\n",
-        }
-
-        # Attempt to import objects without permission
-        request = {
-            'path': reverse('ipam:prefix_import'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-        self.assertEqual(initial_count, Prefix.objects.count())
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['add']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Attempt to create non-permitted objects
-        request = {
-            'path': reverse('ipam:prefix_import'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertEqual(Prefix.objects.count(), initial_count)
-
-        # Create a permitted object
-        form_data = {
-            'csv': "prefix,status,site\n"
-                   "10.0.9.0/24,Active,Site 1\n"
-                   "10.0.10.0/24,Active,Site 1\n"
-                   "10.0.11.0/24,Active,Site 1\n",
-        }
-        request = {
-            'path': reverse('ipam:prefix_import'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertEqual(Prefix.objects.count(), initial_count + 3)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_bulk_edit_objects(self):
-        form_data = {
-            'pk': [p.pk for p in self.prefixes],
-            'status': 'reserved',
-            '_apply': True,
-        }
-
-        # Attempt to edit objects without permission
-        request = {
-            'path': reverse('ipam:prefix_bulk_edit'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['change']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Attempt to edit non-permitted objects
-        request = {
-            'path': reverse('ipam:prefix_bulk_edit'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 302)
-        self.assertEqual(Prefix.objects.get(pk=self.prefixes[3].pk).status, 'active')
-
-        # Edit permitted objects
-        form_data['pk'] = [p.pk for p in self.prefixes[:3]]
-        request = {
-            'path': reverse('ipam:prefix_bulk_edit'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 302)
-        self.assertEqual(Prefix.objects.get(pk=self.prefixes[0].pk).status, 'reserved')
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-    def test_bulk_delete_objects(self):
-        form_data = {
-            'pk': [p.pk for p in self.prefixes],
-            'confirm': True,
-            '_confirm': True,
-        }
-
-        # Attempt to delete objects without permission
-        request = {
-            'path': reverse('ipam:prefix_bulk_delete'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 403)
-
-        # Assign object permission
-        obj_perm = ObjectPermission(
-            constraints={'site__name': 'Site 1'},
-            actions=['view', 'delete']
-        )
-        obj_perm.save()
-        obj_perm.users.add(self.user)
-        obj_perm.object_types.add(ContentType.objects.get_for_model(Prefix))
-
-        # Attempt to delete non-permitted object
-        request = {
-            'path': reverse('ipam:prefix_bulk_delete'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 200)
-        self.assertTrue(Prefix.objects.filter(pk=self.prefixes[3].pk).exists())
-
-        # Delete permitted objects
-        form_data['pk'] = [p.pk for p in self.prefixes[:3]]
-        request = {
-            'path': reverse('ipam:prefix_bulk_delete'),
-            'data': form_data,
-        }
-        response = self.client.post(**request)
-        self.assertHttpStatus(response, 302)
-        self.assertFalse(Prefix.objects.filter(pk=self.prefixes[0].pk).exists())
-
-
 class ObjectPermissionAPIViewTestCase(TestCase):
     client_class = APIClient
 

From 9a1531442a9529115dca2ec83a46968f5295ff6e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 15:11:05 -0400
Subject: [PATCH 244/505] Apply restrict_form_fields() to bulk edit views

---
 netbox/utilities/testing/views.py | 10 ++++------
 netbox/utilities/views.py         |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 392a26fb2..bd0eaeccd 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -654,7 +654,6 @@ class ViewTestCases:
         def _get_csv_data(self):
             return '\n'.join(self.csv_data)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_import_objects_without_permission(self):
             data = {
                 'csv': self._get_csv_data(),
@@ -669,7 +668,7 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(response, 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_import_objects_with_permission(self):
             initial_count = self.model.objects.count()
             data = {
@@ -691,7 +690,7 @@ class ViewTestCases:
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
             self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_import_objects_with_constrained_permission(self):
             initial_count = self.model.objects.count()
             data = {
@@ -728,7 +727,6 @@ class ViewTestCases:
         """
         bulk_edit_data = {}
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_edit_objects_without_permission(self):
             pk_list = self.model.objects.values_list('pk', flat=True)[:3]
             data = {
@@ -744,7 +742,7 @@ class ViewTestCases:
             with disable_warnings('django.request'):
                 self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 403)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_edit_objects_with_permission(self):
             pk_list = self.model.objects.values_list('pk', flat=True)[:3]
             data = {
@@ -768,7 +766,7 @@ class ViewTestCases:
             for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_edit_objects_with_constrained_permission(self):
             initial_instances = self.model.objects.all()[:3]
             pk_list = list(self.model.objects.values_list('pk', flat=True)[:3])
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 7fd41804b..a929b3af2 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -863,6 +863,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
         if '_apply' in request.POST:
             form = self.form(model, request.POST)
+            restrict_form_fields(form, request.user)
 
             if form.is_valid():
                 logger.debug("Form validation was successful")
@@ -970,6 +971,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 initial_data['device_type'] = request.GET.get('device_type')
 
             form = self.form(model, initial=initial_data)
+            restrict_form_fields(form, request.user)
 
         # Retrieve objects being edited
         table = self.table(self.queryset.filter(pk__in=pk_list), orderable=False)

From 40c416618ae0c3c13db3d2137e31aadf9f879e34 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 15:13:41 -0400
Subject: [PATCH 245/505] Link to cable termination objects

---
 netbox/templates/dcim/inc/cable_termination.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 0711ff121..1ba3d05c9 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -16,7 +16,9 @@
         </tr>
         <tr>
             <td>Component</td>
-            <td>{{ termination }}</td>
+            <td>
+                <a href="{{ termination.get_absolute_url }}">{{ termination }}</a>
+            </td>
         </tr>
     {% else %}
         {# Circuit termination #}

From 04571ce92042d446a9f53e1a8472323b09f08bf9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 15:21:59 -0400
Subject: [PATCH 246/505] Fix the initial permissions check on create/edit view
 tests

---
 netbox/utilities/testing/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index bd0eaeccd..6152153d9 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -275,7 +275,7 @@ class ViewTestCases:
 
             # Try GET without permission
             with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(self._get_url('add')), 403)
+                self.assertHttpStatus(self.client.get(self._get_url('add')), 403)
 
             # Try POST without permission
             request = {
@@ -360,7 +360,7 @@ class ViewTestCases:
 
             # Try GET without permission
             with disable_warnings('django.request'):
-                self.assertHttpStatus(self.client.post(self._get_url('edit', instance)), 403)
+                self.assertHttpStatus(self.client.get(self._get_url('edit', instance)), 403)
 
             # Try POST without permission
             request = {

From a452e78fa65226c45a970beb4a187497207bcea1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 15:28:08 -0400
Subject: [PATCH 247/505] Use unrestricted() when compiling ObjectPermissions
 for user

---
 netbox/netbox/authentication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 10d2d1b09..7381ca685 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -24,7 +24,7 @@ class ObjectPermissionBackend(ModelBackend):
         Return all permissions granted to the user by an ObjectPermission.
         """
         # Retrieve all assigned ObjectPermissions
-        object_permissions = ObjectPermission.objects.filter(
+        object_permissions = ObjectPermission.objects.unrestricted().filter(
             Q(users=user_obj) |
             Q(groups__user=user_obj)
         ).prefetch_related('object_types')

From 8c0adc9c61763678270e38581c0b62df1f595301 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 16:15:21 -0400
Subject: [PATCH 248/505] Update test methods to call unrestricted() on
 RestrictedQuerySets

---
 netbox/utilities/testing/views.py | 107 ++++++++++++++++--------------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 6152153d9..12c811396 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -165,6 +165,14 @@ class ModelViewTestCase(TestCase):
         if self.model is None:
             raise Exception("Test case requires model to be defined")
 
+    def _get_queryset(self):
+        """
+        Return a base queryset suitable for use in test methods. Call unrestricted() if RestrictedQuerySet is in use.
+        """
+        if hasattr(self.model.objects, 'restrict'):
+            return self.model.objects.unrestricted()
+        return self.model.objects.all()
+
     def _get_base_url(self):
         """
         Return the base format for a URL for the test's model. Override this to test for a model which belongs
@@ -208,12 +216,12 @@ class ViewTestCases:
         def test_get_object_anonymous(self):
             # Make the request as an unauthenticated user
             self.client.logout()
-            response = self.client.get(self.model.objects.first().get_absolute_url())
+            response = self.client.get(self._get_queryset().first().get_absolute_url())
             self.assertHttpStatus(response, 200)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_without_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Try GET without permission
             with disable_warnings('django.request'):
@@ -221,7 +229,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_with_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Add model-level permission
             obj_perm = ObjectPermission(
@@ -236,7 +244,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_with_constrained_permission(self):
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self._get_queryset().all()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -259,7 +267,7 @@ class ViewTestCases:
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_get_object_changelog(self):
-            url = self._get_url('changelog', self.model.objects.first())
+            url = self._get_url('changelog', self._get_queryset().first())
             response = self.client.get(url)
             self.assertHttpStatus(response, 200)
 
@@ -288,7 +296,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_create_object_with_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
 
             # Assign unconstrained permission
             obj_perm = ObjectPermission(
@@ -307,12 +315,12 @@ class ViewTestCases:
                 'data': post_data(self.form_data),
             }
             self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertEqual(initial_count + 1, self.model.objects.count())
-            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+            self.assertEqual(initial_count + 1, self._get_queryset().count())
+            self.assertInstanceEqual(self._get_queryset().order_by('pk').last(), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_create_object_with_constrained_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
 
             # Assign constrained permission
             obj_perm = ObjectPermission(
@@ -332,7 +340,7 @@ class ViewTestCases:
                 'data': post_data(self.form_data),
             }
             self.assertHttpStatus(self.client.post(**request), 200)
-            self.assertEqual(initial_count, self.model.objects.count())  # Check that no object was created
+            self.assertEqual(initial_count, self._get_queryset().count())  # Check that no object was created
 
             # Update the ObjectPermission to allow creation
             obj_perm.constraints = {'pk__gt': 0}
@@ -344,8 +352,8 @@ class ViewTestCases:
                 'data': post_data(self.form_data),
             }
             self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertEqual(initial_count + 1, self.model.objects.count())
-            self.assertInstanceEqual(self.model.objects.order_by('pk').last(), self.form_data)
+            self.assertEqual(initial_count + 1, self._get_queryset().count())
+            self.assertInstanceEqual(self._get_queryset().order_by('pk').last(), self.form_data)
 
     class EditObjectViewTestCase(ModelViewTestCase):
         """
@@ -356,7 +364,7 @@ class ViewTestCases:
         form_data = {}
 
         def test_edit_object_without_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Try GET without permission
             with disable_warnings('django.request'):
@@ -372,7 +380,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_edit_object_with_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
@@ -391,11 +399,11 @@ class ViewTestCases:
                 'data': post_data(self.form_data),
             }
             self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertInstanceEqual(self.model.objects.get(pk=instance.pk), self.form_data)
+            self.assertInstanceEqual(self._get_queryset().get(pk=instance.pk), self.form_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_edit_object_with_constrained_permission(self):
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self._get_queryset().all()[:2]
 
             # Assign constrained permission
             obj_perm = ObjectPermission(
@@ -418,7 +426,7 @@ class ViewTestCases:
                 'data': post_data(self.form_data),
             }
             self.assertHttpStatus(self.client.post(**request), 302)
-            self.assertInstanceEqual(self.model.objects.get(pk=instance1.pk), self.form_data)
+            self.assertInstanceEqual(self._get_queryset().get(pk=instance1.pk), self.form_data)
 
             # Try to edit a non-permitted object
             request = {
@@ -432,7 +440,7 @@ class ViewTestCases:
         Delete a single instance.
         """
         def test_delete_object_without_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Try GET without permission
             with disable_warnings('django.request'):
@@ -448,7 +456,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_delete_object_with_permission(self):
-            instance = self.model.objects.first()
+            instance = self._get_queryset().first()
 
             # Assign model-level permission
             obj_perm = ObjectPermission(
@@ -468,11 +476,11 @@ class ViewTestCases:
             }
             self.assertHttpStatus(self.client.post(**request), 302)
             with self.assertRaises(ObjectDoesNotExist):
-                self.model.objects.get(pk=instance.pk)
+                self._get_queryset().get(pk=instance.pk)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_delete_object_with_constrained_permission(self):
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self._get_queryset().all()[:2]
 
             # Assign object-level permission
             obj_perm = ObjectPermission(
@@ -496,7 +504,7 @@ class ViewTestCases:
             }
             self.assertHttpStatus(self.client.post(**request), 302)
             with self.assertRaises(ObjectDoesNotExist):
-                self.model.objects.get(pk=instance1.pk)
+                self._get_queryset().get(pk=instance1.pk)
 
             # Try to delete a non-permitted object
             request = {
@@ -504,7 +512,7 @@ class ViewTestCases:
                 'data': post_data({'confirm': True}),
             }
             self.assertHttpStatus(self.client.post(**request), 404)
-            self.assertTrue(self.model.objects.filter(pk=instance2.pk).exists())
+            self.assertTrue(self._get_queryset().filter(pk=instance2.pk).exists())
 
     class ListObjectsViewTestCase(ModelViewTestCase):
         """
@@ -546,7 +554,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_with_constrained_permission(self):
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self._get_queryset().all()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -591,7 +599,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_create_objects_with_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.bulk_create_data),
@@ -608,13 +616,13 @@ class ViewTestCases:
             # Bulk create objects
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
-            self.assertEqual(initial_count + self.bulk_create_count, self.model.objects.count())
-            for instance in self.model.objects.order_by('-pk')[:self.bulk_create_count]:
+            self.assertEqual(initial_count + self.bulk_create_count, self._get_queryset().count())
+            for instance in self._get_queryset().order_by('-pk')[:self.bulk_create_count]:
                 self.assertInstanceEqual(instance, self.bulk_create_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_create_objects_with_constrained_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.bulk_create_data),
@@ -631,7 +639,7 @@ class ViewTestCases:
 
             # Attempt to make the request with unmet constraints
             self.assertHttpStatus(self.client.post(**request), 200)
-            self.assertEqual(self.model.objects.count(), initial_count)
+            self.assertEqual(self._get_queryset().count(), initial_count)
 
             # Update the ObjectPermission to allow creation
             obj_perm.constraints = {'pk__gt': 0}  # Dummy constraint to allow all
@@ -639,8 +647,8 @@ class ViewTestCases:
 
             response = self.client.post(**request)
             self.assertHttpStatus(response, 302)
-            self.assertEqual(initial_count + self.bulk_create_count, self.model.objects.count())
-            for instance in self.model.objects.order_by('-pk')[:self.bulk_create_count]:
+            self.assertEqual(initial_count + self.bulk_create_count, self._get_queryset().count())
+            for instance in self._get_queryset().order_by('-pk')[:self.bulk_create_count]:
                 self.assertInstanceEqual(instance, self.bulk_create_data)
 
     class BulkImportObjectsViewTestCase(ModelViewTestCase):
@@ -670,7 +678,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_import_objects_with_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
             data = {
                 'csv': self._get_csv_data(),
             }
@@ -688,11 +696,11 @@ class ViewTestCases:
 
             # Test POST with permission
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
-            self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
+            self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_import_objects_with_constrained_permission(self):
-            initial_count = self.model.objects.count()
+            initial_count = self._get_queryset().count()
             data = {
                 'csv': self._get_csv_data(),
             }
@@ -708,7 +716,7 @@ class ViewTestCases:
 
             # Attempt to import non-permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
-            self.assertEqual(self.model.objects.count(), initial_count)
+            self.assertEqual(self._get_queryset().count(), initial_count)
 
             # Update permission constraints
             obj_perm.constraints = {'pk__gt': 0}  # Dummy permission to allow all
@@ -716,7 +724,7 @@ class ViewTestCases:
 
             # Import permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
-            self.assertEqual(self.model.objects.count(), initial_count + len(self.csv_data) - 1)
+            self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
 
     class BulkEditObjectsViewTestCase(ModelViewTestCase):
         """
@@ -728,7 +736,7 @@ class ViewTestCases:
         bulk_edit_data = {}
 
         def test_bulk_edit_objects_without_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            pk_list = self._get_queryset().values_list('pk', flat=True)[:3]
             data = {
                 'pk': pk_list,
                 '_apply': True,  # Form button
@@ -744,7 +752,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_edit_objects_with_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            pk_list = self._get_queryset().values_list('pk', flat=True)[:3]
             data = {
                 'pk': pk_list,
                 '_apply': True,  # Form button
@@ -763,13 +771,12 @@ class ViewTestCases:
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
-            for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
+            for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)):
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
         def test_bulk_edit_objects_with_constrained_permission(self):
-            initial_instances = self.model.objects.all()[:3]
-            pk_list = list(self.model.objects.values_list('pk', flat=True)[:3])
+            pk_list = list(self._get_queryset().values_list('pk', flat=True)[:3])
             data = {
                 'pk': pk_list,
                 '_apply': True,  # Form button
@@ -781,7 +788,7 @@ class ViewTestCases:
             # Dynamically determine a constraint that will *not* be matched by the updated objects.
             attr_name = list(self.bulk_edit_data.keys())[0]
             field = self.model._meta.get_field(attr_name)
-            value = field.value_from_object(self.model.objects.first())
+            value = field.value_from_object(self._get_queryset().first())
 
             # Assign constrained permission
             obj_perm = ObjectPermission(
@@ -802,7 +809,7 @@ class ViewTestCases:
 
             # Bulk edit permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('bulk_edit'), data), 302)
-            for i, instance in enumerate(self.model.objects.filter(pk__in=pk_list)):
+            for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)):
                 self.assertInstanceEqual(instance, self.bulk_edit_data)
 
     class BulkDeleteObjectsViewTestCase(ModelViewTestCase):
@@ -811,7 +818,7 @@ class ViewTestCases:
         """
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_delete_objects_without_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)[:3]
+            pk_list = self._get_queryset().values_list('pk', flat=True)[:3]
             data = {
                 'pk': pk_list,
                 'confirm': True,
@@ -828,7 +835,7 @@ class ViewTestCases:
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_delete_objects_with_permission(self):
-            pk_list = self.model.objects.values_list('pk', flat=True)
+            pk_list = self._get_queryset().values_list('pk', flat=True)
             data = {
                 'pk': pk_list,
                 'confirm': True,
@@ -845,12 +852,12 @@ class ViewTestCases:
 
             # Try POST with model-level permission
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
-            self.assertEqual(self.model.objects.count(), 0)
+            self.assertEqual(self._get_queryset().count(), 0)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_bulk_delete_objects_with_constrained_permission(self):
-            initial_count = self.model.objects.count()
-            pk_list = self.model.objects.values_list('pk', flat=True)
+            initial_count = self._get_queryset().count()
+            pk_list = self._get_queryset().values_list('pk', flat=True)
             data = {
                 'pk': pk_list,
                 'confirm': True,
@@ -868,7 +875,7 @@ class ViewTestCases:
 
             # Attempt to bulk delete non-permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
-            self.assertEqual(self.model.objects.count(), initial_count)
+            self.assertEqual(self._get_queryset().count(), initial_count)
 
             # Update permission constraints
             obj_perm.constraints = {'pk__gt': 0}  # Dummy permission to allow all
@@ -876,7 +883,7 @@ class ViewTestCases:
 
             # Bulk delete permitted objects
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
-            self.assertEqual(self.model.objects.count(), 0)
+            self.assertEqual(self._get_queryset().count(), 0)
 
     class PrimaryObjectViewTestCase(
         GetObjectViewTestCase,

From 86d1370512993d0b252b799905ff00897a4f0407 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 26 Jun 2020 16:26:22 -0400
Subject: [PATCH 249/505] Apply restrict_form_fields() to import views

---
 netbox/utilities/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index a929b3af2..6596660ce 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -629,6 +629,7 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             # Initialize model form
             data = form.cleaned_data['data']
             model_form = self.model_form(data)
+            restrict_form_fields(model_form, request.user)
 
             # Assign default values for any fields which were not specified. We have to do this manually because passing
             # 'initial=' to the form on initialization merely sets default values for the widgets. Since widgets are not
@@ -782,6 +783,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                     headers, records = form.cleaned_data['csv']
                     for row, data in enumerate(records, start=1):
                         obj_form = self.model_form(data, headers=headers)
+                        restrict_form_fields(obj_form, request.user)
 
                         if obj_form.is_valid():
                             obj = self._save_obj(obj_form, request)

From 3777fbccc3ad504c50da2d3556f119565960dbd8 Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 29 Jun 2020 03:50:05 -0400
Subject: [PATCH 250/505] Implements #2006 - run reports and scripts in the
 background

---
 netbox/extras/admin.py                        |  21 +--
 netbox/extras/api/nested_serializers.py       |  21 +--
 netbox/extras/api/serializers.py              |  49 ++++--
 netbox/extras/api/urls.py                     |   3 +
 netbox/extras/api/views.py                    |  94 +++++++++--
 netbox/extras/choices.py                      |  29 ++++
 netbox/extras/constants.py                    |   3 +-
 netbox/extras/filters.py                      |  32 +++-
 netbox/extras/migrations/0043_reports.py      |  22 +++
 netbox/extras/migrations/0044_jobresult.py    |  76 +++++++++
 netbox/extras/models/__init__.py              |   7 +-
 netbox/extras/models/models.py                | 137 ++++++++++++++--
 netbox/extras/reports.py                      |  42 +++--
 netbox/extras/scripts.py                      |  49 ++++--
 netbox/extras/tables.py                       |  42 ++++-
 netbox/extras/templatetags/log_levels.py      |  11 +-
 netbox/extras/urls.py                         |   1 +
 netbox/extras/views.py                        | 152 +++++++++++++-----
 netbox/netbox/views.py                        |   4 +-
 netbox/project-static/js/job_result.js        |  52 ++++++
 netbox/templates/extras/inc/job_label.html    |  11 ++
 netbox/templates/extras/inc/report_label.html |   7 -
 netbox/templates/extras/report.html           |  34 +++-
 netbox/templates/extras/report_list.html      |   4 +-
 netbox/templates/extras/script.html           |  42 -----
 netbox/templates/extras/script_result.html    | 107 ++++++++++++
 netbox/utilities/constants.py                 |  22 +++
 netbox/utilities/utils.py                     |  37 ++++-
 netbox/utilities/views.py                     |  34 ++++
 29 files changed, 953 insertions(+), 192 deletions(-)
 create mode 100644 netbox/extras/migrations/0043_reports.py
 create mode 100644 netbox/extras/migrations/0044_jobresult.py
 create mode 100644 netbox/project-static/js/job_result.js
 create mode 100644 netbox/templates/extras/inc/job_label.html
 delete mode 100644 netbox/templates/extras/inc/report_label.html
 create mode 100644 netbox/templates/extras/script_result.html

diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py
index 808d7ce32..629edf5ce 100644
--- a/netbox/extras/admin.py
+++ b/netbox/extras/admin.py
@@ -2,7 +2,7 @@ from django import forms
 from django.contrib import admin
 
 from utilities.forms import LaxURLField
-from .models import CustomField, CustomFieldChoice, CustomLink, Graph, ExportTemplate, ReportResult, Webhook
+from .models import CustomField, CustomFieldChoice, CustomLink, Graph, ExportTemplate, JobResult, Webhook
 from .reports import get_report
 
 
@@ -228,27 +228,18 @@ class ExportTemplateAdmin(admin.ModelAdmin):
 # Reports
 #
 
-@admin.register(ReportResult)
-class ReportResultAdmin(admin.ModelAdmin):
+@admin.register(JobResult)
+class JobResultAdmin(admin.ModelAdmin):
     list_display = [
-        'report', 'active', 'created', 'user', 'passing',
+        'obj_type', 'name', 'created', 'completed', 'user', 'status',
     ]
     fields = [
-        'report', 'user', 'passing', 'data',
+        'obj_type', 'name', 'created', 'completed', 'user', 'status', 'data', 'job_id'
     ]
     list_filter = [
-        'failed',
+        'status',
     ]
     readonly_fields = fields
 
     def has_add_permission(self, request):
         return False
-
-    def active(self, obj):
-        module, report_name = obj.report.split('.')
-        return True if get_report(module, report_name) else False
-    active.boolean = True
-
-    def passing(self, obj):
-        return not obj.failed
-    passing.boolean = True
diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py
index 4e95b389b..e3fb2e0db 100644
--- a/netbox/extras/api/nested_serializers.py
+++ b/netbox/extras/api/nested_serializers.py
@@ -1,13 +1,14 @@
 from rest_framework import serializers
 
-from extras import models
-from utilities.api import WritableNestedSerializer
+from extras import choices, models
+from users.api.nested_serializers import NestedUserSerializer
+from utilities.api import ChoiceField, WritableNestedSerializer
 
 __all__ = [
     'NestedConfigContextSerializer',
     'NestedExportTemplateSerializer',
     'NestedGraphSerializer',
-    'NestedReportResultSerializer',
+    'NestedJobResultSerializer',
     'NestedTagSerializer',
 ]
 
@@ -44,13 +45,13 @@ class NestedTagSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'name', 'slug', 'color']
 
 
-class NestedReportResultSerializer(serializers.ModelSerializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='extras-api:report-detail',
-        lookup_field='report',
-        lookup_url_kwarg='pk'
+class NestedJobResultSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:jobresult-detail')
+    status = ChoiceField(choices=choices.JobResultStatusChoices)
+    user = NestedUserSerializer(
+        read_only=True
     )
 
     class Meta:
-        model = models.ReportResult
-        fields = ['url', 'created', 'user', 'failed']
+        model = models.JobResult
+        fields = ['url', 'created', 'completed', 'user', 'status']
diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 5bf664b2f..2a8cae35c 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -11,7 +11,7 @@ from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
 from extras.choices import *
 from extras.constants import *
 from extras.models import (
-    ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, Tag,
+    ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, JobResult, Tag,
 )
 from extras.utils import FeatureQuery
 from tenancy.api.nested_serializers import NestedTenantSerializer, NestedTenantGroupSerializer
@@ -232,27 +232,46 @@ class ConfigContextSerializer(ValidatedModelSerializer):
         ]
 
 
+#
+# Job Results
+#
+
+class JobResultSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:jobresult-detail')
+    user = NestedUserSerializer(
+        read_only=True
+    )
+    status = ChoiceField(choices=JobResultStatusChoices, read_only=True)
+    obj_type = ContentTypeField(
+        read_only=True
+    )
+
+    class Meta:
+        model = JobResult
+        fields = [
+            'id', 'url', 'created', 'completed', 'name', 'obj_type', 'status', 'user', 'data', 'job_id',
+        ]
+
+
 #
 # Reports
 #
 
-class ReportResultSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = ReportResult
-        fields = ['created', 'user', 'failed', 'data']
-
-
 class ReportSerializer(serializers.Serializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='extras-api:report-detail',
+        lookup_field='full_name',
+        lookup_url_kwarg='pk'
+    )
     module = serializers.CharField(max_length=255)
     name = serializers.CharField(max_length=255)
     description = serializers.CharField(max_length=255, required=False)
     test_methods = serializers.ListField(child=serializers.CharField(max_length=255))
-    result = NestedReportResultSerializer()
+    result = NestedJobResultSerializer()
 
 
 class ReportDetailSerializer(ReportSerializer):
-    result = ReportResultSerializer()
+    result = JobResultSerializer()
 
 
 #
@@ -260,10 +279,16 @@ class ReportDetailSerializer(ReportSerializer):
 #
 
 class ScriptSerializer(serializers.Serializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='extras-api:script-detail',
+        lookup_field='full_name',
+        lookup_url_kwarg='pk'
+    )
     id = serializers.SerializerMethodField(read_only=True)
     name = serializers.SerializerMethodField(read_only=True)
     description = serializers.SerializerMethodField(read_only=True)
     vars = serializers.SerializerMethodField(read_only=True)
+    result = NestedJobResultSerializer()
 
     def get_id(self, instance):
         return '{}.{}'.format(instance.__module__, instance.__name__)
@@ -280,6 +305,10 @@ class ScriptSerializer(serializers.Serializer):
         }
 
 
+class ScriptDetailSerializer(ScriptSerializer):
+    result = JobResultSerializer()
+
+
 class ScriptInputSerializer(serializers.Serializer):
     data = serializers.JSONField()
     commit = serializers.BooleanField()
diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py
index 8d8463bad..9927215df 100644
--- a/netbox/extras/api/urls.py
+++ b/netbox/extras/api/urls.py
@@ -41,5 +41,8 @@ router.register('scripts', views.ScriptViewSet, basename='script')
 # Change logging
 router.register('object-changes', views.ObjectChangeViewSet)
 
+# Job Results
+router.register('job-results', views.JobResultViewSet)
+
 app_name = 'extras-api'
 urlpatterns = router.urls
diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index b40cb4459..e2ee57059 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -10,8 +10,9 @@ from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
 
 from extras import filters
+from extras.choices import JobResultStatusChoices
 from extras.models import (
-    ConfigContext, CustomFieldChoice, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult, Tag,
+    ConfigContext, CustomFieldChoice, ExportTemplate, Graph, ImageAttachment, ObjectChange, JobResult, Tag,
 )
 from extras.reports import get_report, get_reports
 from extras.scripts import get_script, get_scripts, run_script
@@ -165,13 +166,21 @@ class ReportViewSet(ViewSet):
         Compile all reports and their related results (if any). Result data is deferred in the list view.
         """
         report_list = []
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        results = {
+            r.name: r
+            for r in JobResult.objects.filter(
+                obj_type=report_content_type,
+                status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+            ).defer('data')
+        }
 
         # Iterate through all available Reports.
         for module_name, reports in get_reports():
             for report in reports:
 
-                # Attach the relevant ReportResult (if any) to each Report.
-                report.result = ReportResult.objects.filter(report=report.full_name).defer('data').first()
+                # Attach the relevant JobResult (if any) to each Report.
+                report.result = results.get(report.full_name, None)
                 report_list.append(report)
 
         serializer = serializers.ReportSerializer(report_list, many=True, context={
@@ -185,27 +194,41 @@ class ReportViewSet(ViewSet):
         Retrieve a single Report identified as "<module>.<report>".
         """
 
-        # Retrieve the Report and ReportResult, if any.
+        # Retrieve the Report and JobResult, if any.
         report = self._retrieve_report(pk)
-        report.result = ReportResult.objects.filter(report=report.full_name).first()
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        report.result = JobResult.objects.filter(
+            obj_type=report_content_type,
+            name=report.full_name,
+            status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        ).first()
 
-        serializer = serializers.ReportDetailSerializer(report)
+        serializer = serializers.ReportDetailSerializer(report, context={
+            'request': request
+        })
 
         return Response(serializer.data)
 
     @action(detail=True, methods=['post'])
     def run(self, request, pk):
         """
-        Run a Report and create a new ReportResult, overwriting any previous result for the Report.
+        Run a Report identified as "<module>.<script>" and return the pending JobResult as the result
         """
 
         # Check that the user has permission to run reports.
         if not request.user.has_perm('extras.add_reportresult'):
             raise PermissionDenied("This user does not have permission to run reports.")
 
-        # Retrieve and run the Report. This will create a new ReportResult.
+        # Retrieve and run the Report. This will create a new JobResult.
         report = self._retrieve_report(pk)
-        report.run()
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        job_result = JobResult.enqueue_job(
+            run_report,
+            report.full_name,
+            report_content_type,
+            request.user
+        )
+        report.result = job_result
 
         serializer = serializers.ReportDetailSerializer(report)
 
@@ -231,23 +254,42 @@ class ScriptViewSet(ViewSet):
 
     def list(self, request):
 
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+        results = {
+            r.name: r
+            for r in JobResult.objects.filter(
+                obj_type=script_content_type,
+                status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+            ).defer('data').order_by('created')
+        }
+
         flat_list = []
         for script_list in get_scripts().values():
             flat_list.extend(script_list.values())
 
+        # Attach JobResult objects to each script (if any)
+        for script in flat_list:
+            script.result = results.get(script.full_name, None)
+
         serializer = serializers.ScriptSerializer(flat_list, many=True, context={'request': request})
 
         return Response(serializer.data)
 
     def retrieve(self, request, pk):
         script = self._get_script(pk)
-        serializer = serializers.ScriptSerializer(script, context={'request': request})
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+        script.result = JobResult.objects.filter(
+            obj_type=script_content_type,
+            name=script.full_name,
+            status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        ).first()
+        serializer = serializers.ScriptDetailSerializer(script, context={'request': request})
 
         return Response(serializer.data)
 
     def post(self, request, pk):
         """
-        Run a Script identified as "<module>.<script>".
+        Run a Script identified as "<module>.<script>" and return the pending JobResult as the result
         """
         script = self._get_script(pk)()
         input_serializer = serializers.ScriptInputSerializer(data=request.data)
@@ -255,10 +297,21 @@ class ScriptViewSet(ViewSet):
         if input_serializer.is_valid():
             data = input_serializer.data['data']
             commit = input_serializer.data['commit']
-            script.output, execution_time = run_script(script, data, request, commit)
-            output_serializer = serializers.ScriptOutputSerializer(script)
 
-            return Response(output_serializer.data)
+            script_content_type = ContentType.objects.get(app_label='extras', model='script')
+            job_result = JobResult.enqueue_job(
+                run_script,
+                script.full_name,
+                script_content_type,
+                request.user,
+                data=form.cleaned_data,
+                request=copy_safe_request(request),
+                commit=commit
+            )
+            script.result = job_result
+            serializer = serializers.ScriptDetailSerializer(script)
+
+            return Response(serializer.data)
 
         return Response(input_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
@@ -274,3 +327,16 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet):
     queryset = ObjectChange.objects.prefetch_related('user')
     serializer_class = serializers.ObjectChangeSerializer
     filterset_class = filters.ObjectChangeFilterSet
+
+
+#
+# Job Results
+#
+
+class JobResultViewSet(ReadOnlyModelViewSet):
+    """
+    Retrieve a list of job results
+    """
+    queryset = JobResult.objects.prefetch_related('user')
+    serializer_class = serializers.JobResultSerializer
+    filterset_class = filters.JobResultFilterSet
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index 9811cc0b0..8650b1e22 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -120,6 +120,35 @@ class TemplateLanguageChoices(ChoiceSet):
     }
 
 
+#
+# Job results
+#
+
+class JobResultStatusChoices(ChoiceSet):
+
+    STATUS_PENDING = 'pending'
+    STATUS_RUNNING = 'running'
+    STATUS_COMPLETED = 'completed'
+    STATUS_FAILED = 'failed'
+
+    CHOICES = (
+        (STATUS_PENDING, 'Pending'),
+        (STATUS_RUNNING, 'Running'),
+        (STATUS_COMPLETED, 'Completed'),
+        (STATUS_FAILED, 'Failed'),
+    )
+
+    TERMINAL_STATE_CHOICES = (
+        STATUS_COMPLETED,
+        STATUS_FAILED,
+    )
+
+    NON_TERMINAL_STATE_CHOICES = (
+        STATUS_PENDING,
+        STATUS_RUNNING,
+    )
+
+
 #
 # Webhooks
 #
diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py
index 3b6c044dc..55f3c73c7 100644
--- a/netbox/extras/constants.py
+++ b/netbox/extras/constants.py
@@ -19,7 +19,8 @@ HTTP_CONTENT_TYPE_JSON = 'application/json'
 EXTRAS_FEATURES = [
     'custom_fields',
     'custom_links',
-    'graphs',
     'export_templates',
+    'graphs',
+    'job_results',
     'webhooks'
 ]
diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index eac55ad69..8223f2e48 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -7,7 +7,7 @@ from tenancy.models import Tenant, TenantGroup
 from utilities.filters import BaseFilterSet
 from virtualization.models import Cluster, ClusterGroup
 from .choices import *
-from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, Tag
+from .models import ConfigContext, CustomField, Graph, ExportTemplate, ObjectChange, JobResult, Tag
 
 
 __all__ = (
@@ -287,3 +287,33 @@ class CreatedUpdatedFilterSet(django_filters.FilterSet):
         field_name='last_updated',
         lookup_expr='lte'
     )
+
+
+#
+# Job Results
+#
+
+class JobResultFilterSet(BaseFilterSet):
+    q = django_filters.CharFilter(
+        method='search',
+        label='Search',
+    )
+    created = django_filters.DateTimeFilter()
+    completed = django_filters.DateTimeFilter()
+    status = django_filters.MultipleChoiceFilter(
+        choices=JobResultStatusChoices,
+        null_value=None
+    )
+
+    class Meta:
+        model = JobResult
+        fields = [
+            'id', 'created', 'completed', 'status', 'user', 'obj_type', 'name'
+        ]
+
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        return queryset.filter(
+            Q(user__username__icontains=value)
+        )
diff --git a/netbox/extras/migrations/0043_reports.py b/netbox/extras/migrations/0043_reports.py
new file mode 100644
index 000000000..9e19d33a7
--- /dev/null
+++ b/netbox/extras/migrations/0043_reports.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.7 on 2020-06-22 20:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0042_customfield_manager'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+            ],
+            options={
+                'managed': False,
+            },
+        ),
+    ]
diff --git a/netbox/extras/migrations/0044_jobresult.py b/netbox/extras/migrations/0044_jobresult.py
new file mode 100644
index 000000000..8b4c817ee
--- /dev/null
+++ b/netbox/extras/migrations/0044_jobresult.py
@@ -0,0 +1,76 @@
+# Generated by Django 3.0.7 on 2020-06-23 02:28
+
+import uuid
+
+from django.conf import settings
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+import extras.utils
+
+
+def convert_job_results(apps, schema_editor):
+    """
+    Convert ReportResult objects to JobResult objects
+    """
+    from extras.choices import JobResultStatusChoices
+
+    ReportResult = apps.get_model('extras', 'ReportResult')
+    JobResult = apps.get_model('extras', 'JobResult')
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    report_content_type = ContentType.objects.get(app_label='extras', model='report')
+
+    job_results = []
+    for report_result in ReportResult.objects.all():
+        if report_result.failed:
+            status = JobResultStatusChoices.STATUS_FAILED
+        else:
+            status = JobResultStatusChoices.STATUS_COMPLETED
+        job_results.append(
+            JobResult(
+                name=report_result.report,
+                obj_type=report_content_type,
+                created=report_result.created,
+                completed=report_result.created,
+                user=report_result.user,
+                status=status,
+                data=report_result.data,
+                job_id=uuid.uuid4()
+            )
+        )
+    JobResult.objects.bulk_create(job_results)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('extras', '0043_reports'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='JobResult',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('completed', models.DateTimeField(blank=True, null=True)),
+                ('status', models.CharField(default='pending', max_length=30)),
+                ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
+                ('job_id', models.UUIDField(unique=True)),
+                ('obj_type', models.ForeignKey(limit_choices_to=extras.utils.FeatureQuery('job_results'), on_delete=django.db.models.deletion.CASCADE, related_name='job_results', to='contenttypes.ContentType')),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['obj_type', 'name', '-created'],
+            },
+        ),
+        migrations.RunPython(
+            code=convert_job_results
+        ),
+        migrations.DeleteModel(
+            name='ReportResult'
+        )
+    ]
diff --git a/netbox/extras/models/__init__.py b/netbox/extras/models/__init__.py
index 2942bfa48..89dd54260 100644
--- a/netbox/extras/models/__init__.py
+++ b/netbox/extras/models/__init__.py
@@ -1,7 +1,7 @@
 from .customfields import CustomField, CustomFieldChoice, CustomFieldModel, CustomFieldValue
 from .models import (
-    ConfigContext, ConfigContextModel, CustomLink, ExportTemplate, Graph, ImageAttachment, ObjectChange, ReportResult,
-    Script, Webhook,
+    ConfigContext, ConfigContextModel, CustomLink, ExportTemplate, Graph, ImageAttachment, JobResult, ObjectChange,
+    Report, Script, Webhook,
 )
 from .tags import Tag, TaggedItem
 
@@ -16,8 +16,9 @@ __all__ = (
     'ExportTemplate',
     'Graph',
     'ImageAttachment',
+    'JobResult',
     'ObjectChange',
-    'ReportResult',
+    'Report',
     'Script',
     'Tag',
     'TaggedItem',
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 082a153e9..ab28e9d5b 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -1,6 +1,8 @@
 import json
+import uuid
 from collections import OrderedDict
 
+import django_rq
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -17,7 +19,7 @@ from utilities.utils import deepmerge, render_jinja2
 from extras.choices import *
 from extras.constants import *
 from extras.querysets import ConfigContextQuerySet
-from extras.utils import FeatureQuery, image_upload
+from extras.utils import extras_features, FeatureQuery, image_upload
 
 
 #
@@ -562,29 +564,92 @@ class ConfigContextModel(models.Model):
 # Custom scripts
 #
 
+@extras_features('job_results')
 class Script(models.Model):
     """
     Dummy model used to generate permissions for custom scripts. Does not exist in the database.
     """
+
     class Meta:
         managed = False
 
+    @classmethod
+    def get_absolute_url_from_job_result(cls, job_result):
+        """
+        Given a JobResult that links to this content type, return URL to an instance which corresponds to that job
+        result, i.e. for historical records
+        """
+        if job_result.obj_type.model_class() != cls:
+            return None
+
+        module, script_name = job_result.name.split('.')
+        return reverse(
+            'extras:script_history_detail',
+            kwargs={
+                'module': module,
+                'script_name': script_name,
+                'job_id': job_result.job_id
+            }
+        )
+
 
 #
-# Report results
+# Reports
 #
 
-class ReportResult(models.Model):
+@extras_features('job_results')
+class Report(models.Model):
+    """
+    Dummy model used to generate permissions for reports. Does not exist in the database.
+    """
+
+    class Meta:
+        managed = False
+
+    @classmethod
+    def get_absolute_url_from_job_result(cls, job_result):
+        """
+        Given a JobResult that links to this content type, return URL to an instance which corresponds to that job
+        result, i.e. for historical records
+        """
+        if job_result.obj_type.model_class() != cls:
+            return None
+
+        return reverse(
+            'extras:report_history_detail',
+            kwargs={
+                'name': job_result.name,
+                'job_id': job_result.job_id
+            }
+        )
+
+
+#
+# Job results
+#
+
+class JobResult(models.Model):
     """
     This model stores the results from running a user-defined report.
     """
-    report = models.CharField(
-        max_length=255,
-        unique=True
+    name = models.CharField(
+        max_length=255
+    )
+    obj_type = models.ForeignKey(
+        to=ContentType,
+        related_name='job_results',
+        verbose_name='Object types',
+        limit_choices_to=FeatureQuery('job_results'),
+        help_text="The object type to which this job result applies.",
+        on_delete=models.CASCADE,
     )
     created = models.DateTimeField(
         auto_now_add=True
     )
+    completed = models.DateTimeField(
+        null=True,
+        blank=True
+    )
     user = models.ForeignKey(
         to=User,
         on_delete=models.SET_NULL,
@@ -592,19 +657,65 @@ class ReportResult(models.Model):
         blank=True,
         null=True
     )
-    failed = models.BooleanField()
-    data = JSONField()
+    status = models.CharField(
+        max_length=30,
+        choices=JobResultStatusChoices,
+        default=JobResultStatusChoices.STATUS_PENDING
+    )
+    data = JSONField(
+        null=True,
+        blank=True
+    )
+    job_id = models.UUIDField(
+        unique=True
+    )
 
     class Meta:
-        ordering = ['report']
+        ordering = ['obj_type', 'name', '-created']
 
     def __str__(self):
-        return "{} {} at {}".format(
-            self.report,
-            "passed" if not self.failed else "failed",
-            self.created
+        return str(self.job_id)
+
+    def get_absolute_url(self):
+        """
+        Job results are accessed only under the context of the content type they link to
+        """
+        return self.obj_type.model_class().get_absolute_url_from_job_result(self)
+
+    @property
+    def duration(self):
+        if not self.completed:
+            return None
+
+        duration = self.completed - self.created
+        minutes, seconds = divmod(duration.total_seconds(), 60)
+
+        return f"{int(minutes)} minutes, {seconds:.2f} seconds"
+
+
+    @classmethod
+    def enqueue_job(cls, func, name, obj_type, user, *args, **kwargs):
+        """
+        Create a JobResult instance and enqueue a job using the given callable
+
+        func: The callable object to be enqueued for execution
+        name: Name for the JobResult instance
+        obj_type: ContentType to link to the JobResult instance obj_type
+        user: User object to link to the JobResult instance
+        args: additional args passed to the callable
+        kwargs: additional kargs passed to the callable
+        """
+        job_result = cls.objects.create(
+            name=name,
+            obj_type=obj_type,
+            user=user,
+            job_id=uuid.uuid4()
         )
 
+        func.delay(*args, job_id=str(job_result.job_id), job_result=job_result, **kwargs)
+
+        return job_result
+
 
 #
 # Change logging
diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index d4db12daa..88cf1b8ed 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -5,10 +5,13 @@ import pkgutil
 from collections import OrderedDict
 
 from django.conf import settings
+from django.db.models import Q
 from django.utils import timezone
+from django_rq import job
 
+from .choices import JobResultStatusChoices
 from .constants import *
-from .models import ReportResult
+from .models import JobResult
 
 
 def is_report(obj):
@@ -60,6 +63,25 @@ def get_reports():
     return module_list
 
 
+@job('default')
+def run_report(job_result, *args, **kwargs):
+    """
+    Helper function to call the run method on a report. This is needed to get around the inability to pickle an instance
+    method for queueing into the background processor.
+    """
+    module_name, report_name = job_result.name.split('.', 1)
+    report = get_report(module_name, report_name)
+    report.run(job_result)
+
+    # Delete any previous terminal state results
+    JobResult.objects.filter(
+        obj_type=job_result.obj_type,
+        status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+    ).exclude(
+        pk=job_result.pk
+    ).delete()
+
+
 class Report(object):
     """
     NetBox users can extend this object to write custom reports to be used for validating data within NetBox. Each
@@ -177,27 +199,29 @@ class Report(object):
         self.logger.info(f"Failure | {obj}: {message}")
         self.failed = True
 
-    def run(self):
+    def run(self, job_result):
         """
-        Run the report and return its results. Each test method will be executed in order.
+        Run the report and save its results. Each test method will be executed in order.
         """
         self.logger.info(f"Running report")
+        job_result.status = JobResultStatusChoices.STATUS_RUNNING
+        job_result.save()
 
         for method_name in self.test_methods:
             self.active_test = method_name
             test_method = getattr(self, method_name)
             test_method()
 
-        # Delete any previous ReportResult and create a new one to record the result.
-        ReportResult.objects.filter(report=self.full_name).delete()
-        result = ReportResult(report=self.full_name, failed=self.failed, data=self._results)
-        result.save()
-        self.result = result
-
         if self.failed:
             self.logger.warning("Report failed")
+            job_result.status = JobResultStatusChoices.STATUS_FAILED
         else:
             self.logger.info("Report completed successfully")
+            job_result.status = JobResultStatusChoices.STATUS_COMPLETED
+
+        job_result.data = self._results
+        job_result.completed = timezone.now()
+        job_result.save()
 
         # Perform any post-run tasks
         self.post_run()
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index e41aa89e3..c801bf3a2 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -12,9 +12,15 @@ from django import forms
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import transaction
+from django.utils import timezone
+from django.utils.decorators import classproperty
+from django_rq import job
 from mptt.forms import TreeNodeChoiceField, TreeNodeMultipleChoiceField
 from mptt.models import MPTTModel
 
+from extras.api.serializers import ScriptOutputSerializer
+from extras.choices import JobResultStatusChoices
+from extras.models import JobResult
 from ipam.formfields import IPAddressFormField, IPNetworkFormField
 from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator
 from .constants import LOG_DEFAULT, LOG_FAILURE, LOG_INFO, LOG_SUCCESS, LOG_WARNING
@@ -269,6 +275,10 @@ class BaseScript:
     def __str__(self):
         return getattr(self.Meta, 'name', self.__class__.__name__)
 
+    @classproperty
+    def full_name(self):
+        return '.'.join([self.__module__, self.__name__])
+
     @classmethod
     def module(cls):
         return cls.__module__
@@ -375,7 +385,8 @@ def is_variable(obj):
     return isinstance(obj, ScriptVariable)
 
 
-def run_script(script, data, request, commit=True):
+@job('default')
+def run_script(data, request, commit=True, *args, **kwargs):
     """
     A wrapper for calling Script.run(). This performs error handling and provides a hook for committing changes. It
     exists outside of the Script class to ensure it cannot be overridden by a script author.
@@ -384,8 +395,15 @@ def run_script(script, data, request, commit=True):
     start_time = None
     end_time = None
 
-    script_name = script.__class__.__name__
-    logger = logging.getLogger(f"netbox.scripts.{script.module()}.{script_name}")
+    job_result = kwargs.pop('job_result')
+    module, script_name = job_result.name.split('.', 1)
+
+    script = get_script(module, script_name)()
+
+    job_result.status = JobResultStatusChoices.STATUS_RUNNING
+    job_result.save()
+
+    logger = logging.getLogger(f"netbox.scripts.{module}.{script_name}")
     logger.info(f"Running script (commit={commit})")
 
     # Add files to form data
@@ -405,9 +423,8 @@ def run_script(script, data, request, commit=True):
 
     try:
         with transaction.atomic():
-            start_time = time.time()
-            output = script.run(**kwargs)
-            end_time = time.time()
+            script.output = script.run(**kwargs)
+            job_result.status = JobResultStatusChoices.STATUS_COMPLETED
             if not commit:
                 raise AbortTransaction()
     except AbortTransaction:
@@ -419,6 +436,7 @@ def run_script(script, data, request, commit=True):
         )
         logger.error(f"Exception raised during script execution: {e}")
         commit = False
+        job_result.status = JobResultStatusChoices.STATUS_FAILED
     finally:
         if not commit:
             # Delete all pending changelog entries
@@ -427,14 +445,19 @@ def run_script(script, data, request, commit=True):
                 "Database changes have been reverted automatically."
             )
 
-    # Calculate execution time
-    if end_time is not None:
-        execution_time = end_time - start_time
-        logger.info(f"Script completed in {execution_time:.4f} seconds")
-    else:
-        execution_time = None
+    job_result.data = ScriptOutputSerializer(script).data
+    job_result.completed = timezone.now()
+    job_result.save()
 
-    return output, execution_time
+    logger.info(f"Script completed in {job_result.duration}")
+
+    # Delete any previous terminal state results
+    JobResult.objects.filter(
+        obj_type=job_result.obj_type,
+        status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+    ).exclude(
+        pk=job_result.pk
+    ).delete()
 
 
 def get_scripts(use_names=False):
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 7a78d4b19..1398ff667 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
-from .models import ConfigContext, ObjectChange, Tag, TaggedItem
+from .models import ConfigContext, ObjectChange, JobResult, Tag, TaggedItem
 
 TAG_ACTIONS = """
 <a href="{% url 'extras:tag_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
@@ -61,6 +61,28 @@ OBJECTCHANGE_REQUEST_ID = """
 <a href="{% url 'extras:objectchange_list' %}?request_id={{ value }}">{{ value }}</a>
 """
 
+JOB_RESULT_CREATED = """
+<a href="{{ record.get_absolute_url }}">{{ value|date:"SHORT_DATETIME_FORMAT" }}</a>
+"""
+
+JOB_RESULT_COMPLETED = """
+<span>{% if value %}{{ value|date:"SHORT_DATETIME_FORMAT" }}{% else %}—{% endif %}</span>
+"""
+
+JOB_RESULT_STATUS = """
+{% if record.status == 'failed' %}
+    <label class="label label-danger">Failed</label>
+{% elif record.status == 'pending' %}
+    <label class="label label-default">Pending</label>
+{% elif record.status == 'running' %}
+    <label class="label label-warning">Running</label>
+{% elif record.status == 'completed' %}
+    <label class="label label-success">Passed</label>
+{% else %}
+    <label class="label label-default">N/A</label>
+{% endif %}
+"""
+
 
 class TagTable(BaseTable):
     pk = ToggleColumn()
@@ -133,3 +155,21 @@ class ObjectChangeTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = ObjectChange
         fields = ('time', 'user_name', 'action', 'changed_object_type', 'object_repr', 'request_id')
+
+
+class JobResultHistoryTable(BaseTable):
+    created = tables.TemplateColumn(
+        template_code=JOB_RESULT_CREATED,
+        verbose_name='Run'
+    )
+    completed = tables.TemplateColumn(
+        template_code=JOB_RESULT_COMPLETED
+    )
+    status = tables.TemplateColumn(
+        template_code=JOB_RESULT_STATUS
+    )
+
+    class Meta(BaseTable.Meta):
+        model = JobResult
+        fields = ('created', 'completed', 'status')
+
diff --git a/netbox/extras/templatetags/log_levels.py b/netbox/extras/templatetags/log_levels.py
index f1a545cb9..93dbe3897 100644
--- a/netbox/extras/templatetags/log_levels.py
+++ b/netbox/extras/templatetags/log_levels.py
@@ -11,24 +11,25 @@ def log_level(level):
     """
     Display a label indicating a syslog severity (e.g. info, warning, etc.).
     """
+    # TODO: we should convert this to a choices class
     levels = {
-        LOG_DEFAULT: {
+        'default': {
             'name': 'Default',
             'class': 'default'
         },
-        LOG_SUCCESS: {
+        'success': {
             'name': 'Success',
             'class': 'success',
         },
-        LOG_INFO: {
+        'info': {
             'name': 'Info',
             'class': 'info'
         },
-        LOG_WARNING: {
+        'warning': {
             'name': 'Warning',
             'class': 'warning'
         },
-        LOG_FAILURE: {
+        'failure': {
             'name': 'Failure',
             'class': 'danger'
         }
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index 3007e6524..a51a3b7e5 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -43,5 +43,6 @@ urlpatterns = [
     # Scripts
     path('scripts/', views.ScriptListView.as_view(), name='script_list'),
     path('scripts/<str:module>/<str:name>/', views.ScriptView.as_view(), name='script'),
+    path('scripts/<str:module>/<str:name>/result/<int:job_result_pk>/', views.ScriptResultView.as_view(), name='script_result'),
 
 ]
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index ff8ce75e0..505fc6595 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1,3 +1,5 @@
+import time
+
 from django import template
 from django.conf import settings
 from django.contrib import messages
@@ -11,14 +13,15 @@ from django_tables2 import RequestConfig
 
 from utilities.forms import ConfirmationForm
 from utilities.paginator import EnhancedPaginator
-from utilities.utils import shallow_compare_dict
+from utilities.utils import copy_safe_request, shallow_compare_dict
 from utilities.views import (
     BulkDeleteView, BulkEditView, BulkImportView, ObjectView, ObjectDeleteView, ObjectEditView, ObjectListView,
-    ObjectPermissionRequiredMixin,
+    ContentTypePermissionRequiredMixin,
 )
 from . import filters, forms, tables
-from .models import ConfigContext, ImageAttachment, ObjectChange, ReportResult, Tag, TaggedItem
-from .reports import get_report, get_reports
+from .choices import JobResultStatusChoices
+from .models import ConfigContext, ImageAttachment, ObjectChange, Report, JobResult, Script, Tag, TaggedItem
+from .reports import get_report, get_reports, run_report
 from .scripts import get_scripts, run_script
 
 
@@ -332,9 +335,9 @@ class ImageAttachmentDeleteView(ObjectDeleteView):
 # Reports
 #
 
-class ReportListView(ObjectPermissionRequiredMixin, View):
+class ReportListView(ContentTypePermissionRequiredMixin, View):
     """
-    Retrieve all of the available reports from disk and the recorded ReportResult (if any) for each.
+    Retrieve all of the available reports from disk and the recorded JobResult (if any) for each.
     """
     def get_required_permission(self):
         return 'extras.view_reportresult'
@@ -342,7 +345,14 @@ class ReportListView(ObjectPermissionRequiredMixin, View):
     def get(self, request):
 
         reports = get_reports()
-        results = {r.report: r for r in ReportResult.objects.all()}
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        results = {
+            r.name: r
+            for r in JobResult.objects.filter(
+                obj_type=report_content_type,
+                status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+            ).defer('data')
+        }
 
         ret = []
         for module, report_list in reports:
@@ -357,23 +367,46 @@ class ReportListView(ObjectPermissionRequiredMixin, View):
         })
 
 
-class ReportView(ObjectPermissionRequiredMixin, View):
+class GetReportMixin:
+    def get_report(self, name):
+        if '.' not in name:
+            raise Http404
+        # Retrieve the Report by "<module>.<report>"
+        module_name, report_name = name.split('.', 1)
+        report = get_report(module_name, report_name)
+        if report is None:
+            raise Http404
+
+        return report
+
+
+class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
     """
-    Display a single Report and its associated ReportResult (if any).
+    Display a single Report and its associated JobResult (if any).
     """
     def get_required_permission(self):
         return 'extras.view_reportresult'
 
     def get(self, request, name):
 
-        # Retrieve the Report by "<module>.<report>"
-        module_name, report_name = name.split('.')
-        report = get_report(module_name, report_name)
-        if report is None:
-            raise Http404
+        report = self.get_report(name)
 
-        # Attach the ReportResult (if any)
-        report.result = ReportResult.objects.filter(report=report.full_name).first()
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        latest_run_result = JobResult.objects.filter(
+            obj_type=report_content_type,
+            name=report.full_name,
+            status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        ).first()
+        pending_run_result = JobResult.objects.filter(
+            obj_type=report_content_type,
+            name=report.full_name,
+            status__in=JobResultStatusChoices.NON_TERMINAL_STATE_CHOICES
+        ).order_by(
+            'created'
+        ).first()
+
+        report.result = latest_run_result
+        report.pending_result = pending_run_result
 
         return render(request, 'extras/report.html', {
             'report': report,
@@ -381,7 +414,7 @@ class ReportView(ObjectPermissionRequiredMixin, View):
         })
 
 
-class ReportRunView(ObjectPermissionRequiredMixin, View):
+class ReportRunView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
     """
     Run a Report and record a new ReportResult.
     """
@@ -390,20 +423,19 @@ class ReportRunView(ObjectPermissionRequiredMixin, View):
 
     def post(self, request, name):
 
-        # Retrieve the Report by "<module>.<report>"
-        module_name, report_name = name.split('.')
-        report = get_report(module_name, report_name)
-        if report is None:
-            raise Http404
+        report = self.get_report(name)
 
         form = ConfirmationForm(request.POST)
         if form.is_valid():
 
-            # Run the Report. A new ReportResult is created.
-            report.run()
-            result = 'failed' if report.failed else 'passed'
-            msg = "Ran report {} ({})".format(report.full_name, result)
-            messages.success(request, mark_safe(msg))
+            # Run the Report. A new JobResult is created.
+            report_content_type = ContentType.objects.get(app_label='extras', model='report')
+            job_result = JobResult.enqueue_job(
+                run_report,
+                report.full_name,
+                report_content_type,
+                request.user
+            )
 
         return redirect('extras:report', name=report.full_name)
 
@@ -412,7 +444,16 @@ class ReportRunView(ObjectPermissionRequiredMixin, View):
 # Scripts
 #
 
-class ScriptListView(ObjectPermissionRequiredMixin, View):
+class GetScriptMixin:
+    def _get_script(self, module, name):
+        scripts = get_scripts()
+        try:
+            return scripts[module][name]()
+        except KeyError:
+            raise Http404
+
+
+class ScriptListView(ContentTypePermissionRequiredMixin, View):
 
     def get_required_permission(self):
         return 'extras.view_script'
@@ -424,22 +465,23 @@ class ScriptListView(ObjectPermissionRequiredMixin, View):
         })
 
 
-class ScriptView(ObjectPermissionRequiredMixin, View):
+class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
 
     def get_required_permission(self):
         return 'extras.view_script'
 
-    def _get_script(self, module, name):
-        scripts = get_scripts()
-        try:
-            return scripts[module][name]()
-        except KeyError:
-            raise Http404
-
     def get(self, request, module, name):
         script = self._get_script(module, name)
         form = script.as_form(initial=request.GET)
 
+        # Look for a pending JobResult (use the latest one by creation timestamp)
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+        script.result = JobResult.objects.filter(
+            obj_type=script_content_type,
+            name=script.full_name,
+            status__in=JobResultStatusChoices.NON_TERMINAL_STATE_CHOICES
+        ).first()
+
         return render(request, 'extras/script.html', {
             'module': module,
             'script': script,
@@ -459,12 +501,40 @@ class ScriptView(ObjectPermissionRequiredMixin, View):
 
         if form.is_valid():
             commit = form.cleaned_data.pop('_commit')
-            output, execution_time = run_script(script, form.cleaned_data, request, commit)
+            #output, execution_time = run_script(script, form.cleaned_data, request, commit)
 
-        return render(request, 'extras/script.html', {
+            script_content_type = ContentType.objects.get(app_label='extras', model='script')
+            job_result = JobResult.enqueue_job(
+                run_script,
+                script.full_name,
+                script_content_type,
+                request.user,
+                data=form.cleaned_data,
+                request=copy_safe_request(request),
+                commit=commit
+            )
+
+        return redirect('extras:script_result', module=module, name=name, job_result_pk=job_result.pk)
+
+
+class ScriptResultView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
+
+    def get_required_permission(self):
+        return 'extras.view_script'
+
+    def get(self, request, module, name, job_result_pk):
+        script = self._get_script(module, name)
+        form = script.as_form(initial=request.GET)
+
+        # Look for a pending JobResult (use the latest one by creation timestamp)
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+        result = get_object_or_404(JobResult.objects.all(), pk=job_result_pk)
+        if result.obj_type != script_content_type:
+            raise Http404
+
+        return render(request, 'extras/script_result.html', {
             'module': module,
             'script': script,
-            'form': form,
-            'output': output,
-            'execution_time': execution_time,
+            'result': result,
+            'class_name': name
         })
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index b7cdf0131..613101cda 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -24,7 +24,7 @@ from dcim.tables import (
     CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, RackGroupTable, SiteTable,
     VirtualChassisTable,
 )
-from extras.models import ObjectChange, ReportResult
+from extras.models import ObjectChange, JobResult
 from ipam.filters import AggregateFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
 from ipam.tables import AggregateTable, IPAddressTable, PrefixTable, VLANTable, VRFTable
@@ -241,7 +241,7 @@ class HomeView(View):
         return render(request, self.template_name, {
             'search_form': SearchForm(),
             'stats': stats,
-            'report_results': ReportResult.objects.order_by('-created')[:10],
+            'report_results': [],#ReportResult.objects.order_by('-created')[:10],
             'changelog': changelog[:15],
             'new_release': new_release,
         })
diff --git a/netbox/project-static/js/job_result.js b/netbox/project-static/js/job_result.js
new file mode 100644
index 000000000..3d7293713
--- /dev/null
+++ b/netbox/project-static/js/job_result.js
@@ -0,0 +1,52 @@
+var url = netbox_api_path + "extras/job-results/";
+var timeout = 1000;
+
+function updatePendingStatusLabel(status){
+    var labelClass;
+    if (status.value === 'failed'){
+        labelClass = 'danger';
+    } else if (status.value === 'pending'){
+        labelClass = 'default';
+    } else if (status.value === 'running'){
+        labelClass = 'warning';
+    } else if (status.value === 'completed'){
+        labelClass = 'success';
+    } else {
+        labelClass = 'default';
+    }
+    var elem = $('#pending-result-label > label');
+    elem.attr('class', 'label label-' + labelClass);
+    elem.text(status.label);
+}
+
+function refreshWindow(){
+    window.location.reload();
+}
+
+$(document).ready(function(){
+    if (pending_result_id !== null){
+        (function checkPendingResult(){
+            $.ajax({
+                url: url + pending_result_id + '/',
+                method: 'GET',
+                dataType: 'json',
+                beforeSend: function(xhr, settings) {
+                    xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
+                },
+                context: this,
+                success: function(data) {
+                    updatePendingStatusLabel(data.status);
+                    if (data.status.value === 'completed' || data.status.value === 'failed'){
+                        jobTerminatedAction()
+                    } else {
+                        setTimeout(checkPendingResult, timeout);
+                        if (timeout < 10000) {
+                            // back off each iteration, until we reach a 10s interval
+                            timeout += 1000
+                        }
+                    }
+                }
+            });
+        })();
+    }
+})
diff --git a/netbox/templates/extras/inc/job_label.html b/netbox/templates/extras/inc/job_label.html
new file mode 100644
index 000000000..7ae2b353f
--- /dev/null
+++ b/netbox/templates/extras/inc/job_label.html
@@ -0,0 +1,11 @@
+{% if result.status == 'failed' %}
+    <label class="label label-danger">Failed</label>
+{% elif result.status == 'pending' %}
+    <label class="label label-default">Pending</label>
+{% elif result.status == 'running' %}
+    <label class="label label-warning">Running</label>
+{% elif result.status == 'completed' %}
+    <label class="label label-success">Passed</label>
+{% else %}
+    <label class="label label-default">N/A</label>
+{% endif %}
diff --git a/netbox/templates/extras/inc/report_label.html b/netbox/templates/extras/inc/report_label.html
deleted file mode 100644
index d4d2c5919..000000000
--- a/netbox/templates/extras/inc/report_label.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% if result.failed %}
-    <label class="label label-danger">Failed</label>
-{% elif result %}
-    <label class="label label-success">Passed</label>
-{% else %}
-    <label class="label label-default">N/A</label>
-{% endif %}
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 8ddf74eca..18ea21b99 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load helpers %}
+{% load static %}
 
 {% block title %}{{ report.name }}{% endblock %}
 
@@ -22,14 +23,21 @@
             </form>
         </div>
     {% endif %}
-    <h1>{{ report.name }}{% include 'extras/inc/report_label.html' with result=report.result %}</h1>
+    <h1>{{ report.name }}{% include 'extras/inc/job_label.html' with result=report.result %}</h1>
     <div class="row">
         <div class="col-md-12">
             {% if report.description %}
                 <p class="lead">{{ report.description }}</p>
             {% endif %}
             {% if report.result %}
-                <p>Last run: <strong>{{ report.result.created }}</strong></p>
+                <p>Last run: <strong>{{ report.result.created }}</strong> {% if report.result.completed %} Duration: <strong>{{ report.result.duration }}</strong>{% endif %}</p>
+            {% endif %}
+            {% if report.pending_result %}
+                <p>
+                    Pending run: <strong>{{ report.pending_result.created }}</strong>
+                    <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=report.pending_result %}</span>
+                    <img id="pending-result-loader" src="{% static 'img/ajax-loader.gif' %}" />
+                </p>
             {% endif %}
             {% if report.result %}
                 <div class="panel panel-default">
@@ -100,3 +108,25 @@
         </div>
     </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+{% if report.pending_result %}
+var pending_result_id = {{ report.pending_result.pk }};
+{% else %}
+var pending_result_id = null;
+{% endif %}
+
+function jobTerminatedAction(){
+    $('#pending-result-loader').hide();
+    var refreshButton = document.createElement('button');
+    refreshButton.className = 'btn btn-xs btn-primary';
+    refreshButton.onclick = refreshWindow;
+    refreshButton.innerHTML = '<i class="fa fa-refresh"></i> Refresh';
+    $('#pending-result-loader').parents('p').append(refreshButton)
+}
+
+</script>
+<script src="{% static 'js/job_result.js' %}?v{{ settings.VERSION }}"
+        onerror="window.location='{% url 'media_failure' %}?filename=js/job_result.js'"></script>
+{% endblock %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 7de085974..4cf52243a 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -24,7 +24,7 @@
                                         <a href="{% url 'extras:report' name=report.full_name %}" name="report.{{ report.name }}"><strong>{{ report.name }}</strong></a>
                                     </td>
                                     <td>
-                                        {% include 'extras/inc/report_label.html' with result=report.result %}
+                                        {% include 'extras/inc/job_label.html' with result=report.result %}
                                     </td>
                                     <td>{{ report.description|default:"" }}</td>
                                     {% if report.result %}
@@ -69,7 +69,7 @@
                                 <a href="#report.{{ report.name }}" class="list-group-item">
                                     <i class="fa fa-list-alt"></i> {{ report.name }}
                                     <div class="pull-right">
-                                        {% include 'extras/inc/report_label.html' with result=report.result %}
+                                        {% include 'extras/inc/job_label.html' with result=report.result %}
                                     </div>
                                 </a>
                             {% endfor %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 01dc4bfa5..76a86b435 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -21,51 +21,12 @@
         <li role="presentation" class="active">
             <a href="#run" role="tab" data-toggle="tab" class="active">Run</a>
         </li>
-        <li role="presentation"{% if not output %} class="disabled"{% endif %}>
-            <a href="#output" role="tab" data-toggle="tab">Output</a>
-        </li>
         <li role="presentation">
             <a href="#source" role="tab" data-toggle="tab">Source</a>
         </li>
     </ul>
     <div class="tab-content">
         <div role="tabpanel" class="tab-pane active" id="run">
-            {% if execution_time or script.log %}
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <strong>Script Log</strong>
-                            </div>
-                            <table class="table table-hover panel-body">
-                                <tr>
-                                    <th>Line</th>
-                                    <th>Level</th>
-                                    <th>Message</th>
-                                </tr>
-                                {% for level, message in script.log %}
-                                    <tr>
-                                        <td>{{ forloop.counter }}</td>
-                                        <td>{% log_level level %}</td>
-                                        <td class="rendered-markdown">{{ message|render_markdown }}</td>
-                                    </tr>
-                                {% empty %}
-                                    <tr>
-                                        <td colspan="3" class="text-center text-muted">
-                                            No log output
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                            {% if execution_time %}
-                                <div class="panel-footer text-right text-muted">
-                                    <small>Exec time: {{ execution_time|floatformat:3 }}s</small>
-                                </div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </div>
-            {% endif %}
             <div class="row">
                 <div class="col-md-6 col-md-offset-3">
                     {% if not perms.extras.run_script %}
@@ -100,9 +61,6 @@
                 </div>
             </div>
         </div>
-        <div role="tabpanel" class="tab-pane" id="output">
-            <pre>{{ output }}</pre>
-        </div>
         <div role="tabpanel" class="tab-pane" id="source">
             <p><code>{{ script.filename }}</code></p>
             <pre>{{ script.source }}</pre>
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
new file mode 100644
index 000000000..64e242a56
--- /dev/null
+++ b/netbox/templates/extras/script_result.html
@@ -0,0 +1,107 @@
+{% extends 'base.html' %}
+{% load helpers %}
+{% load form_helpers %}
+{% load log_levels %}
+{% load static %}
+
+{% block title %}{{ script }}{% endblock %}
+
+{% block content %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                <li><a href="{% url 'extras:script_list' %}">Scripts</a></li>
+                <li><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
+                <li><a href="{% url 'extras:script' module=script.module name=class_name %}">{{ script }}</a></li>
+                <li>{{ result.created }}</li>
+            </ol>
+        </div>
+    </div>
+    <h1>{{ script }}</h1>
+    <p>{{ script.Meta.description }}</p>
+    <ul class="nav nav-tabs" role="tablist">
+        <li role="presentation" class="active">
+            <a href="#log" role="tab" data-toggle="tab" class="active">Log</a>
+        </li>
+        <li role="presentation">
+            <a href="#output" role="tab" data-toggle="tab">Output</a>
+        </li>
+        <li role="presentation">
+            <a href="#source" role="tab" data-toggle="tab">Source</a>
+        </li>
+    </ul>
+    <div class="tab-content">
+        <p>
+            Run: <strong>{{ result.created }}</strong>
+            {% if result.completed %}
+                Duration: <strong>{{ result.duration }}</strong>
+            {% else %}
+                <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
+                <img id="pending-result-loader" src="{% static 'img/ajax-loader.gif' %}" />
+            {% endif %}
+        </p>
+        <div role="tabpanel" class="tab-pane active" id="log">
+            {% if result.completed %}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Script Log</strong>
+                            </div>
+                            <table class="table table-hover panel-body">
+                                <tr>
+                                    <th>Line</th>
+                                    <th>Level</th>
+                                    <th>Message</th>
+                                </tr>
+                                {% for log in result.data.log %}
+                                    <tr>
+                                        <td>{{ forloop.counter }}</td>
+                                        <td>{% log_level log.status %}</td>
+                                        <td class="rendered-markdown">{{ log.message|render_markdown }}</td>
+                                    </tr>
+                                {% empty %}
+                                    <tr>
+                                        <td colspan="3" class="text-center text-muted">
+                                            No log output
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </table>
+                            {% if execution_time %}
+                                <div class="panel-footer text-right text-muted">
+                                    <small>Exec time: {{ execution_time|floatformat:3 }}s</small>
+                                </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+        <div role="tabpanel" class="tab-pane" id="output">
+            <pre>{{ result.data.output }}</pre>
+        </div>
+        <div role="tabpanel" class="tab-pane" id="source">
+            <p><code>{{ script.filename }}</code></p>
+            <pre>{{ script.source }}</pre>
+        </div>
+    </div>
+{% endblock %}
+
+
+{% block javascript %}
+<script type="text/javascript">
+{% if not result.completed %}
+var pending_result_id = {{ result.pk }};
+{% else %}
+var pending_result_id = null;
+{% endif %}
+
+function jobTerminatedAction(){
+    refreshWindow()
+}
+
+</script>
+<script src="{% static 'js/job_result.js' %}?v{{ settings.VERSION }}"
+        onerror="window.location='{% url 'media_failure' %}?filename=js/job_result.js'"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py
index 9a3a7d028..8cf047c42 100644
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -42,3 +42,25 @@ ADVISORY_LOCK_KEYS = {
     'available-prefixes': 100100,
     'available-ips': 100200,
 }
+
+#
+# HTTP Request META safe copy
+#
+
+HTTP_REQUEST_META_SAFE_COPY = [
+    'CONTENT_LENGTH',
+    'CONTENT_TYPE',
+    'HTTP_ACCEPT',
+    'HTTP_ACCEPT_ENCODING',
+    'HTTP_ACCEPT_LANGUAGE',
+    'HTTP_HOST',
+    'HTTP_REFERER',
+    'HTTP_USER_AGENT',
+    'QUERY_STRING',
+    'REMOTE_ADDR',
+    'REMOTE_HOST',
+    'REMOTE_USER',
+    'REQUEST_METHOD',
+    'SERVER_NAME',
+    'SERVER_PORT',
+]
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 4c07f5520..f734e6534 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -5,11 +5,12 @@ from collections import OrderedDict
 from django.core.serializers import serialize
 from django.db.models import Count, OuterRef, Subquery
 from django.http import QueryDict
+from django.http.request import HttpRequest
 from jinja2 import Environment
 
 from dcim.choices import CableLengthUnitChoices
 from extras.utils import is_taggable
-
+from utilities.constants import HTTP_REQUEST_META_SAFE_COPY
 
 def csv_format(data):
     """
@@ -257,3 +258,37 @@ def flatten_dict(d, prefix='', separator='.'):
         else:
             ret[key] = v
     return ret
+
+
+#
+# Fake request object
+#
+
+class NetBoxFakeRequest:
+    """
+    A fake request object which is explicitly defined at the module level so it is able to be pickled. It simply
+    takes what is passed to it as kwargs on init and sets them as instance variables.
+    """
+    def __init__(self, *args, **kwargs):
+        for k, v in kwargs.items():
+            setattr(self, k, v)
+
+
+def copy_safe_request(request):
+    """
+    Copy selected attributes from a request object into a new fake request object. This is needed in places where
+    thread safe pickling of the useful request data is needed.
+    """
+    meta = {
+        k: request.META[k]
+        for k in HTTP_REQUEST_META_SAFE_COPY
+        if k in request.META and isinstance(request.META[k], str)
+    }
+    return NetBoxFakeRequest(**{
+        'META': meta,
+        'POST': request.POST,
+        'GET': request.GET,
+        'FILES': request.FILES,
+        'user': request.user,
+        'path': request.path
+    })
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 22788cf64..3f921941e 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -39,6 +39,40 @@ from .paginator import EnhancedPaginator, get_paginate_count
 # Mixins
 #
 
+class ContentTypePermissionRequiredMixin(AccessMixin):
+    """
+    Similar to Django's built-in PermissionRequiredMixin, but extended to check model-level permission assignments.
+    This is related to ObjectPermissionRequiredMixin, except that is does not enforce object-level permissions,
+    and fits within NetBox's custom permission enforcement system.
+
+    additional_permissions: An optional iterable of statically declared permissions to evaluate in addition to those
+                            derived from the object type
+    """
+    additional_permissions = list()
+
+    def get_required_permission(self):
+        """
+        Return the specific permission necessary to perform the requested action on an object.
+        """
+        raise NotImplementedError(f"{self.__class__.__name__} must implement get_required_permission()")
+
+    def has_permission(self):
+        user = self.request.user
+        permission_required = self.get_required_permission()
+
+        # Check that the user has been granted the required permission(s).
+        if user.has_perms((permission_required, *self.additional_permissions)):
+            return True
+
+        return False
+
+    def dispatch(self, request, *args, **kwargs):
+        if not self.has_permission():
+            return self.handle_no_permission()
+
+        return super().dispatch(request, *args, **kwargs)
+
+
 class ObjectPermissionRequiredMixin(AccessMixin):
     """
     Similar to Django's built-in PermissionRequiredMixin, but extended to check for both model-level and object-level

From 1681dbfa39b9d45791a6b49411b45669e8c4ec6d Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 29 Jun 2020 04:22:01 -0400
Subject: [PATCH 251/505] refactor migration

---
 .../{0044_jobresult.py => 0043_jobresult.py}  | 15 ++++++++++++-
 netbox/extras/migrations/0043_reports.py      | 22 -------------------
 2 files changed, 14 insertions(+), 23 deletions(-)
 rename netbox/extras/migrations/{0044_jobresult.py => 0043_jobresult.py} (84%)
 delete mode 100644 netbox/extras/migrations/0043_reports.py

diff --git a/netbox/extras/migrations/0044_jobresult.py b/netbox/extras/migrations/0043_jobresult.py
similarity index 84%
rename from netbox/extras/migrations/0044_jobresult.py
rename to netbox/extras/migrations/0043_jobresult.py
index 8b4c817ee..f5ad3b1f5 100644
--- a/netbox/extras/migrations/0044_jobresult.py
+++ b/netbox/extras/migrations/0043_jobresult.py
@@ -13,11 +13,15 @@ def convert_job_results(apps, schema_editor):
     """
     Convert ReportResult objects to JobResult objects
     """
+    from django.contrib.contenttypes.management import create_contenttypes
     from extras.choices import JobResultStatusChoices
 
     ReportResult = apps.get_model('extras', 'ReportResult')
     JobResult = apps.get_model('extras', 'JobResult')
     ContentType = apps.get_model('contenttypes', 'ContentType')
+    app_config = apps.get_app_config('extras')
+    app_config.models_module = app_config.models_module or True
+    create_contenttypes(app_config)
     report_content_type = ContentType.objects.get(app_label='extras', model='report')
 
     job_results = []
@@ -46,10 +50,19 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('extras', '0043_reports'),
+        ('extras', '0042_customfield_manager'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+            ],
+            options={
+                'managed': False,
+            },
+        ),
         migrations.CreateModel(
             name='JobResult',
             fields=[
diff --git a/netbox/extras/migrations/0043_reports.py b/netbox/extras/migrations/0043_reports.py
deleted file mode 100644
index 9e19d33a7..000000000
--- a/netbox/extras/migrations/0043_reports.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 3.0.7 on 2020-06-22 20:11
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('extras', '0042_customfield_manager'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Report',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-            ],
-            options={
-                'managed': False,
-            },
-        ),
-    ]

From 0dbe248df8ff43eb0ea573bd0490c3c6bd475b13 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 10:02:00 -0400
Subject: [PATCH 252/505] Call restrict() when retrieving related Graphs

---
 netbox/circuits/api/views.py      |  4 ++--
 netbox/circuits/tests/test_api.py |  2 +-
 netbox/dcim/api/views.py          | 12 ++++++------
 netbox/dcim/tests/test_api.py     |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py
index 363392a4d..4aad07011 100644
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -28,8 +28,8 @@ class ProviderViewSet(CustomFieldModelViewSet):
         """
         A convenience method for rendering graphs for a particular provider.
         """
-        provider = get_object_or_404(Provider, pk=pk)
-        queryset = Graph.objects.filter(type__model='provider')
+        provider = get_object_or_404(self.queryset, pk=pk)
+        queryset = Graph.objects.restrict(request.user).filter(type__model='provider')
         serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': provider})
         return Response(serializer.data)
 
diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index 4e062cc1a..f887db29e 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -49,7 +49,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
         """
         Test retrieval of Graphs assigned to Providers.
         """
-        provider = self.model.objects.first()
+        provider = self.model.objects.unrestricted().first()
         ct = ContentType.objects.get(app_label='circuits', model='provider')
         graphs = (
             Graph(type=ct, name='Graph 1', source='http://example.com/graphs.py?provider={{ obj.slug }}&foo=1'),
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 324edcb49..eb48d40d9 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -103,8 +103,8 @@ class SiteViewSet(CustomFieldModelViewSet):
         """
         A convenience method for rendering graphs for a particular site.
         """
-        site = get_object_or_404(Site, pk=pk)
-        queryset = Graph.objects.filter(type__model='site')
+        site = get_object_or_404(self.queryset, pk=pk)
+        queryset = Graph.objects.restrict(request.user).filter(type__model='site')
         serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': site})
         return Response(serializer.data)
 
@@ -347,8 +347,8 @@ class DeviceViewSet(CustomFieldModelViewSet):
         """
         A convenience method for rendering graphs for a particular Device.
         """
-        device = get_object_or_404(Device, pk=pk)
-        queryset = Graph.objects.filter(type__model='device')
+        device = get_object_or_404(self.queryset, pk=pk)
+        queryset = Graph.objects.restrict(request.user).filter(type__model='device')
         serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': device})
 
         return Response(serializer.data)
@@ -496,8 +496,8 @@ class InterfaceViewSet(CableTraceMixin, ModelViewSet):
         """
         A convenience method for rendering graphs for a particular interface.
         """
-        interface = get_object_or_404(Interface, pk=pk)
-        queryset = Graph.objects.filter(type__model='interface')
+        interface = get_object_or_404(self.queryset, pk=pk)
+        queryset = Graph.objects.restrict(request.user).filter(type__model='interface')
         serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': interface})
         return Response(serializer.data)
 
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 052a77e53..b630741e9 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -107,7 +107,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_site')
-        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.first().pk})
+        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.unrestricted().first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -878,7 +878,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_device')
-        url = reverse('dcim-api:device-graphs', kwargs={'pk': Device.objects.first().pk})
+        url = reverse('dcim-api:device-graphs', kwargs={'pk': Device.objects.unrestricted().first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -1245,7 +1245,7 @@ class InterfaceTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_interface')
-        url = reverse('dcim-api:interface-graphs', kwargs={'pk': Interface.objects.first().pk})
+        url = reverse('dcim-api:interface-graphs', kwargs={'pk': Interface.objects.unrestricted().first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)

From a6b03b88847f2ce1951b4a7b3bfd2c499271867e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 10:38:32 -0400
Subject: [PATCH 253/505] Update WritableNestedSerializer to call
 unrestricted() on RestrictedQuerySets

---
 netbox/utilities/api.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 2e2d7f7f5..067af9e5a 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -254,8 +254,11 @@ class WritableNestedSerializer(ModelSerializer):
         # Dictionary of related object attributes
         if isinstance(data, dict):
             params = dict_to_filter_params(data)
+            queryset = self.Meta.model.objects
+            if hasattr(queryset, 'restrict'):
+                queryset = queryset.unrestricted()
             try:
-                return self.Meta.model.objects.get(**params)
+                return queryset.get(**params)
             except ObjectDoesNotExist:
                 raise ValidationError(
                     "Related object not found using the provided attributes: {}".format(params)
@@ -281,8 +284,11 @@ class WritableNestedSerializer(ModelSerializer):
                 )
 
         # Look up object by PK
+        queryset = self.Meta.model.objects
+        if hasattr(queryset, 'restrict'):
+            queryset = queryset.unrestricted()
         try:
-            return self.Meta.model.objects.get(pk=int(data))
+            return queryset.get(pk=int(data))
         except ObjectDoesNotExist:
             raise ValidationError(
                 "Related object not found using the provided numeric ID: {}".format(pk)

From 6ab4640cdcbcbdc3cc19bf4841f46a989d96e79b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 10:39:06 -0400
Subject: [PATCH 254/505] Update API tests to work with RestrictedQuerySet

---
 netbox/utilities/testing/api.py | 46 +++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index ce4f1d1e5..fdaef4b4b 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -52,7 +52,7 @@ class APIViewTestCases:
             """
             GET a single object as an unauthenticated user.
             """
-            url = self._get_detail_url(self.model.objects.first())
+            url = self._get_detail_url(self.model.objects.unrestricted().first())
             response = self.client.get(url, **self.header)
             self.assertHttpStatus(response, status.HTTP_200_OK)
 
@@ -61,7 +61,7 @@ class APIViewTestCases:
             """
             GET a single object as an authenticated user without the required permission.
             """
-            url = self._get_detail_url(self.model.objects.first())
+            url = self._get_detail_url(self.model.objects.unrestricted().first())
 
             # Try GET without permission
             with disable_warnings('django.request'):
@@ -72,9 +72,9 @@ class APIViewTestCases:
             """
             GET a single object as an authenticated user with permission to view the object.
             """
-            self.assertGreaterEqual(self.model.objects.count(), 2,
+            self.assertGreaterEqual(self.model.objects.unrestricted().count(), 2,
                                     f"Test requires the creation of at least two {self.model} instances")
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self.model.objects.unrestricted()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -104,7 +104,7 @@ class APIViewTestCases:
             url = self._get_list_url()
             response = self.client.get(url, **self.header)
 
-            self.assertEqual(len(response.data['results']), self.model.objects.count())
+            self.assertEqual(len(response.data['results']), self.model.objects.unrestricted().count())
             self.assertHttpStatus(response, status.HTTP_200_OK)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
@@ -115,7 +115,7 @@ class APIViewTestCases:
             url = f'{self._get_list_url()}?brief=1'
             response = self.client.get(url, **self.header)
 
-            self.assertEqual(len(response.data['results']), self.model.objects.count())
+            self.assertEqual(len(response.data['results']), self.model.objects.unrestricted().count())
             self.assertEqual(sorted(response.data['results'][0]), self.brief_fields)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
@@ -134,9 +134,9 @@ class APIViewTestCases:
             """
             GET a list of objects as an authenticated user with permission to view the objects.
             """
-            self.assertGreaterEqual(self.model.objects.count(), 3,
+            self.assertGreaterEqual(self.model.objects.unrestricted().count(), 3,
                                     f"Test requires the creation of at least three {self.model} instances")
-            instance1, instance2 = self.model.objects.all()[:2]
+            instance1, instance2 = self.model.objects.unrestricted()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -178,11 +178,15 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            initial_count = self.model.objects.count()
+            initial_count = self.model.objects.unrestricted().count()
             response = self.client.post(self._get_list_url(), self.create_data[0], format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
-            self.assertEqual(self.model.objects.count(), initial_count + 1)
-            self.assertInstanceEqual(self.model.objects.get(pk=response.data['id']), self.create_data[0], api=True)
+            self.assertEqual(self.model.objects.unrestricted().count(), initial_count + 1)
+            self.assertInstanceEqual(
+                self.model.objects.unrestricted().get(pk=response.data['id']),
+                self.create_data[0],
+                api=True
+            )
 
         def test_bulk_create_objects(self):
             """
@@ -196,13 +200,17 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            initial_count = self.model.objects.count()
+            initial_count = self.model.objects.unrestricted().count()
             response = self.client.post(self._get_list_url(), self.create_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(len(response.data), len(self.create_data))
-            self.assertEqual(self.model.objects.count(), initial_count + len(self.create_data))
+            self.assertEqual(self.model.objects.unrestricted().count(), initial_count + len(self.create_data))
             for i, obj in enumerate(response.data):
-                self.assertInstanceEqual(self.model.objects.get(pk=obj['id']), self.create_data[i], api=True)
+                self.assertInstanceEqual(
+                    self.model.objects.unrestricted().get(pk=obj['id']),
+                    self.create_data[i],
+                    api=True
+                )
 
     class UpdateObjectViewTestCase(APITestCase):
         update_data = {}
@@ -211,7 +219,7 @@ class APIViewTestCases:
             """
             PATCH a single object without permission.
             """
-            url = self._get_detail_url(self.model.objects.first())
+            url = self._get_detail_url(self.model.objects.unrestricted().first())
             update_data = self.update_data or getattr(self, 'create_data')[0]
 
             # Try PATCH without permission
@@ -223,7 +231,7 @@ class APIViewTestCases:
             """
             PATCH a single object identified by its numeric ID.
             """
-            instance = self.model.objects.first()
+            instance = self.model.objects.unrestricted().first()
             url = self._get_detail_url(instance)
             update_data = self.update_data or getattr(self, 'create_data')[0]
 
@@ -246,7 +254,7 @@ class APIViewTestCases:
             """
             DELETE a single object without permission.
             """
-            url = self._get_detail_url(self.model.objects.first())
+            url = self._get_detail_url(self.model.objects.unrestricted().first())
 
             # Try DELETE without permission
             with disable_warnings('django.request'):
@@ -257,7 +265,7 @@ class APIViewTestCases:
             """
             DELETE a single object identified by its numeric ID.
             """
-            instance = self.model.objects.first()
+            instance = self.model.objects.unrestricted().first()
             url = self._get_detail_url(instance)
 
             # Add object-level permission
@@ -270,7 +278,7 @@ class APIViewTestCases:
 
             response = self.client.delete(url, **self.header)
             self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-            self.assertFalse(self.model.objects.filter(pk=instance.pk).exists())
+            self.assertFalse(self.model.objects.unrestricted().filter(pk=instance.pk).exists())
 
     class APIViewTestCase(
         GetObjectViewTestCase,

From ce55d0c791e160e61103340444ea67fa9d68732e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 10:57:09 -0400
Subject: [PATCH 255/505] Tweak querysets to work with restriction

---
 netbox/circuits/api/views.py | 7 +++++--
 netbox/circuits/models.py    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py
index 4aad07011..1575a181b 100644
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -1,4 +1,4 @@
-from django.db.models import Count
+from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -52,7 +52,10 @@ class CircuitTypeViewSet(ModelViewSet):
 
 class CircuitViewSet(CustomFieldModelViewSet):
     queryset = Circuit.objects.prefetch_related(
-        'type', 'tenant', 'provider', 'terminations__site', 'terminations__connected_endpoint__device'
+        Prefetch('terminations', queryset=CircuitTermination.objects.unrestricted().prefetch_related(
+            'site', 'connected_endpoint__device'
+        )),
+        'type', 'tenant', 'provider',
     ).prefetch_related('tags')
     serializer_class = serializers.CircuitSerializer
     filterset_class = filters.CircuitFilterSet
diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index dcf1c5118..72d1c0974 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -239,7 +239,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         return self.STATUS_CLASS_MAP.get(self.status)
 
     def _get_termination(self, side):
-        for ct in self.terminations.all():
+        for ct in self.terminations.unrestricted():
             if ct.term_side == side:
                 return ct
         return None

From 5732466e563f10061fd2a94e36907710de3ef29e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 11:07:11 -0400
Subject: [PATCH 256/505] Signal receiver should call unrestricted()

---
 netbox/circuits/signals.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/circuits/signals.py b/netbox/circuits/signals.py
index 86db21400..071b7af20 100644
--- a/netbox/circuits/signals.py
+++ b/netbox/circuits/signals.py
@@ -10,7 +10,7 @@ def update_circuit(instance, **kwargs):
     """
     When a CircuitTermination has been modified, update the last_updated time of its parent Circuit.
     """
-    circuits = Circuit.objects.filter(pk=instance.circuit_id)
+    circuits = Circuit.objects.unrestricted().filter(pk=instance.circuit_id)
     time = timezone.now()
     for circuit in circuits:
         circuit.last_updated = time

From 10e6b6ca66a7e10eb5df28b1be8e56f6ba8a605d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 11:27:23 -0400
Subject: [PATCH 257/505] Fix RestrictedQuerySet evaluation in tests

---
 netbox/ipam/tests/test_api.py    | 2 +-
 netbox/ipam/tests/test_models.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py
index 70ae738b5..d7b6b3a7b 100644
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -416,7 +416,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
         """
         Attempt and fail to delete a VLAN with a Prefix assigned to it.
         """
-        vlan = VLAN.objects.first()
+        vlan = VLAN.objects.unrestricted().first()
         Prefix.objects.create(prefix=IPNetwork('192.0.2.0/24'), vlan=vlan)
 
         self.add_permissions('ipam.delete_vlan')
diff --git a/netbox/ipam/tests/test_models.py b/netbox/ipam/tests/test_models.py
index 6091aa70e..51d1d9684 100644
--- a/netbox/ipam/tests/test_models.py
+++ b/netbox/ipam/tests/test_models.py
@@ -43,7 +43,7 @@ class TestPrefix(TestCase):
             Prefix(prefix=netaddr.IPNetwork('192.0.2.0/24')),
             Prefix(prefix=netaddr.IPNetwork('192.0.2.0/24')),
         ))
-        duplicate_prefix_pks = [p.pk for p in prefixes[0].get_duplicates()]
+        duplicate_prefix_pks = [p.pk for p in prefixes[0].get_duplicates().unrestricted()]
 
         self.assertSetEqual(set(duplicate_prefix_pks), {prefixes[1].pk, prefixes[2].pk})
 
@@ -227,7 +227,7 @@ class TestIPAddress(TestCase):
             IPAddress(address=netaddr.IPNetwork('192.0.2.1/24')),
             IPAddress(address=netaddr.IPNetwork('192.0.2.1/24')),
         ))
-        duplicate_ip_pks = [p.pk for p in ips[0].get_duplicates()]
+        duplicate_ip_pks = [p.pk for p in ips[0].get_duplicates().unrestricted()]
 
         self.assertSetEqual(set(duplicate_ip_pks), {ips[1].pk, ips[2].pk})
 

From eb45ad600e06252243808050bad54f0219991c9c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 11:35:13 -0400
Subject: [PATCH 258/505] Fix evaluation of RestrictedQuerySets

---
 netbox/ipam/api/views.py |  7 +++++--
 netbox/ipam/models.py    | 10 ++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 0f84ee772..2de99dcc1 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.db.models import Count
+from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404
 from django_pglocks import advisory_lock
 from drf_yasg.utils import swagger_auto_schema
@@ -270,6 +270,9 @@ class VLANViewSet(CustomFieldModelViewSet):
 #
 
 class ServiceViewSet(ModelViewSet):
-    queryset = Service.objects.prefetch_related('device').prefetch_related('tags')
+    queryset = Service.objects.prefetch_related(
+        Prefetch('ipaddresses', queryset=IPAddress.objects.unrestricted()),
+        'device', 'virtual_machine', 'tags'
+    )
     serializer_class = serializers.ServiceSerializer
     filterset_class = filters.ServiceFilterSet
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 4fe0b6e06..5904178cf 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -216,7 +216,9 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
                 })
 
             # Ensure that the aggregate being added is not covered by an existing aggregate
-            covering_aggregates = Aggregate.objects.filter(prefix__net_contains_or_equals=str(self.prefix))
+            covering_aggregates = Aggregate.objects.unrestricted().filter(
+                prefix__net_contains_or_equals=str(self.prefix)
+            )
             if self.pk:
                 covering_aggregates = covering_aggregates.exclude(pk=self.pk)
             if covering_aggregates:
@@ -227,7 +229,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
                 })
 
             # Ensure that the aggregate being added does not cover an existing aggregate
-            covered_aggregates = Aggregate.objects.filter(prefix__net_contained=str(self.prefix))
+            covered_aggregates = Aggregate.objects.unrestricted().filter(prefix__net_contained=str(self.prefix))
             if self.pk:
                 covered_aggregates = covered_aggregates.exclude(pk=self.pk)
             if covered_aggregates:
@@ -722,7 +724,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
 
         # Check for primary IP assignment that doesn't match the assigned device/VM
         if self.pk and type(self.assigned_object) is Interface:
-            device = Device.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
+            device = Device.objects.unrestricted().filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if device:
                 if self.assigned_object is None:
                     raise ValidationError({
@@ -734,7 +736,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
                                      f"{self.assigned_object.device} ({self.assigned_object})"
                     })
         elif self.pk and type(self.assigned_object) is VMInterface:
-            vm = VirtualMachine.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
+            vm = VirtualMachine.unrestricted().objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if vm:
                 if self.assigned_object is None:
                     raise ValidationError({

From 6ecbf45974807563b76d40377e4b453b909933da Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 11:48:36 -0400
Subject: [PATCH 259/505] Fix evaluation of RestrictedQuerySets

---
 netbox/virtualization/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 4a753561a..5d74f8468 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -176,7 +176,7 @@ class Cluster(ChangeLoggedModel, CustomFieldModel):
 
         # If the Cluster is assigned to a Site, verify that all host Devices belong to that Site.
         if self.pk and self.site:
-            nonsite_devices = Device.objects.filter(cluster=self).exclude(site=self.site).count()
+            nonsite_devices = Device.objects.unrestricted().filter(cluster=self).exclude(site=self.site).count()
             if nonsite_devices:
                 raise ValidationError({
                     'site': "{} devices are assigned as hosts for this cluster but are not in site {}".format(
@@ -316,7 +316,7 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # Check for a duplicate name on a VM assigned to the same Cluster 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.tenant is None and VirtualMachine.objects.exclude(pk=self.pk).filter(
+        if self.tenant is None and VirtualMachine.objects.unrestricted().exclude(pk=self.pk).filter(
                 name=self.name, tenant__isnull=True
         ):
             raise ValidationError({

From 89ff59d048b29eba8596402cbcf3bbe0834de9b0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 12:05:00 -0400
Subject: [PATCH 260/505] Add graphs endpoint to VMInterfaceViewSet

---
 netbox/virtualization/api/views.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index f2a689f12..51bc567d2 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -1,7 +1,12 @@
 from django.db.models import Count
+from django.shortcuts import get_object_or_404
+from rest_framework.decorators import action
+from rest_framework.response import Response
 
 from dcim.models import Device
+from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
+from extras.models import Graph
 from utilities.api import ModelViewSet
 from utilities.utils import get_subquery
 from virtualization import filters
@@ -79,3 +84,13 @@ class VMInterfaceViewSet(ModelViewSet):
     )
     serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.VMInterfaceFilterSet
+
+    @action(detail=True)
+    def graphs(self, request, pk):
+        """
+        A convenience method for rendering graphs for a particular VM interface.
+        """
+        vminterface = get_object_or_404(self.queryset, pk=pk)
+        queryset = Graph.objects.restrict(request.user).filter(type__model='vminterface')
+        serializer = RenderedGraphSerializer(queryset, many=True, context={'graphed_object': vminterface})
+        return Response(serializer.data)

From 617e20af0bb6e5b588f5153ff22b2860c1caa809 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 12:06:36 -0400
Subject: [PATCH 261/505] Standardize VMInterfaceTest

---
 netbox/virtualization/tests/test_api.py | 207 +++++++-----------------
 1 file changed, 56 insertions(+), 151 deletions(-)

diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index 8d525f4fe..e108100a9 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -1,7 +1,9 @@
+from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from rest_framework import status
 
 from dcim.choices import InterfaceModeChoices
+from extras.models import Graph
 from ipam.models import VLAN
 from utilities.testing import APITestCase, APIViewTestCases
 from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -161,7 +163,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         """
         Check that config context data is included by default in the virtual machines list.
         """
-        virtualmachine = VirtualMachine.objects.first()
+        virtualmachine = VirtualMachine.objects.unrestricted().first()
         url = '{}?id={}'.format(reverse('virtualization-api:virtualmachine-list'), virtualmachine.pk)
         self.add_permissions('virtualization.view_virtualmachine')
 
@@ -184,7 +186,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         """
         data = {
             'name': 'Virtual Machine 1',
-            'cluster': Cluster.objects.first().pk,
+            'cluster': Cluster.objects.unrestricted().first().pk,
         }
         url = reverse('virtualization-api:virtualmachine-list')
         self.add_permissions('virtualization.add_virtualmachine')
@@ -193,169 +195,72 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
 
 
-# TODO: Standardize InterfaceTest (pending #4721)
-class VMInterfaceTest(APITestCase):
+class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
+    model = VMInterface
+    brief_fields = ['id', 'name', 'url', 'virtual_machine']
 
-    def setUp(self):
-
-        super().setUp()
+    @classmethod
+    def setUpTestData(cls):
 
         clustertype = ClusterType.objects.create(name='Test Cluster Type 1', slug='test-cluster-type-1')
         cluster = Cluster.objects.create(name='Test Cluster 1', type=clustertype)
-        self.virtualmachine = VirtualMachine.objects.create(cluster=cluster, name='Test VM 1')
-        self.interface1 = VMInterface.objects.create(
-            virtual_machine=self.virtualmachine,
-            name='Test Interface 1'
+        virtualmachine = VirtualMachine.objects.create(cluster=cluster, name='Test VM 1')
+
+        interfaces = (
+            VMInterface(virtual_machine=virtualmachine, name='Interface 1'),
+            VMInterface(virtual_machine=virtualmachine, name='Interface 2'),
+            VMInterface(virtual_machine=virtualmachine, name='Interface 3'),
         )
-        self.interface2 = VMInterface.objects.create(
-            virtual_machine=self.virtualmachine,
-            name='Test Interface 2'
-        )
-        self.interface3 = VMInterface.objects.create(
-            virtual_machine=self.virtualmachine,
-            name='Test Interface 3'
+        VMInterface.objects.bulk_create(interfaces)
+
+        vlans = (
+            VLAN(name='VLAN 1', vid=1),
+            VLAN(name='VLAN 2', vid=2),
+            VLAN(name='VLAN 3', vid=3),
         )
+        VLAN.objects.bulk_create(vlans)
 
-        self.vlan1 = VLAN.objects.create(name="Test VLAN 1", vid=1)
-        self.vlan2 = VLAN.objects.create(name="Test VLAN 2", vid=2)
-        self.vlan3 = VLAN.objects.create(name="Test VLAN 3", vid=3)
-
-    def test_get_interface(self):
-        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.view_vminterface')
-
-        response = self.client.get(url, **self.header)
-        self.assertEqual(response.data['name'], self.interface1.name)
-
-    def test_list_interfaces(self):
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.view_vminterface')
-
-        response = self.client.get(url, **self.header)
-        self.assertEqual(response.data['count'], 3)
-
-    def test_list_interfaces_brief(self):
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.view_vminterface')
-
-        response = self.client.get('{}?brief=1'.format(url), **self.header)
-        self.assertEqual(
-            sorted(response.data['results'][0]),
-            ['id', 'name', 'url', 'virtual_machine']
-        )
-
-    def test_create_interface(self):
-        data = {
-            'virtual_machine': self.virtualmachine.pk,
-            'name': 'Test Interface 4',
-        }
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.add_vminterface')
-
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(VMInterface.objects.count(), 4)
-        interface4 = VMInterface.objects.get(pk=response.data['id'])
-        self.assertEqual(interface4.virtual_machine_id, data['virtual_machine'])
-        self.assertEqual(interface4.name, data['name'])
-
-    def test_create_interface_with_802_1q(self):
-        data = {
-            'virtual_machine': self.virtualmachine.pk,
-            'name': 'Test Interface 4',
-            'mode': InterfaceModeChoices.MODE_TAGGED,
-            'untagged_vlan': self.vlan3.id,
-            'tagged_vlans': [self.vlan1.id, self.vlan2.id],
-        }
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.add_vminterface')
-
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(VMInterface.objects.count(), 4)
-        self.assertEqual(response.data['virtual_machine']['id'], data['virtual_machine'])
-        self.assertEqual(response.data['name'], data['name'])
-        self.assertEqual(response.data['untagged_vlan']['id'], data['untagged_vlan'])
-        self.assertEqual([v['id'] for v in response.data['tagged_vlans']], data['tagged_vlans'])
-
-    def test_create_interface_bulk(self):
-        data = [
+        cls.create_data = [
             {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 4',
+                'virtual_machine': virtualmachine.pk,
+                'name': 'Interface 4',
+                'mode': InterfaceModeChoices.MODE_TAGGED,
+                'tagged_vlans': [vlans[0].pk, vlans[1].pk],
+                'untagged_vlan': vlans[2].pk,
             },
             {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 5',
+                'virtual_machine': virtualmachine.pk,
+                'name': 'Interface 5',
+                'mode': InterfaceModeChoices.MODE_TAGGED,
+                'tagged_vlans': [vlans[0].pk, vlans[1].pk],
+                'untagged_vlan': vlans[2].pk,
             },
             {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 6',
+                'virtual_machine': virtualmachine.pk,
+                'name': 'Interface 6',
+                'mode': InterfaceModeChoices.MODE_TAGGED,
+                'tagged_vlans': [vlans[0].pk, vlans[1].pk],
+                'untagged_vlan': vlans[2].pk,
             },
         ]
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.add_vminterface')
 
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(VMInterface.objects.count(), 6)
-        self.assertEqual(response.data[0]['name'], data[0]['name'])
-        self.assertEqual(response.data[1]['name'], data[1]['name'])
-        self.assertEqual(response.data[2]['name'], data[2]['name'])
+    def test_get_interface_graphs(self):
+        """
+        Test retrieval of Graphs assigned to VM interfaces.
+        """
+        ct = ContentType.objects.get_for_model(VMInterface)
+        graphs = (
+            Graph(type=ct, name='Graph 1', source='http://example.com/graphs.py?interface={{ obj.name }}&foo=1'),
+            Graph(type=ct, name='Graph 2', source='http://example.com/graphs.py?interface={{ obj.name }}&foo=2'),
+            Graph(type=ct, name='Graph 3', source='http://example.com/graphs.py?interface={{ obj.name }}&foo=3'),
+        )
+        Graph.objects.bulk_create(graphs)
 
-    def test_create_interface_802_1q_bulk(self):
-        data = [
-            {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 4',
-                'mode': InterfaceModeChoices.MODE_TAGGED,
-                'untagged_vlan': self.vlan2.id,
-                'tagged_vlans': [self.vlan1.id],
-            },
-            {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 5',
-                'mode': InterfaceModeChoices.MODE_TAGGED,
-                'untagged_vlan': self.vlan2.id,
-                'tagged_vlans': [self.vlan1.id],
-            },
-            {
-                'virtual_machine': self.virtualmachine.pk,
-                'name': 'Test Interface 6',
-                'mode': InterfaceModeChoices.MODE_TAGGED,
-                'untagged_vlan': self.vlan2.id,
-                'tagged_vlans': [self.vlan1.id],
-            },
-        ]
-        url = reverse('virtualization-api:vminterface-list')
-        self.add_permissions('virtualization.add_vminterface')
+        self.add_permissions('virtualization.view_vminterface')
+        url = reverse('virtualization-api:vminterface-graphs', kwargs={
+            'pk': VMInterface.objects.unrestricted().first().pk
+        })
+        response = self.client.get(url, **self.header)
 
-        response = self.client.post(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(VMInterface.objects.count(), 6)
-        for i in range(0, 3):
-            self.assertEqual(response.data[i]['name'], data[i]['name'])
-            self.assertEqual([v['id'] for v in response.data[i]['tagged_vlans']], data[i]['tagged_vlans'])
-            self.assertEqual(response.data[i]['untagged_vlan']['id'], data[i]['untagged_vlan'])
-
-    def test_update_interface(self):
-        data = {
-            'virtual_machine': self.virtualmachine.pk,
-            'name': 'Test Interface X',
-        }
-        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.change_vminterface')
-
-        response = self.client.put(url, data, format='json', **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(VMInterface.objects.count(), 3)
-        interface1 = VMInterface.objects.get(pk=response.data['id'])
-        self.assertEqual(interface1.name, data['name'])
-
-    def test_delete_interface(self):
-        url = reverse('virtualization-api:vminterface-detail', kwargs={'pk': self.interface1.pk})
-        self.add_permissions('virtualization.delete_vminterface')
-
-        response = self.client.delete(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-        self.assertEqual(VMInterface.objects.count(), 2)
+        self.assertEqual(len(response.data), 3)
+        self.assertEqual(response.data[0]['embed_url'], 'http://example.com/graphs.py?interface=Interface 1&foo=1')

From 9ea4f82eaa9e50e33e5357d6015a4a99278f0c8a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 12:18:59 -0400
Subject: [PATCH 262/505] Prefetch tagged VLANs for VMInterfaces

---
 netbox/virtualization/api/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 51bc567d2..e3c3224e4 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -1,4 +1,4 @@
-from django.db.models import Count
+from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -7,6 +7,7 @@ from dcim.models import Device
 from extras.api.serializers import RenderedGraphSerializer
 from extras.api.views import CustomFieldModelViewSet
 from extras.models import Graph
+from ipam.models import VLAN
 from utilities.api import ModelViewSet
 from utilities.utils import get_subquery
 from virtualization import filters
@@ -80,6 +81,7 @@ class VMInterfaceViewSet(ModelViewSet):
     queryset = VMInterface.objects.filter(
         virtual_machine__isnull=False
     ).prefetch_related(
+        Prefetch('tagged_vlans', queryset=VLAN.objects.unrestricted()),
         'virtual_machine', 'tags'
     )
     serializer_class = serializers.VMInterfaceSerializer

From a47a100cb7a761e0d1064ff5f0f9f8e877e4b24b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 13:30:41 -0400
Subject: [PATCH 263/505] Fix unrestricted evaluations of RestrictedQuerySet

---
 netbox/dcim/api/views.py       |  2 +-
 netbox/dcim/models/__init__.py | 49 ++++++++++++++---------
 netbox/dcim/tests/test_api.py  | 72 +++++++++++++++++-----------------
 3 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index eb48d40d9..2a3619a2f 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -226,7 +226,7 @@ class ManufacturerViewSet(ModelViewSet):
 #
 
 class DeviceTypeViewSet(CustomFieldModelViewSet):
-    queryset = DeviceType.objects.prefetch_related('manufacturer').prefetch_related('tags').annotate(
+    queryset = DeviceType.objects.prefetch_related('manufacturer', 'tags').annotate(
         device_count=Count('instances')
     )
     serializer_class = serializers.DeviceTypeSerializer
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index f930ae02d..13e80c60a 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -580,7 +580,11 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         if self.pk:
             # Validate that Rack is tall enough to house the installed Devices
-            top_device = Device.objects.filter(rack=self).exclude(position__isnull=True).order_by('-position').first()
+            top_device = Device.objects.unrestricted().filter(
+                rack=self
+            ).exclude(
+                position__isnull=True
+            ).order_by('-position').first()
             if top_device:
                 min_height = top_device.position + top_device.device_type.u_height - 1
                 if self.u_height < min_height:
@@ -601,13 +605,13 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         # Record the original site assignment for this rack.
         _site_id = None
         if self.pk:
-            _site_id = Rack.objects.get(pk=self.pk).site_id
+            _site_id = Rack.objects.unrestricted().get(pk=self.pk).site_id
 
         super().save(*args, **kwargs)
 
         # Update racked devices if the assigned Site has been changed.
         if _site_id is not None and self.site_id != _site_id:
-            devices = Device.objects.filter(rack=self)
+            devices = Device.objects.unrestricted().filter(rack=self)
             for device in devices:
                 device.site = self.site
                 device.save()
@@ -1125,7 +1129,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         # room to expand within their racks. This validation will impose a very high performance penalty when there are
         # many instances to check, but increasing the u_height of a DeviceType should be a very rare occurrence.
         if self.pk and self.u_height > self._original_u_height:
-            for d in Device.objects.filter(device_type=self, position__isnull=False):
+            for d in Device.objects.unrestricted().filter(device_type=self, position__isnull=False):
                 face_required = None if self.is_full_depth else d.face
                 u_available = d.rack.get_available_units(
                     u_height=self.u_height,
@@ -1140,7 +1144,10 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
 
         # If modifying the height of an existing DeviceType to 0U, check for any instances assigned to a rack position.
         elif self.pk and self._original_u_height > 0 and self.u_height == 0:
-            racked_instance_count = Device.objects.filter(device_type=self, position__isnull=False).count()
+            racked_instance_count = Device.objects.unrestricted().filter(
+                device_type=self,
+                position__isnull=False
+            ).count()
             if racked_instance_count:
                 url = f"{reverse('dcim:device_list')}?manufactuer_id={self.manufacturer_id}&device_type_id={self.pk}"
                 raise ValidationError({
@@ -1493,7 +1500,11 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # 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 Device.objects.exclude(pk=self.pk).filter(name=self.name, site=self.site, tenant__isnull=True):
+            if Device.objects.unrestricted().exclude(pk=self.pk).filter(
+                    name=self.name,
+                    site=self.site,
+                    tenant__isnull=True
+            ):
                 raise ValidationError({
                     'name': 'A device with this name already exists.'
                 })
@@ -1623,32 +1634,32 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # If this is a new Device, instantiate all of the related components per the DeviceType definition
         if is_new:
             ConsolePort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleport_templates.all()]
+                [x.instantiate(self) for x in self.device_type.consoleport_templates.unrestricted()]
             )
             ConsoleServerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleserverport_templates.all()]
+                [x.instantiate(self) for x in self.device_type.consoleserverport_templates.unrestricted()]
             )
             PowerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.powerport_templates.all()]
+                [x.instantiate(self) for x in self.device_type.powerport_templates.unrestricted()]
             )
             PowerOutlet.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.poweroutlet_templates.all()]
+                [x.instantiate(self) for x in self.device_type.poweroutlet_templates.unrestricted()]
             )
             Interface.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.interface_templates.all()]
+                [x.instantiate(self) for x in self.device_type.interface_templates.unrestricted()]
             )
             RearPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.rearport_templates.all()]
+                [x.instantiate(self) for x in self.device_type.rearport_templates.unrestricted()]
             )
             FrontPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.frontport_templates.all()]
+                [x.instantiate(self) for x in self.device_type.frontport_templates.unrestricted()]
             )
             DeviceBay.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.device_bay_templates.all()]
+                [x.instantiate(self) for x in self.device_type.device_bay_templates.unrestricted()]
             )
 
         # Update Site and Rack assignment for any child Devices
-        devices = Device.objects.filter(parent_bay__device=self)
+        devices = Device.objects.unrestricted().filter(parent_bay__device=self)
         for device in devices:
             device.site = self.site
             device.rack = self.rack
@@ -1739,7 +1750,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         """
         Return the set of child Devices installed in DeviceBays within this Device.
         """
-        return Device.objects.filter(parent_bay__device=self.pk)
+        return Device.objects.unrestricted().filter(parent_bay__device=self.pk)
 
     def get_status_class(self):
         return self.STATUS_CLASS_MAP.get(self.status)
@@ -1796,7 +1807,7 @@ class VirtualChassis(ChangeLoggedModel):
     def delete(self, *args, **kwargs):
 
         # Check for LAG interfaces split across member chassis
-        interfaces = Interface.objects.filter(
+        interfaces = Interface.objects.unrestricted().filter(
             device__in=self.members.all(),
             lag__isnull=False
         ).exclude(
@@ -2169,7 +2180,7 @@ class Cable(ChangeLoggedModel):
         if not hasattr(self, 'termination_a_type'):
             raise ValidationError('Termination A type has not been specified')
         try:
-            self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
+            self.termination_a_type.model_class().objects.unrestricted().get(pk=self.termination_a_id)
         except ObjectDoesNotExist:
             raise ValidationError({
                 'termination_a': 'Invalid ID for type {}'.format(self.termination_a_type)
@@ -2179,7 +2190,7 @@ class Cable(ChangeLoggedModel):
         if not hasattr(self, 'termination_b_type'):
             raise ValidationError('Termination B type has not been specified')
         try:
-            self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
+            self.termination_b_type.model_class().objects.unrestricted().get(pk=self.termination_b_id)
         except ObjectDoesNotExist:
             raise ValidationError({
                 'termination_b': 'Invalid ID for type {}'.format(self.termination_b_type)
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index b630741e9..2db6569a9 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -107,7 +107,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_site')
-        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.unrestricted().first().pk})
+        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.unrestricted().unrestricted().first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -246,7 +246,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         """
         GET a single rack elevation.
         """
-        rack = Rack.objects.first()
+        rack = Rack.objects.unrestricted().first()
         self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk})
 
@@ -266,7 +266,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         """
         GET a single rack elevation in SVG format.
         """
-        rack = Rack.objects.first()
+        rack = Rack.objects.unrestricted().first()
         self.add_permissions('dcim.view_rack')
         url = '{}?render=svg'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
 
@@ -281,9 +281,7 @@ class RackReservationTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-
         user = User.objects.create(username='user1', is_active=True)
-
         site = Site.objects.create(name='Test Site 1', slug='test-site-1')
 
         cls.racks = (
@@ -908,7 +906,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         """
         Check that creating a device with a duplicate name within a site fails.
         """
-        device = Device.objects.first()
+        device = Device.objects.unrestricted().first()
         data = {
             'device_type': device.device_type.pk,
             'device_role': device.device_role.pk,
@@ -1640,11 +1638,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.count(), 1)
+        self.assertEqual(Cable.objects.unrestricted().count(), 1)
 
-        cable = Cable.objects.get(pk=response.data['id'])
-        consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk)
-        consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk)
+        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+        consoleport1 = ConsolePort.objects.unrestricted().get(pk=consoleport1.pk)
+        consoleserverport1 = ConsoleServerPort.objects.unrestricted().get(pk=consoleserverport1.pk)
 
         self.assertEqual(cable.termination_a, consoleport1)
         self.assertEqual(cable.termination_b, consoleserverport1)
@@ -1705,12 +1703,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.get(pk=response.data['id'])
+            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk)
-        consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk)
+        consoleport1 = ConsolePort.objects.unrestricted().get(pk=consoleport1.pk)
+        consoleserverport1 = ConsoleServerPort.objects.unrestricted().get(pk=consoleserverport1.pk)
         self.assertEqual(consoleport1.connected_endpoint, consoleserverport1)
         self.assertEqual(consoleserverport1.connected_endpoint, consoleport1)
 
@@ -1735,11 +1733,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.count(), 1)
+        self.assertEqual(Cable.objects.unrestricted().count(), 1)
 
-        cable = Cable.objects.get(pk=response.data['id'])
-        powerport1 = PowerPort.objects.get(pk=powerport1.pk)
-        poweroutlet1 = PowerOutlet.objects.get(pk=poweroutlet1.pk)
+        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+        powerport1 = PowerPort.objects.unrestricted().get(pk=powerport1.pk)
+        poweroutlet1 = PowerOutlet.objects.unrestricted().get(pk=poweroutlet1.pk)
 
         self.assertEqual(cable.termination_a, powerport1)
         self.assertEqual(cable.termination_b, poweroutlet1)
@@ -1771,11 +1769,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.count(), 1)
+        self.assertEqual(Cable.objects.unrestricted().count(), 1)
 
-        cable = Cable.objects.get(pk=response.data['id'])
-        interface1 = Interface.objects.get(pk=interface1.pk)
-        interface2 = Interface.objects.get(pk=interface2.pk)
+        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
+        interface2 = Interface.objects.unrestricted().get(pk=interface2.pk)
 
         self.assertEqual(cable.termination_a, interface1)
         self.assertEqual(cable.termination_b, interface2)
@@ -1836,12 +1834,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.get(pk=response.data['id'])
+            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        interface1 = Interface.objects.get(pk=interface1.pk)
-        interface2 = Interface.objects.get(pk=interface2.pk)
+        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
+        interface2 = Interface.objects.unrestricted().get(pk=interface2.pk)
         self.assertEqual(interface1.connected_endpoint, interface2)
         self.assertEqual(interface2.connected_endpoint, interface1)
 
@@ -1875,11 +1873,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.count(), 1)
+        self.assertEqual(Cable.objects.unrestricted().count(), 1)
 
-        cable = Cable.objects.get(pk=response.data['id'])
-        interface1 = Interface.objects.get(pk=interface1.pk)
-        circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk)
+        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
+        circuittermination1 = CircuitTermination.objects.unrestricted().get(pk=circuittermination1.pk)
 
         self.assertEqual(cable.termination_a, interface1)
         self.assertEqual(cable.termination_b, circuittermination1)
@@ -1949,12 +1947,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.get(pk=response.data['id'])
+            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        interface1 = Interface.objects.get(pk=interface1.pk)
-        circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk)
+        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
+        circuittermination1 = CircuitTermination.objects.unrestricted().get(pk=circuittermination1.pk)
         self.assertEqual(interface1.connected_endpoint, circuittermination1)
         self.assertEqual(circuittermination1.connected_endpoint, interface1)
 
@@ -2045,12 +2043,12 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
             VirtualChassis(name='Virtual Chassis 3', master=devices[6], domain='domain-3'),
         )
         VirtualChassis.objects.bulk_create(virtual_chassis)
-        Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
-        Device.objects.filter(pk=devices[2].pk).update(virtual_chassis=virtual_chassis[0], vc_position=3)
-        Device.objects.filter(pk=devices[4].pk).update(virtual_chassis=virtual_chassis[1], vc_position=2)
-        Device.objects.filter(pk=devices[5].pk).update(virtual_chassis=virtual_chassis[1], vc_position=3)
-        Device.objects.filter(pk=devices[7].pk).update(virtual_chassis=virtual_chassis[2], vc_position=2)
-        Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
+        Device.objects.unrestricted().filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
+        Device.objects.unrestricted().filter(pk=devices[2].pk).update(virtual_chassis=virtual_chassis[0], vc_position=3)
+        Device.objects.unrestricted().filter(pk=devices[4].pk).update(virtual_chassis=virtual_chassis[1], vc_position=2)
+        Device.objects.unrestricted().filter(pk=devices[5].pk).update(virtual_chassis=virtual_chassis[1], vc_position=3)
+        Device.objects.unrestricted().filter(pk=devices[7].pk).update(virtual_chassis=virtual_chassis[2], vc_position=2)
+        Device.objects.unrestricted().filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
 
         cls.update_data = {
             'name': 'Virtual Chassis X',

From f48a079ae61acb2a0a3e7c381d650935036bcd74 Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 29 Jun 2020 14:34:42 -0400
Subject: [PATCH 264/505] fix tests and cleanup

---
 netbox/extras/api/serializers.py       | 15 ++-------
 netbox/extras/api/views.py             |  5 +--
 netbox/extras/models/models.py         | 43 --------------------------
 netbox/extras/scripts.py               |  8 +++++
 netbox/extras/tables.py                | 40 ------------------------
 netbox/extras/tests/test_api.py        |  9 ++----
 netbox/extras/views.py                 |  1 -
 netbox/netbox/views.py                 | 11 ++++++-
 netbox/project-static/js/job_result.js |  3 --
 netbox/templates/home.html             |  4 +--
 netbox/utilities/utils.py              |  1 +
 11 files changed, 29 insertions(+), 111 deletions(-)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 2a8cae35c..636e813bd 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -284,21 +284,12 @@ class ScriptSerializer(serializers.Serializer):
         lookup_field='full_name',
         lookup_url_kwarg='pk'
     )
-    id = serializers.SerializerMethodField(read_only=True)
-    name = serializers.SerializerMethodField(read_only=True)
-    description = serializers.SerializerMethodField(read_only=True)
+    id = serializers.CharField(read_only=True, source="full_name")
+    name = serializers.CharField(read_only=True)
+    description = serializers.CharField(read_only=True)
     vars = serializers.SerializerMethodField(read_only=True)
     result = NestedJobResultSerializer()
 
-    def get_id(self, instance):
-        return '{}.{}'.format(instance.__module__, instance.__name__)
-
-    def get_name(self, instance):
-        return getattr(instance.Meta, 'name', instance.__name__)
-
-    def get_description(self, instance):
-        return getattr(instance.Meta, 'description', '')
-
     def get_vars(self, instance):
         return {
             k: v.__class__.__name__ for k, v in instance._get_vars().items()
diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index e2ee57059..59000f45a 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -17,6 +17,7 @@ from extras.models import (
 from extras.reports import get_report, get_reports
 from extras.scripts import get_script, get_scripts, run_script
 from utilities.api import IsAuthenticatedOrLoginNotRequired, ModelViewSet
+from utilities.utils import copy_safe_request
 from . import serializers
 
 
@@ -304,12 +305,12 @@ class ScriptViewSet(ViewSet):
                 script.full_name,
                 script_content_type,
                 request.user,
-                data=form.cleaned_data,
+                data=data,
                 request=copy_safe_request(request),
                 commit=commit
             )
             script.result = job_result
-            serializer = serializers.ScriptDetailSerializer(script)
+            serializer = serializers.ScriptDetailSerializer(script, context={'request': request})
 
             return Response(serializer.data)
 
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index ab28e9d5b..a366187dc 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -573,25 +573,6 @@ class Script(models.Model):
     class Meta:
         managed = False
 
-    @classmethod
-    def get_absolute_url_from_job_result(cls, job_result):
-        """
-        Given a JobResult that links to this content type, return URL to an instance which corresponds to that job
-        result, i.e. for historical records
-        """
-        if job_result.obj_type.model_class() != cls:
-            return None
-
-        module, script_name = job_result.name.split('.')
-        return reverse(
-            'extras:script_history_detail',
-            kwargs={
-                'module': module,
-                'script_name': script_name,
-                'job_id': job_result.job_id
-            }
-        )
-
 
 #
 # Reports
@@ -606,23 +587,6 @@ class Report(models.Model):
     class Meta:
         managed = False
 
-    @classmethod
-    def get_absolute_url_from_job_result(cls, job_result):
-        """
-        Given a JobResult that links to this content type, return URL to an instance which corresponds to that job
-        result, i.e. for historical records
-        """
-        if job_result.obj_type.model_class() != cls:
-            return None
-
-        return reverse(
-            'extras:report_history_detail',
-            kwargs={
-                'name': job_result.name,
-                'job_id': job_result.job_id
-            }
-        )
-
 
 #
 # Job results
@@ -676,12 +640,6 @@ class JobResult(models.Model):
     def __str__(self):
         return str(self.job_id)
 
-    def get_absolute_url(self):
-        """
-        Job results are accessed only under the context of the content type they link to
-        """
-        return self.obj_type.model_class().get_absolute_url_from_job_result(self)
-
     @property
     def duration(self):
         if not self.completed:
@@ -692,7 +650,6 @@ class JobResult(models.Model):
 
         return f"{int(minutes)} minutes, {seconds:.2f} seconds"
 
-
     @classmethod
     def enqueue_job(cls, func, name, obj_type, user, *args, **kwargs):
         """
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index c801bf3a2..e33d8028e 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -273,12 +273,20 @@ class BaseScript:
         self.source = inspect.getsource(self.__class__)
 
     def __str__(self):
+        return self.name
+
+    @classproperty
+    def name(self):
         return getattr(self.Meta, 'name', self.__class__.__name__)
 
     @classproperty
     def full_name(self):
         return '.'.join([self.__module__, self.__name__])
 
+    @classproperty
+    def description(self):
+        return getattr(self.Meta, 'description', '')
+
     @classmethod
     def module(cls):
         return cls.__module__
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 1398ff667..c772d3db0 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -61,28 +61,6 @@ OBJECTCHANGE_REQUEST_ID = """
 <a href="{% url 'extras:objectchange_list' %}?request_id={{ value }}">{{ value }}</a>
 """
 
-JOB_RESULT_CREATED = """
-<a href="{{ record.get_absolute_url }}">{{ value|date:"SHORT_DATETIME_FORMAT" }}</a>
-"""
-
-JOB_RESULT_COMPLETED = """
-<span>{% if value %}{{ value|date:"SHORT_DATETIME_FORMAT" }}{% else %}—{% endif %}</span>
-"""
-
-JOB_RESULT_STATUS = """
-{% if record.status == 'failed' %}
-    <label class="label label-danger">Failed</label>
-{% elif record.status == 'pending' %}
-    <label class="label label-default">Pending</label>
-{% elif record.status == 'running' %}
-    <label class="label label-warning">Running</label>
-{% elif record.status == 'completed' %}
-    <label class="label label-success">Passed</label>
-{% else %}
-    <label class="label label-default">N/A</label>
-{% endif %}
-"""
-
 
 class TagTable(BaseTable):
     pk = ToggleColumn()
@@ -155,21 +133,3 @@ class ObjectChangeTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = ObjectChange
         fields = ('time', 'user_name', 'action', 'changed_object_type', 'object_repr', 'request_id')
-
-
-class JobResultHistoryTable(BaseTable):
-    created = tables.TemplateColumn(
-        template_code=JOB_RESULT_CREATED,
-        verbose_name='Run'
-    )
-    completed = tables.TemplateColumn(
-        template_code=JOB_RESULT_COMPLETED
-    )
-    status = tables.TemplateColumn(
-        template_code=JOB_RESULT_STATUS
-    )
-
-    class Meta(BaseTable.Meta):
-        model = JobResult
-        fields = ('created', 'completed', 'status')
-
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 5d7951e54..de9d58446 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -10,6 +10,7 @@ from extras.api.views import ScriptViewSet
 from extras.models import ConfigContext, Graph, ExportTemplate, Tag
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from utilities.testing import APITestCase, APIViewTestCases
+from utilities.utils import copy_safe_request
 
 
 class AppTest(APITestCase):
@@ -263,13 +264,7 @@ class ScriptTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
 
-        self.assertEqual(response.data['log'][0]['status'], 'info')
-        self.assertEqual(response.data['log'][0]['message'], script_data['var1'])
-        self.assertEqual(response.data['log'][1]['status'], 'success')
-        self.assertEqual(response.data['log'][1]['message'], script_data['var2'])
-        self.assertEqual(response.data['log'][2]['status'], 'failure')
-        self.assertEqual(response.data['log'][2]['message'], script_data['var3'])
-        self.assertEqual(response.data['output'], 'Script complete')
+        self.assertEqual(response.data['result']['status']['value'], 'pending')
 
 
 class CreatedUpdatedFilterTest(APITestCase):
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 505fc6595..10a0b51d6 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -501,7 +501,6 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
 
         if form.is_valid():
             commit = form.cleaned_data.pop('_commit')
-            #output, execution_time = run_script(script, form.cleaned_data, request, commit)
 
             script_content_type = ContentType.objects.get(app_label='extras', model='script')
             job_result = JobResult.enqueue_job(
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 613101cda..548173a32 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 
 from django.conf import settings
+from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, F
 from django.shortcuts import render
 from django.views.generic import View
@@ -24,6 +25,7 @@ from dcim.tables import (
     CableTable, DeviceTable, DeviceTypeTable, PowerFeedTable, RackTable, RackGroupTable, SiteTable,
     VirtualChassisTable,
 )
+from extras.choices import JobResultStatusChoices
 from extras.models import ObjectChange, JobResult
 from ipam.filters import AggregateFilterSet, IPAddressFilterSet, PrefixFilterSet, VLANFilterSet, VRFFilterSet
 from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF
@@ -187,6 +189,13 @@ class HomeView(View):
             pk__lt=F('_connected_interface')
         )
 
+        # Report Results
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        report_results = JobResult.objects.filter(
+            obj_type=report_content_type,
+            status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        ).defer('data')[:10]
+
         stats = {
 
             # Organization
@@ -241,7 +250,7 @@ class HomeView(View):
         return render(request, self.template_name, {
             'search_form': SearchForm(),
             'stats': stats,
-            'report_results': [],#ReportResult.objects.order_by('-created')[:10],
+            'report_results': report_results,
             'changelog': changelog[:15],
             'new_release': new_release,
         })
diff --git a/netbox/project-static/js/job_result.js b/netbox/project-static/js/job_result.js
index 3d7293713..8f3d360db 100644
--- a/netbox/project-static/js/job_result.js
+++ b/netbox/project-static/js/job_result.js
@@ -30,9 +30,6 @@ $(document).ready(function(){
                 url: url + pending_result_id + '/',
                 method: 'GET',
                 dataType: 'json',
-                beforeSend: function(xhr, settings) {
-                    xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
-                },
                 context: this,
                 success: function(data) {
                     updatePendingStatusLabel(data.status);
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 50a411048..f4acda3a3 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -280,8 +280,8 @@
                 <table class="table table-hover panel-body">
                     {% for result in report_results %}
                         <tr>
-                            <td><a href="{% url 'extras:report' name=result.report %}">{{ result.report }}</a></td>
-                            <td class="text-right"><span title="{{ result.created }}">{% include 'extras/inc/report_label.html' %}</span></td>
+                            <td><a href="{% url 'extras:report' name=result.name %}">{{ result.name }}</a></td>
+                            <td class="text-right"><span title="{{ result.created }}">{% include 'extras/inc/job_label.html' %}</span></td>
                         </tr>
                     {% endfor %}
                 </table>
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index f734e6534..1c8f9f12c 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -12,6 +12,7 @@ from dcim.choices import CableLengthUnitChoices
 from extras.utils import is_taggable
 from utilities.constants import HTTP_REQUEST_META_SAFE_COPY
 
+
 def csv_format(data):
     """
     Encapsulate any data which contains a comma within double quotes.

From 5ed613691535a30de26554f7c0ca1d5aa3f38037 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 13:57:08 -0400
Subject: [PATCH 265/505] Introduce ComponentTraceMixin to minimize boilerplate

---
 netbox/dcim/tests/test_api.py | 259 +++++++---------------------------
 1 file changed, 49 insertions(+), 210 deletions(-)

diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 2db6569a9..44c8f6223 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -28,6 +28,41 @@ class AppTest(APITestCase):
         self.assertEqual(response.status_code, 200)
 
 
+class ComponentTraceMixin(APITestCase):
+    peer_termination_type = None
+
+    def test_trace(self):
+        """
+        Test tracing a device component's attached cable.
+        """
+        obj = self.model.objects.unrestricted().first()
+        peer_device = Device.objects.create(
+            site=Site.objects.unrestricted().first(),
+            device_type=DeviceType.objects.unrestricted().first(),
+            device_role=DeviceRole.objects.unrestricted().first(),
+            name='Peer Device'
+        )
+        if self.peer_termination_type is None:
+            raise NotImplementedError("Test case must set peer_termination_type")
+        peer_obj = self.peer_termination_type.objects.create(
+            device=peer_device,
+            name='Peer Termination'
+        )
+        cable = Cable(termination_a=obj, termination_b=peer_obj, label='Cable 1')
+        cable.save()
+
+        self.add_permissions(f'dcim.view_{self.model._meta.model_name}')
+        url = reverse(f'dcim-api:{self.model._meta.model_name}-trace', kwargs={'pk': obj.pk})
+        response = self.client.get(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 1)
+        segment1 = response.data[0]
+        self.assertEqual(segment1[0]['name'], obj.name)
+        self.assertEqual(segment1[1]['label'], cable.label)
+        self.assertEqual(segment1[2]['name'], peer_obj.name)
+
+
 class RegionTest(APIViewTestCases.APIViewTestCase):
     model = Region
     brief_fields = ['id', 'name', 'site_count', 'slug', 'url']
@@ -921,9 +956,10 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
 
 
-class ConsolePortTest(APIViewTestCases.APIViewTestCase):
+class ConsolePortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = ConsolePort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
+    peer_termination_type = ConsoleServerPort
 
     @classmethod
     def setUpTestData(cls):
@@ -955,39 +991,11 @@ class ConsolePortTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_consoleport(self):
-        """
-        Test tracing a ConsolePort cable.
-        """
-        consoleport = ConsolePort.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        consoleserverport = ConsoleServerPort.objects.create(
-            device=peer_device,
-            name='Console Server Port 1'
-        )
-        cable = Cable(termination_a=consoleport, termination_b=consoleserverport, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_consoleport')
-        url = reverse('dcim-api:consoleport-trace', kwargs={'pk': consoleport.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], consoleport.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], consoleserverport.name)
-
-
-class ConsoleServerPortTest(APIViewTestCases.APIViewTestCase):
+class ConsoleServerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = ConsoleServerPort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
+    peer_termination_type = ConsolePort
 
     @classmethod
     def setUpTestData(cls):
@@ -1019,39 +1027,11 @@ class ConsoleServerPortTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_consoleserverport(self):
-        """
-        Test tracing a ConsoleServerPort cable.
-        """
-        consoleserverport = ConsoleServerPort.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        consoleport = ConsolePort.objects.create(
-            device=peer_device,
-            name='Console Port 1'
-        )
-        cable = Cable(termination_a=consoleserverport, termination_b=consoleport, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_consoleserverport')
-        url = reverse('dcim-api:consoleserverport-trace', kwargs={'pk': consoleserverport.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], consoleserverport.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], consoleport.name)
-
-
-class PowerPortTest(APIViewTestCases.APIViewTestCase):
+class PowerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = PowerPort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
+    peer_termination_type = PowerOutlet
 
     @classmethod
     def setUpTestData(cls):
@@ -1083,39 +1063,11 @@ class PowerPortTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_powerport(self):
-        """
-        Test tracing a PowerPort cable.
-        """
-        powerport = PowerPort.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        poweroutlet = PowerOutlet.objects.create(
-            device=peer_device,
-            name='Power Outlet 1'
-        )
-        cable = Cable(termination_a=powerport, termination_b=poweroutlet, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_powerport')
-        url = reverse('dcim-api:powerport-trace', kwargs={'pk': powerport.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], powerport.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], poweroutlet.name)
-
-
-class PowerOutletTest(APIViewTestCases.APIViewTestCase):
+class PowerOutletTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = PowerOutlet
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
+    peer_termination_type = PowerPort
 
     @classmethod
     def setUpTestData(cls):
@@ -1147,39 +1099,11 @@ class PowerOutletTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_poweroutlet(self):
-        """
-        Test tracing a PowerOutlet cable.
-        """
-        poweroutlet = PowerOutlet.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        powerport = PowerPort.objects.create(
-            device=peer_device,
-            name='Power Port 1'
-        )
-        cable = Cable(termination_a=poweroutlet, termination_b=powerport, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_poweroutlet')
-        url = reverse('dcim-api:poweroutlet-trace', kwargs={'pk': poweroutlet.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], poweroutlet.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], powerport.name)
-
-
-class InterfaceTest(APIViewTestCases.APIViewTestCase):
+class InterfaceTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = Interface
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
+    peer_termination_type = Interface
 
     @classmethod
     def setUpTestData(cls):
@@ -1249,39 +1173,11 @@ class InterfaceTest(APIViewTestCases.APIViewTestCase):
         self.assertEqual(len(response.data), 3)
         self.assertEqual(response.data[0]['embed_url'], 'http://example.com/graphs.py?interface=Interface 1&foo=1')
 
-    def test_trace_interface(self):
-        """
-        Test tracing an Interface cable.
-        """
-        interface_a = Interface.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        interface_b = Interface.objects.create(
-            device=peer_device,
-            name='Interface X'
-        )
-        cable = Cable(termination_a=interface_a, termination_b=interface_b, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_interface')
-        url = reverse('dcim-api:interface-trace', kwargs={'pk': interface_a.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], interface_a.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], interface_b.name)
-
-
-class FrontPortTest(APIViewTestCases.APIViewTestCase):
+class FrontPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = FrontPort
     brief_fields = ['cable', 'device', 'id', 'name', 'url']
+    peer_termination_type = Interface
 
     @classmethod
     def setUpTestData(cls):
@@ -1332,39 +1228,11 @@ class FrontPortTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_frontport(self):
-        """
-        Test tracing a FrontPort cable.
-        """
-        frontport = FrontPort.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        interface = Interface.objects.create(
-            device=peer_device,
-            name='Interface X'
-        )
-        cable = Cable(termination_a=frontport, termination_b=interface, label='Cable 1')
-        cable.save()
 
-        self.add_permissions('dcim.view_frontport')
-        url = reverse('dcim-api:frontport-trace', kwargs={'pk': frontport.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], frontport.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], interface.name)
-
-
-class RearPortTest(APIViewTestCases.APIViewTestCase):
+class RearPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = RearPort
     brief_fields = ['cable', 'device', 'id', 'name', 'url']
+    peer_termination_type = Interface
 
     @classmethod
     def setUpTestData(cls):
@@ -1399,35 +1267,6 @@ class RearPortTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_trace_rearport(self):
-        """
-        Test tracing a RearPort cable.
-        """
-        rearport = RearPort.objects.first()
-        peer_device = Device.objects.create(
-            site=Site.objects.first(),
-            device_type=DeviceType.objects.first(),
-            device_role=DeviceRole.objects.first(),
-            name='Peer Device'
-        )
-        interface = Interface.objects.create(
-            device=peer_device,
-            name='Interface X'
-        )
-        cable = Cable(termination_a=rearport, termination_b=interface, label='Cable 1')
-        cable.save()
-
-        self.add_permissions('dcim.view_rearport')
-        url = reverse('dcim-api:rearport-trace', kwargs={'pk': rearport.pk})
-        response = self.client.get(url, **self.header)
-
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], rearport.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], interface.name)
-
 
 class DeviceBayTest(APIViewTestCases.APIViewTestCase):
     model = DeviceBay

From 71812d1bd54c3710db346a6d0adbc27e9a650fd8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 14:41:43 -0400
Subject: [PATCH 266/505] Fix evaluation of RestrictedQuerySet

---
 netbox/dcim/api/views.py       | 12 ++++++++----
 netbox/dcim/models/__init__.py |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 2a3619a2f..8b88baa93 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -43,7 +43,7 @@ class CableTraceMixin(object):
         """
         Trace a complete cable path and return each segment as a three-tuple of (termination, cable, termination).
         """
-        obj = get_object_or_404(self.queryset.model, pk=pk)
+        obj = get_object_or_404(self.queryset, pk=pk)
 
         # Initialize the path array
         path = []
@@ -156,7 +156,7 @@ class RackViewSet(CustomFieldModelViewSet):
         """
         Rack elevation representing the list of rack units. Also supports rendering the elevation as an SVG.
         """
-        rack = get_object_or_404(Rack, pk=pk)
+        rack = get_object_or_404(self.queryset, pk=pk)
         serializer = serializers.RackElevationDetailFilterSerializer(data=request.GET)
         if not serializer.is_valid():
             return Response(serializer.errors, 400)
@@ -369,7 +369,7 @@ class DeviceViewSet(CustomFieldModelViewSet):
         """
         Execute a NAPALM method on a Device
         """
-        device = get_object_or_404(Device, pk=pk)
+        device = get_object_or_404(self.queryset, pk=pk)
         if not device.primary_ip:
             raise ServiceUnavailable("This device does not have a primary IP address configured.")
         if device.platform is None:
@@ -655,7 +655,11 @@ class ConnectedDeviceViewSet(ViewSet):
             raise MissingFilterException(detail='Request must include "peer_device" and "peer_interface" filters.')
 
         # Determine local interface from peer interface's connection
-        peer_interface = get_object_or_404(Interface, device__name=peer_device_name, name=peer_interface_name)
+        peer_interface = get_object_or_404(
+            Interface.objects.unrestricted(),
+            device__name=peer_device_name,
+            name=peer_interface_name
+        )
         local_interface = peer_interface._connected_interface
 
         if local_interface is None:
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 13e80c60a..1a90e01bc 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -673,7 +673,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         # Add devices to rack units list
         if self.pk:
-            queryset = Device.objects.prefetch_related(
+            queryset = Device.objects.unrestricted().prefetch_related(
                 'device_type',
                 'device_type__manufacturer',
                 'device_role'

From 66703d89631e9a36d40424aa42a18dd87a7265d8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 14:42:37 -0400
Subject: [PATCH 267/505] Fix evaluation of RestrictedQuerySet

---
 netbox/extras/models/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 082a153e9..c692c043a 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -538,7 +538,7 @@ class ConfigContextModel(models.Model):
 
         # Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
         data = OrderedDict()
-        for context in ConfigContext.objects.get_for_object(self):
+        for context in ConfigContext.objects.unrestricted().get_for_object(self):
             data = deepmerge(data, context.data)
 
         # If the object has local config context data defined, merge it last

From 36498c9dd2748ed0b51b3271dd95b85c041a561f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 14:57:29 -0400
Subject: [PATCH 268/505] Base manager for Tag should use RestrictedQuerySet

---
 netbox/extras/api/views.py   |  2 +-
 netbox/extras/models/tags.py |  3 +--
 netbox/extras/views.py       | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index b40cb4459..7e547dafd 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -108,7 +108,7 @@ class ExportTemplateViewSet(ModelViewSet):
 #
 
 class TagViewSet(ModelViewSet):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         tagged_items=Count('extras_taggeditem_items', distinct=True)
     )
     serializer_class = serializers.TagSerializer
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index bd49954c9..9bb90f21e 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -22,8 +22,7 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
-    objects = models.Manager()
-    restricted = RestrictedQuerySet.as_manager()
+    objects = RestrictedQuerySet.as_manager()
 
     csv_headers = ['name', 'slug', 'color', 'description']
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 5f4a21448..55064b5cf 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -30,7 +30,7 @@ from .scripts import get_scripts, run_script
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -41,7 +41,7 @@ class TagListView(ObjectListView):
 
 
 class TagView(ObjectView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
 
     def get(self, request, slug):
 
@@ -68,26 +68,26 @@ class TagView(ObjectView):
 
 
 class TagEditView(ObjectEditView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagForm
     default_return_url = 'extras:tag_list'
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     default_return_url = 'extras:tag_list'
 
 
 class TagBulkImportView(BulkImportView):
-    queryset = Tag.restricted.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
     default_return_url = 'extras:tag_list'
 
 
 class TagBulkEditView(BulkEditView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -98,7 +98,7 @@ class TagBulkEditView(BulkEditView):
 
 
 class TagBulkDeleteView(BulkDeleteView):
-    queryset = Tag.restricted.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
         'name'

From 15f32bdd734484edffc92ccca1a96b989ba22102 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 15:14:12 -0400
Subject: [PATCH 269/505] Wrap ComponentTraceMixin in a parent class

---
 netbox/dcim/tests/test_api.py | 76 ++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 44c8f6223..451d9d9a9 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -28,39 +28,41 @@ class AppTest(APITestCase):
         self.assertEqual(response.status_code, 200)
 
 
-class ComponentTraceMixin(APITestCase):
-    peer_termination_type = None
+class Mixins:
 
-    def test_trace(self):
-        """
-        Test tracing a device component's attached cable.
-        """
-        obj = self.model.objects.unrestricted().first()
-        peer_device = Device.objects.create(
-            site=Site.objects.unrestricted().first(),
-            device_type=DeviceType.objects.unrestricted().first(),
-            device_role=DeviceRole.objects.unrestricted().first(),
-            name='Peer Device'
-        )
-        if self.peer_termination_type is None:
-            raise NotImplementedError("Test case must set peer_termination_type")
-        peer_obj = self.peer_termination_type.objects.create(
-            device=peer_device,
-            name='Peer Termination'
-        )
-        cable = Cable(termination_a=obj, termination_b=peer_obj, label='Cable 1')
-        cable.save()
+    class ComponentTraceMixin(APITestCase):
+        peer_termination_type = None
 
-        self.add_permissions(f'dcim.view_{self.model._meta.model_name}')
-        url = reverse(f'dcim-api:{self.model._meta.model_name}-trace', kwargs={'pk': obj.pk})
-        response = self.client.get(url, **self.header)
+        def test_trace(self):
+            """
+            Test tracing a device component's attached cable.
+            """
+            obj = self.model.objects.unrestricted().first()
+            peer_device = Device.objects.create(
+                site=Site.objects.unrestricted().first(),
+                device_type=DeviceType.objects.unrestricted().first(),
+                device_role=DeviceRole.objects.unrestricted().first(),
+                name='Peer Device'
+            )
+            if self.peer_termination_type is None:
+                raise NotImplementedError("Test case must set peer_termination_type")
+            peer_obj = self.peer_termination_type.objects.create(
+                device=peer_device,
+                name='Peer Termination'
+            )
+            cable = Cable(termination_a=obj, termination_b=peer_obj, label='Cable 1')
+            cable.save()
 
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 1)
-        segment1 = response.data[0]
-        self.assertEqual(segment1[0]['name'], obj.name)
-        self.assertEqual(segment1[1]['label'], cable.label)
-        self.assertEqual(segment1[2]['name'], peer_obj.name)
+            self.add_permissions(f'dcim.view_{self.model._meta.model_name}')
+            url = reverse(f'dcim-api:{self.model._meta.model_name}-trace', kwargs={'pk': obj.pk})
+            response = self.client.get(url, **self.header)
+
+            self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertEqual(len(response.data), 1)
+            segment1 = response.data[0]
+            self.assertEqual(segment1[0]['name'], obj.name)
+            self.assertEqual(segment1[1]['label'], cable.label)
+            self.assertEqual(segment1[2]['name'], peer_obj.name)
 
 
 class RegionTest(APIViewTestCases.APIViewTestCase):
@@ -956,7 +958,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
 
 
-class ConsolePortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class ConsolePortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = ConsolePort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
     peer_termination_type = ConsoleServerPort
@@ -992,7 +994,7 @@ class ConsolePortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
         ]
 
 
-class ConsoleServerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class ConsoleServerPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = ConsoleServerPort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
     peer_termination_type = ConsolePort
@@ -1028,7 +1030,7 @@ class ConsoleServerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCas
         ]
 
 
-class PowerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class PowerPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = PowerPort
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
     peer_termination_type = PowerOutlet
@@ -1064,7 +1066,7 @@ class PowerPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
         ]
 
 
-class PowerOutletTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class PowerOutletTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = PowerOutlet
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
     peer_termination_type = PowerPort
@@ -1100,7 +1102,7 @@ class PowerOutletTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
         ]
 
 
-class InterfaceTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = Interface
     brief_fields = ['cable', 'connection_status', 'device', 'id', 'name', 'url']
     peer_termination_type = Interface
@@ -1174,7 +1176,7 @@ class InterfaceTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
         self.assertEqual(response.data[0]['embed_url'], 'http://example.com/graphs.py?interface=Interface 1&foo=1')
 
 
-class FrontPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class FrontPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = FrontPort
     brief_fields = ['cable', 'device', 'id', 'name', 'url']
     peer_termination_type = Interface
@@ -1229,7 +1231,7 @@ class FrontPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
         ]
 
 
-class RearPortTest(ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
+class RearPortTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase):
     model = RearPort
     brief_fields = ['cable', 'device', 'id', 'name', 'url']
     peer_termination_type = Interface

From af778f8fcafc29846cd14dde4b466ffeff86c6b7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 29 Jun 2020 15:36:02 -0400
Subject: [PATCH 270/505] TagFilter should call unrestricted() on its queryset

---
 netbox/utilities/filters.py | 2 +-
 netbox/utilities/forms.py   | 2 +-
 netbox/utilities/tables.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index f628ca917..b13c55f40 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -102,7 +102,7 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter):
         kwargs.setdefault('field_name', 'tags__slug')
         kwargs.setdefault('to_field_name', 'slug')
         kwargs.setdefault('conjoined', True)
-        kwargs.setdefault('queryset', Tag.objects.all())
+        kwargs.setdefault('queryset', Tag.objects.unrestricted())
 
         super().__init__(*args, **kwargs)
 
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 0d15d34df..b2ce1592a 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -596,7 +596,7 @@ class TagFilterField(forms.MultipleChoiceField):
 
     def __init__(self, model, *args, **kwargs):
         def get_choices():
-            tags = model.tags.annotate(
+            tags = model.tags.all().unrestricted().annotate(
                 count=Count('extras_taggeditem_items')
             ).order_by('name')
             return [
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 10e408b43..5e277e633 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -151,7 +151,7 @@ class TagColumn(tables.TemplateColumn):
     Display a list of tags assigned to the object.
     """
     template_code = """
-    {% for tag in value.all %}
+    {% for tag in value.all.unrestricted %}
         {% include 'utilities/templatetags/tag.html' %}
     {% empty %}
         <span class="text-muted">&mdash;</span>

From 1d922a18486236257f2582b60948db8c76c279ef Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Tue, 30 Jun 2020 09:29:50 -0400
Subject: [PATCH 271/505] fix previous job result deletion

---
 netbox/extras/reports.py | 1 +
 netbox/extras/scripts.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index 88cf1b8ed..10a560771 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -76,6 +76,7 @@ def run_report(job_result, *args, **kwargs):
     # Delete any previous terminal state results
     JobResult.objects.filter(
         obj_type=job_result.obj_type,
+        name=job_result.name,
         status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
     ).exclude(
         pk=job_result.pk
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index e33d8028e..b4171931d 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -462,6 +462,7 @@ def run_script(data, request, commit=True, *args, **kwargs):
     # Delete any previous terminal state results
     JobResult.objects.filter(
         obj_type=job_result.obj_type,
+        name=job_result.name,
         status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
     ).exclude(
         pk=job_result.pk

From 52a13b19601961e985d0ea94049f7232835736cc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 30 Jun 2020 15:12:53 -0400
Subject: [PATCH 272/505] Closes #4793: Add description field to device
 component templates

---
 docs/release-notes/version-2.9.md             |  2 +
 netbox/dcim/api/serializers.py                | 16 +++---
 netbox/dcim/forms.py                          | 55 +++++++++++++------
 .../0111_component_template_description.py    | 53 ++++++++++++++++++
 .../dcim/models/device_component_templates.py |  5 ++
 netbox/dcim/tables.py                         | 16 +++---
 6 files changed, 115 insertions(+), 32 deletions(-)
 create mode 100644 netbox/dcim/migrations/0111_component_template_description.py

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 3fefd8569..1d20201e9 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -16,6 +16,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 * [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
+* [#4793](https://github.com/netbox-community/netbox/issues/4793) - Add `description` field to device component templates
 * [#4795](https://github.com/netbox-community/netbox/issues/4795) - Add bulk disconnect capability for console and power ports
 
 ### Configuration Changes
@@ -40,6 +41,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * The IP address model now uses a generic foreign key to refer to the assigned interface. The `interface` field on the serializer has been replaced with `assigned_object_type` and `assigned_object_id` for write operations. If one exists, the assigned interface is available as `assigned_object`.
 * The serialized representation of a virtual machine interface now includes only relevant fields: `type`, `lag`, `mgmt_only`, `connected_endpoint_type`, `connected_endpoint`, and `cable` are no longer included.
 * dcim.VirtualChassis: Added a mandatory `name` field
+* An optional `description` field has been added to all device component templates
 
 ### Other Changes
 
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 45a908685..18e35aabe 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -245,7 +245,7 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsolePortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'description']
 
 
 class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
@@ -258,7 +258,7 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'description']
 
 
 class PowerPortTemplateSerializer(ValidatedModelSerializer):
@@ -271,7 +271,7 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description']
 
 
 class PowerOutletTemplateSerializer(ValidatedModelSerializer):
@@ -292,7 +292,7 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description']
 
 
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
@@ -301,7 +301,7 @@ class InterfaceTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'mgmt_only']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'mgmt_only', 'description']
 
 
 class RearPortTemplateSerializer(ValidatedModelSerializer):
@@ -310,7 +310,7 @@ class RearPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RearPortTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'positions']
+        fields = ['id', 'device_type', 'name', 'type', 'positions', 'description']
 
 
 class FrontPortTemplateSerializer(ValidatedModelSerializer):
@@ -320,7 +320,7 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = FrontPortTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position']
+        fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position', 'description']
 
 
 class DeviceBayTemplateSerializer(ValidatedModelSerializer):
@@ -328,7 +328,7 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = DeviceBayTemplate
-        fields = ['id', 'device_type', 'name', 'label']
+        fields = ['id', 'device_type', 'name', 'label', 'description']
 
 
 #
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index deb61729f..2244ef443 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1053,6 +1053,9 @@ class ComponentTemplateCreateForm(LabeledComponentForm):
             display_field='model'
         )
     )
+    description = forms.CharField(
+        required=False
+    )
 
 
 class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1060,7 +1063,7 @@ class ConsolePortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = ConsolePortTemplate
         fields = [
-            'device_type', 'name', 'label', 'type',
+            'device_type', 'name', 'label', 'type', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1086,7 +1089,7 @@ class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('type',)
+        nullable_fields = ('type', 'description')
 
 
 class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1094,7 +1097,7 @@ class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = ConsoleServerPortTemplate
         fields = [
-            'device_type', 'name', 'label', 'type',
+            'device_type', 'name', 'label', 'type', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1118,9 +1121,12 @@ class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         required=False,
         widget=StaticSelect2()
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = ('type',)
+        nullable_fields = ('type', 'description')
 
 
 class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1128,7 +1134,7 @@ class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = PowerPortTemplate
         fields = [
-            'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw',
+            'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1172,9 +1178,12 @@ class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         required=False,
         help_text="Allocated power draw (watts)"
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = ('type', 'maximum_draw', 'allocated_draw')
+        nullable_fields = ('type', 'maximum_draw', 'allocated_draw', 'description')
 
 
 class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1182,7 +1191,7 @@ class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = PowerOutletTemplate
         fields = [
-            'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg',
+            'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1251,9 +1260,12 @@ class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         required=False,
         widget=StaticSelect2()
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = ('type', 'power_port', 'feed_leg')
+        nullable_fields = ('type', 'power_port', 'feed_leg', 'description')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1272,7 +1284,7 @@ class InterfaceTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = InterfaceTemplate
         fields = [
-            'device_type', 'name', 'label', 'type', 'mgmt_only',
+            'device_type', 'name', 'label', 'type', 'mgmt_only', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1306,9 +1318,12 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         widget=BulkEditNullBooleanSelect,
         label='Management only'
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = []
+        nullable_fields = ('description',)
 
 
 class FrontPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1316,7 +1331,7 @@ class FrontPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = FrontPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'rear_port', 'rear_port_position',
+            'device_type', 'name', 'type', 'rear_port', 'rear_port_position', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1401,9 +1416,12 @@ class FrontPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         required=False,
         widget=StaticSelect2()
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = ()
+        nullable_fields = ('description',)
 
 
 class RearPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1411,7 +1429,7 @@ class RearPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = RearPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'positions',
+            'device_type', 'name', 'type', 'positions', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1442,9 +1460,12 @@ class RearPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         required=False,
         widget=StaticSelect2()
     )
+    description = forms.CharField(
+        required=False
+    )
 
     class Meta:
-        nullable_fields = ()
+        nullable_fields = ('description',)
 
 
 class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1452,7 +1473,7 @@ class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = DeviceBayTemplate
         fields = [
-            'device_type', 'name', 'label',
+            'device_type', 'name', 'label', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1460,7 +1481,9 @@ class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
 
 
 class DeviceBayTemplateCreateForm(ComponentTemplateCreateForm):
-    pass
+    description = forms.CharField(
+        required=False
+    )
 
 
 # TODO: DeviceBayTemplate has no fields suitable for bulk-editing yet
diff --git a/netbox/dcim/migrations/0111_component_template_description.py b/netbox/dcim/migrations/0111_component_template_description.py
new file mode 100644
index 000000000..3040f586c
--- /dev/null
+++ b/netbox/dcim/migrations/0111_component_template_description.py
@@ -0,0 +1,53 @@
+# Generated by Django 3.0.6 on 2020-06-30 18:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0110_virtualchassis_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='consoleporttemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='consoleserverporttemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='devicebaytemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='frontporttemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='interfacetemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='poweroutlettemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='powerporttemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AddField(
+            model_name='rearporttemplate',
+            name='description',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+    ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 904352196..1c2be0e5d 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -27,6 +27,11 @@ __all__ = (
 
 
 class ComponentTemplateModel(models.Model):
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
     objects = RestrictedQuerySet.as_manager()
 
     class Meta:
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 9979bea1a..dd6b96406 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -486,7 +486,7 @@ class ConsolePortTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = ConsolePortTemplate
-        fields = ('pk', 'name', 'label', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'description', 'actions')
         empty_text = "None"
 
 
@@ -499,7 +499,7 @@ class ConsoleServerPortTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = ConsoleServerPortTemplate
-        fields = ('pk', 'name', 'label', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'description', 'actions')
         empty_text = "None"
 
 
@@ -512,7 +512,7 @@ class PowerPortTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = PowerPortTemplate
-        fields = ('pk', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'actions')
         empty_text = "None"
 
 
@@ -525,7 +525,7 @@ class PowerOutletTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = PowerOutletTemplate
-        fields = ('pk', 'name', 'label', 'type', 'power_port', 'feed_leg', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description', 'actions')
         empty_text = "None"
 
 
@@ -541,7 +541,7 @@ class InterfaceTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = InterfaceTemplate
-        fields = ('pk', 'name', 'label', 'mgmt_only', 'type', 'actions')
+        fields = ('pk', 'name', 'label', 'mgmt_only', 'type', 'description', 'actions')
         empty_text = "None"
 
 
@@ -557,7 +557,7 @@ class FrontPortTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = FrontPortTemplate
-        fields = ('pk', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'actions')
         empty_text = "None"
 
 
@@ -570,7 +570,7 @@ class RearPortTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = RearPortTemplate
-        fields = ('pk', 'name', 'label', 'type', 'positions', 'actions')
+        fields = ('pk', 'name', 'label', 'type', 'positions', 'description', 'actions')
         empty_text = "None"
 
 
@@ -583,7 +583,7 @@ class DeviceBayTemplateTable(ComponentTemplateTable):
 
     class Meta(BaseTable.Meta):
         model = DeviceBayTemplate
-        fields = ('pk', 'name', 'label', 'actions')
+        fields = ('pk', 'name', 'label', 'description', 'actions')
         empty_text = "None"
 
 

From 88e3ac30b62cae6d8dbc9e4bc6a47f2f6104e9a9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 30 Jun 2020 15:22:30 -0400
Subject: [PATCH 273/505] Closes #4807: Add bulk edit ability for device bay
 templates

---
 docs/release-notes/version-2.9.md     |  1 +
 netbox/dcim/forms.py                  | 20 +++++++++++---------
 netbox/dcim/tests/test_views.py       | 13 +++++--------
 netbox/dcim/urls.py                   |  2 +-
 netbox/dcim/views.py                  |  8 ++++----
 netbox/templates/dcim/devicetype.html |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 1d20201e9..c0d51afc2 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -18,6 +18,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
 * [#4793](https://github.com/netbox-community/netbox/issues/4793) - Add `description` field to device component templates
 * [#4795](https://github.com/netbox-community/netbox/issues/4795) - Add bulk disconnect capability for console and power ports
+* [#4807](https://github.com/netbox-community/netbox/issues/4807) - Add bulk edit ability for device bay templates
 
 ### Configuration Changes
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 2244ef443..374f5fa4b 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1486,15 +1486,17 @@ class DeviceBayTemplateCreateForm(ComponentTemplateCreateForm):
     )
 
 
-# TODO: DeviceBayTemplate has no fields suitable for bulk-editing yet
-# class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
-#     pk = forms.ModelMultipleChoiceField(
-#         queryset=FrontPortTemplate.objects.all(),
-#         widget=forms.MultipleHiddenInput()
-#     )
-#
-#     class Meta:
-#         nullable_fields = ()
+class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
+    pk = forms.ModelMultipleChoiceField(
+        queryset=DeviceBayTemplate.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    description = forms.CharField(
+        required=False
+    )
+
+    class Meta:
+        nullable_fields = ('description',)
 
 
 #
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 079f26fdf..b3994ea8c 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -813,14 +813,7 @@ class RearPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase
         }
 
 
-# TODO: Change base class to DeviceComponentTemplateViewTestCase
-# Blocked by absence of bulk edit view for DeviceBays
-class DeviceBayTemplateTestCase(
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.BulkCreateObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase
-):
+class DeviceBayTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCase):
     model = DeviceBayTemplate
 
     @classmethod
@@ -848,6 +841,10 @@ class DeviceBayTemplateTestCase(
             'name_pattern': 'Device Bay Template [4-6]',
         }
 
+        cls.bulk_edit_data = {
+            'description': 'Foo bar',
+        }
+
 
 class DeviceRoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = DeviceRole
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 45b10cd0c..087f9db62 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -142,7 +142,7 @@ urlpatterns = [
 
     # Device bay templates
     path('device-bay-templates/add/', views.DeviceBayTemplateCreateView.as_view(), name='devicebaytemplate_add'),
-    # path('device-bay-templates/edit/', views.DeviceBayTemplateBulkEditView.as_view(), name='devicebaytemplate_bulk_edit'),
+    path('device-bay-templates/edit/', views.DeviceBayTemplateBulkEditView.as_view(), name='devicebaytemplate_bulk_edit'),
     path('device-bay-templates/delete/', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicebaytemplate_bulk_delete'),
     path('device-bay-templates/<int:pk>/edit/', views.DeviceBayTemplateEditView.as_view(), name='devicebaytemplate_edit'),
     path('device-bay-templates/<int:pk>/delete/', views.DeviceBayTemplateDeleteView.as_view(), name='devicebaytemplate_delete'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0ce35aa19..864665701 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -867,10 +867,10 @@ class DeviceBayTemplateDeleteView(ObjectDeleteView):
     queryset = DeviceBayTemplate.objects.all()
 
 
-# class DeviceBayTemplateBulkEditView(BulkEditView):
-#     queryset = DeviceBayTemplate.objects.all()
-#     table = tables.DeviceBayTemplateTable
-#     form = forms.DeviceBayTemplateBulkEditForm
+class DeviceBayTemplateBulkEditView(BulkEditView):
+    queryset = DeviceBayTemplate.objects.all()
+    table = tables.DeviceBayTemplateTable
+    form = forms.DeviceBayTemplateBulkEditForm
 
 
 class DeviceBayTemplateBulkDeleteView(BulkDeleteView):
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 669456c10..7ca29a1f7 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -173,7 +173,7 @@
 {% if devicetype.is_parent_device or devicebay_table.rows %}
     <div class="row">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicebaytemplate_add' edit_url=None delete_url='dcim:devicebaytemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicebaytemplate_add' edit_url='dcim:devicebaytemplate_bulk_edit' delete_url='dcim:devicebaytemplate_bulk_delete' %}
         </div>
     </div>
 {% endif %}

From 89ea34015d1adafd34c64b439943c20c2de642e7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 30 Jun 2020 16:15:17 -0400
Subject: [PATCH 274/505] Enable bulk editing of device component labels

---
 netbox/dcim/forms.py | 95 +++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 374f5fa4b..1857e5f8f 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -23,10 +23,9 @@ from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
-    ColorSelect, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
-    DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField,
-    NumericArrayField, SelectWithPK, SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
-    BOOLEAN_WITH_BLANK_CHOICES,
+    ColorSelect, CommentField, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
+    DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, NumericArrayField, SelectWithPK,
+    SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from virtualization.models import Cluster, ClusterGroup
 from .choices import *
@@ -1082,6 +1081,10 @@ class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=ConsolePortTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -1089,7 +1092,7 @@ class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('type', 'description')
+        nullable_fields = ('label', 'type', 'description')
 
 
 class ConsoleServerPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1116,6 +1119,10 @@ class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=ConsoleServerPortTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(ConsolePortTypeChoices),
         required=False,
@@ -1126,7 +1133,7 @@ class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('type', 'description')
+        nullable_fields = ('label', 'type', 'description')
 
 
 class PowerPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1163,6 +1170,10 @@ class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=PowerPortTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerPortTypeChoices),
         required=False,
@@ -1183,7 +1194,7 @@ class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('type', 'maximum_draw', 'allocated_draw', 'description')
+        nullable_fields = ('label', 'type', 'maximum_draw', 'allocated_draw', 'description')
 
 
 class PowerOutletTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1246,6 +1257,10 @@ class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         disabled=True,
         widget=forms.HiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PowerOutletTypeChoices),
         required=False,
@@ -1265,7 +1280,7 @@ class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('type', 'power_port', 'feed_leg', 'description')
+        nullable_fields = ('label', 'type', 'power_port', 'feed_leg', 'description')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1308,6 +1323,10 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=InterfaceTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(InterfaceTypeChoices),
         required=False,
@@ -1323,7 +1342,7 @@ class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
     )
 
     class Meta:
-        nullable_fields = ('description',)
+        nullable_fields = ('label', 'description')
 
 
 class FrontPortTemplateForm(BootstrapMixin, forms.ModelForm):
@@ -1491,12 +1510,16 @@ class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=DeviceBayTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     description = forms.CharField(
         required=False
     )
 
     class Meta:
-        nullable_fields = ('description',)
+        nullable_fields = ('label', 'description')
 
 
 #
@@ -2295,14 +2318,14 @@ class ConsolePortCreateForm(ComponentCreateForm):
 
 
 class ConsolePortBulkCreateForm(
-    form_from_model(ConsolePort, ['type', 'description', 'tags']),
+    form_from_model(ConsolePort, ['label', 'type', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class ConsolePortBulkEditForm(
-    form_from_model(ConsolePort, ['type', 'description']),
+    form_from_model(ConsolePort, ['label', 'type', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -2313,9 +2336,7 @@ class ConsolePortBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = (
-            'description',
-        )
+        nullable_fields = ('label', 'description')
 
 
 class ConsolePortCSVForm(CSVModelForm):
@@ -2377,14 +2398,14 @@ class ConsoleServerPortCreateForm(ComponentCreateForm):
 
 
 class ConsoleServerPortBulkCreateForm(
-    form_from_model(ConsoleServerPort, ['type', 'description', 'tags']),
+    form_from_model(ConsoleServerPort, ['label', 'type', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class ConsoleServerPortBulkEditForm(
-    form_from_model(ConsoleServerPort, ['type', 'description']),
+    form_from_model(ConsoleServerPort, ['label', 'type', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -2395,9 +2416,7 @@ class ConsoleServerPortBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = [
-            'description',
-        ]
+        nullable_fields = ('label', 'description')
 
 
 class ConsoleServerPortCSVForm(CSVModelForm):
@@ -2469,14 +2488,14 @@ class PowerPortCreateForm(ComponentCreateForm):
 
 
 class PowerPortBulkCreateForm(
-    form_from_model(PowerPort, ['type', 'maximum_draw', 'allocated_draw', 'description', 'tags']),
+    form_from_model(PowerPort, ['label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class PowerPortBulkEditForm(
-    form_from_model(PowerPort, ['type', 'maximum_draw', 'allocated_draw', 'description']),
+    form_from_model(PowerPort, ['label', 'type', 'maximum_draw', 'allocated_draw', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -2487,9 +2506,7 @@ class PowerPortBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = (
-            'description',
-        )
+        nullable_fields = ('label', 'description')
 
 
 class PowerPortCSVForm(CSVModelForm):
@@ -2581,14 +2598,14 @@ class PowerOutletCreateForm(ComponentCreateForm):
 
 
 class PowerOutletBulkCreateForm(
-    form_from_model(PowerOutlet, ['type', 'feed_leg', 'description', 'tags']),
+    form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class PowerOutletBulkEditForm(
-    form_from_model(PowerOutlet, ['type', 'feed_leg', 'power_port', 'description']),
+    form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'power_port', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -2605,9 +2622,7 @@ class PowerOutletBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = [
-            'type', 'feed_leg', 'power_port', 'description',
-        ]
+        nullable_fields = ('label', 'type', 'feed_leg', 'power_port', 'description')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -2838,14 +2853,16 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
 
 
 class InterfaceBulkCreateForm(
-    form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only', 'description']),
+    form_from_model(Interface, ['label', 'type', 'enabled', 'mtu', 'mgmt_only', 'description']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class InterfaceBulkEditForm(
-    form_from_model(Interface, ['type', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode']),
+    form_from_model(Interface, [
+        'label', 'type', 'enabled', 'lag', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode'
+    ]),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -2884,9 +2901,9 @@ class InterfaceBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = [
-            'lag', 'mac_address', 'mtu', 'description', 'mode', 'untagged_vlan', 'tagged_vlans'
-        ]
+        nullable_fields = (
+            'label', 'lag', 'mac_address', 'mtu', 'description', 'mode', 'untagged_vlan', 'tagged_vlans'
+        )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -3283,7 +3300,7 @@ class PopulateDeviceBayForm(BootstrapMixin, forms.Form):
 
 
 class DeviceBayBulkCreateForm(
-    form_from_model(DeviceBay, ['description', 'tags']),
+    form_from_model(DeviceBay, ['label', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     tags = DynamicModelMultipleChoiceField(
@@ -3293,7 +3310,7 @@ class DeviceBayBulkCreateForm(
 
 
 class DeviceBayBulkEditForm(
-    form_from_model(DeviceBay, ['description']),
+    form_from_model(DeviceBay, ['label', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -3304,9 +3321,7 @@ class DeviceBayBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = (
-            'description',
-        )
+        nullable_fields = ('label', 'description')
 
 
 class DeviceBayCSVForm(CSVModelForm):

From 7fab929194f1595f428df07b6ad8092441f89a71 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 30 Jun 2020 16:30:54 -0400
Subject: [PATCH 275/505] Fix evaluation of empty label_pattern

---
 netbox/dcim/forms.py      | 16 ++++++++--------
 netbox/utilities/forms.py | 29 ++---------------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 1857e5f8f..df2625e67 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -139,14 +139,14 @@ class LabeledComponentForm(BootstrapMixin, forms.Form):
     def clean(self):
 
         # Validate that the number of components being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} components, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            }, code='label_pattern_mismatch')
+        if self.cleaned_data['label_pattern']:
+            name_pattern_count = len(self.cleaned_data['name_pattern'])
+            label_pattern_count = len(self.cleaned_data['label_pattern'])
+            if name_pattern_count != label_pattern_count:
+                raise forms.ValidationError({
+                    'label_pattern': f'The provided name pattern will create {name_pattern_count} components, however '
+                                     f'{label_pattern_count} labels will be generated. These counts must match.'
+                }, code='label_pattern_mismatch')
 
 
 #
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index b2ce1592a..851efd24f 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -529,8 +529,8 @@ class ExpandableNameField(forms.CharField):
                 """
 
     def to_python(self, value):
-        if value is None:
-            return list()
+        if not value:
+            return ''
         if re.search(ALPHANUMERIC_EXPANSION_PATTERN, value):
             return list(expand_alphanumeric_pattern(value))
         return [value]
@@ -830,31 +830,6 @@ class ImportForm(BootstrapMixin, forms.Form):
                 })
 
 
-class LabeledComponentForm(BootstrapMixin, forms.Form):
-    """
-    Base form for adding label pattern validation to `Create` forms
-    """
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    label_pattern = ExpandableNameField(
-        label='Label',
-        required=False
-    )
-
-    def clean(self):
-
-        # Validate that the number of components being created from both the name_pattern and label_pattern are equal
-        name_pattern_count = len(self.cleaned_data['name_pattern'])
-        label_pattern_count = len(self.cleaned_data['label_pattern'])
-        if label_pattern_count and name_pattern_count != label_pattern_count:
-            raise forms.ValidationError({
-                'label_pattern': 'The provided name pattern will create {} components, however {} labels will '
-                'be generated. These counts must match.'.format(
-                    name_pattern_count, label_pattern_count)
-            }, code='label_pattern_mismatch')
-
-
 class TableConfigForm(BootstrapMixin, forms.Form):
     """
     Form for configuring user's table preferences.

From 4613b69c2829c1f51c846b13d75f075ea70e9d0d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 11:50:31 -0400
Subject: [PATCH 276/505] Extend GetReturnURLMixin to automatically resolve
 default return URL for querysets

---
 netbox/circuits/views.py       | 13 ------
 netbox/dcim/views.py           | 84 ----------------------------------
 netbox/extras/views.py         |  9 ----
 netbox/ipam/views.py           | 38 ---------------
 netbox/secrets/views.py        |  7 ---
 netbox/tenancy/views.py        |  8 ----
 netbox/utilities/views.py      | 15 ++++--
 netbox/virtualization/views.py | 17 -------
 8 files changed, 12 insertions(+), 179 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index f100dd3c7..83b6fcd81 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -60,19 +60,16 @@ class ProviderEditView(ObjectEditView):
     queryset = Provider.objects.all()
     model_form = forms.ProviderForm
     template_name = 'circuits/provider_edit.html'
-    default_return_url = 'circuits:provider_list'
 
 
 class ProviderDeleteView(ObjectDeleteView):
     queryset = Provider.objects.all()
-    default_return_url = 'circuits:provider_list'
 
 
 class ProviderBulkImportView(BulkImportView):
     queryset = Provider.objects.all()
     model_form = forms.ProviderCSVForm
     table = tables.ProviderTable
-    default_return_url = 'circuits:provider_list'
 
 
 class ProviderBulkEditView(BulkEditView):
@@ -80,14 +77,12 @@ class ProviderBulkEditView(BulkEditView):
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
     form = forms.ProviderBulkEditForm
-    default_return_url = 'circuits:provider_list'
 
 
 class ProviderBulkDeleteView(BulkDeleteView):
     queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
-    default_return_url = 'circuits:provider_list'
 
 
 #
@@ -102,20 +97,17 @@ class CircuitTypeListView(ObjectListView):
 class CircuitTypeEditView(ObjectEditView):
     queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeForm
-    default_return_url = 'circuits:circuittype_list'
 
 
 class CircuitTypeBulkImportView(BulkImportView):
     queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeCSVForm
     table = tables.CircuitTypeTable
-    default_return_url = 'circuits:circuittype_list'
 
 
 class CircuitTypeBulkDeleteView(BulkDeleteView):
     queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
     table = tables.CircuitTypeTable
-    default_return_url = 'circuits:circuittype_list'
 
 
 #
@@ -165,19 +157,16 @@ class CircuitEditView(ObjectEditView):
     queryset = Circuit.objects.all()
     model_form = forms.CircuitForm
     template_name = 'circuits/circuit_edit.html'
-    default_return_url = 'circuits:circuit_list'
 
 
 class CircuitDeleteView(ObjectDeleteView):
     queryset = Circuit.objects.all()
-    default_return_url = 'circuits:circuit_list'
 
 
 class CircuitBulkImportView(BulkImportView):
     queryset = Circuit.objects.all()
     model_form = forms.CircuitCSVForm
     table = tables.CircuitTable
-    default_return_url = 'circuits:circuit_list'
 
 
 class CircuitBulkEditView(BulkEditView):
@@ -185,14 +174,12 @@ class CircuitBulkEditView(BulkEditView):
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
     form = forms.CircuitBulkEditForm
-    default_return_url = 'circuits:circuit_list'
 
 
 class CircuitBulkDeleteView(BulkDeleteView):
     queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
-    default_return_url = 'circuits:circuit_list'
 
 
 class CircuitSwapTerminations(ObjectEditView):
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 864665701..3edc9b061 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -120,21 +120,18 @@ class RegionListView(ObjectListView):
 class RegionEditView(ObjectEditView):
     queryset = Region.objects.all()
     model_form = forms.RegionForm
-    default_return_url = 'dcim:region_list'
 
 
 class RegionBulkImportView(BulkImportView):
     queryset = Region.objects.all()
     model_form = forms.RegionCSVForm
     table = tables.RegionTable
-    default_return_url = 'dcim:region_list'
 
 
 class RegionBulkDeleteView(BulkDeleteView):
     queryset = Region.objects.all()
     filterset = filters.RegionFilterSet
     table = tables.RegionTable
-    default_return_url = 'dcim:region_list'
 
 
 #
@@ -179,19 +176,16 @@ class SiteEditView(ObjectEditView):
     queryset = Site.objects.all()
     model_form = forms.SiteForm
     template_name = 'dcim/site_edit.html'
-    default_return_url = 'dcim:site_list'
 
 
 class SiteDeleteView(ObjectDeleteView):
     queryset = Site.objects.all()
-    default_return_url = 'dcim:site_list'
 
 
 class SiteBulkImportView(BulkImportView):
     queryset = Site.objects.all()
     model_form = forms.SiteCSVForm
     table = tables.SiteTable
-    default_return_url = 'dcim:site_list'
 
 
 class SiteBulkEditView(BulkEditView):
@@ -199,14 +193,12 @@ class SiteBulkEditView(BulkEditView):
     filterset = filters.SiteFilterSet
     table = tables.SiteTable
     form = forms.SiteBulkEditForm
-    default_return_url = 'dcim:site_list'
 
 
 class SiteBulkDeleteView(BulkDeleteView):
     queryset = Site.objects.prefetch_related('region', 'tenant')
     filterset = filters.SiteFilterSet
     table = tables.SiteTable
-    default_return_url = 'dcim:site_list'
 
 
 #
@@ -229,21 +221,18 @@ class RackGroupListView(ObjectListView):
 class RackGroupEditView(ObjectEditView):
     queryset = RackGroup.objects.all()
     model_form = forms.RackGroupForm
-    default_return_url = 'dcim:rackgroup_list'
 
 
 class RackGroupBulkImportView(BulkImportView):
     queryset = RackGroup.objects.all()
     model_form = forms.RackGroupCSVForm
     table = tables.RackGroupTable
-    default_return_url = 'dcim:rackgroup_list'
 
 
 class RackGroupBulkDeleteView(BulkDeleteView):
     queryset = RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks'))
     filterset = filters.RackGroupFilterSet
     table = tables.RackGroupTable
-    default_return_url = 'dcim:rackgroup_list'
 
 
 #
@@ -258,20 +247,17 @@ class RackRoleListView(ObjectListView):
 class RackRoleEditView(ObjectEditView):
     queryset = RackRole.objects.all()
     model_form = forms.RackRoleForm
-    default_return_url = 'dcim:rackrole_list'
 
 
 class RackRoleBulkImportView(BulkImportView):
     queryset = RackRole.objects.all()
     model_form = forms.RackRoleCSVForm
     table = tables.RackRoleTable
-    default_return_url = 'dcim:rackrole_list'
 
 
 class RackRoleBulkDeleteView(BulkDeleteView):
     queryset = RackRole.objects.annotate(rack_count=Count('racks'))
     table = tables.RackRoleTable
-    default_return_url = 'dcim:rackrole_list'
 
 
 #
@@ -363,19 +349,16 @@ class RackEditView(ObjectEditView):
     queryset = Rack.objects.all()
     model_form = forms.RackForm
     template_name = 'dcim/rack_edit.html'
-    default_return_url = 'dcim:rack_list'
 
 
 class RackDeleteView(ObjectDeleteView):
     queryset = Rack.objects.all()
-    default_return_url = 'dcim:rack_list'
 
 
 class RackBulkImportView(BulkImportView):
     queryset = Rack.objects.all()
     model_form = forms.RackCSVForm
     table = tables.RackTable
-    default_return_url = 'dcim:rack_list'
 
 
 class RackBulkEditView(BulkEditView):
@@ -383,14 +366,12 @@ class RackBulkEditView(BulkEditView):
     filterset = filters.RackFilterSet
     table = tables.RackTable
     form = forms.RackBulkEditForm
-    default_return_url = 'dcim:rack_list'
 
 
 class RackBulkDeleteView(BulkDeleteView):
     queryset = Rack.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.RackFilterSet
     table = tables.RackTable
-    default_return_url = 'dcim:rack_list'
 
 
 #
@@ -421,7 +402,6 @@ class RackReservationEditView(ObjectEditView):
     queryset = RackReservation.objects.all()
     model_form = forms.RackReservationForm
     template_name = 'dcim/rackreservation_edit.html'
-    default_return_url = 'dcim:rackreservation_list'
 
     def alter_obj(self, obj, request, args, kwargs):
         if not obj.pk:
@@ -433,14 +413,12 @@ class RackReservationEditView(ObjectEditView):
 
 class RackReservationDeleteView(ObjectDeleteView):
     queryset = RackReservation.objects.all()
-    default_return_url = 'dcim:rackreservation_list'
 
 
 class RackReservationImportView(BulkImportView):
     queryset = RackReservation.objects.all()
     model_form = forms.RackReservationCSVForm
     table = tables.RackReservationTable
-    default_return_url = 'dcim:rackreservation_list'
 
     def _save_obj(self, obj_form, request):
         """
@@ -458,14 +436,12 @@ class RackReservationBulkEditView(BulkEditView):
     filterset = filters.RackReservationFilterSet
     table = tables.RackReservationTable
     form = forms.RackReservationBulkEditForm
-    default_return_url = 'dcim:rackreservation_list'
 
 
 class RackReservationBulkDeleteView(BulkDeleteView):
     queryset = RackReservation.objects.prefetch_related('rack', 'user')
     filterset = filters.RackReservationFilterSet
     table = tables.RackReservationTable
-    default_return_url = 'dcim:rackreservation_list'
 
 
 #
@@ -484,20 +460,17 @@ class ManufacturerListView(ObjectListView):
 class ManufacturerEditView(ObjectEditView):
     queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerForm
-    default_return_url = 'dcim:manufacturer_list'
 
 
 class ManufacturerBulkImportView(BulkImportView):
     queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerCSVForm
     table = tables.ManufacturerTable
-    default_return_url = 'dcim:manufacturer_list'
 
 
 class ManufacturerBulkDeleteView(BulkDeleteView):
     queryset = Manufacturer.objects.annotate(devicetype_count=Count('device_types'))
     table = tables.ManufacturerTable
-    default_return_url = 'dcim:manufacturer_list'
 
 
 #
@@ -580,12 +553,10 @@ class DeviceTypeEditView(ObjectEditView):
     queryset = DeviceType.objects.all()
     model_form = forms.DeviceTypeForm
     template_name = 'dcim/devicetype_edit.html'
-    default_return_url = 'dcim:devicetype_list'
 
 
 class DeviceTypeDeleteView(ObjectDeleteView):
     queryset = DeviceType.objects.all()
-    default_return_url = 'dcim:devicetype_list'
 
 
 class DeviceTypeImportView(ObjectImportView):
@@ -612,7 +583,6 @@ class DeviceTypeImportView(ObjectImportView):
         ('front-ports', forms.FrontPortTemplateImportForm),
         ('device-bays', forms.DeviceBayTemplateImportForm),
     ))
-    default_return_url = 'dcim:devicetype_import'
 
 
 class DeviceTypeBulkEditView(BulkEditView):
@@ -620,14 +590,12 @@ class DeviceTypeBulkEditView(BulkEditView):
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
     form = forms.DeviceTypeBulkEditForm
-    default_return_url = 'dcim:devicetype_list'
 
 
 class DeviceTypeBulkDeleteView(BulkDeleteView):
     queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
-    default_return_url = 'dcim:devicetype_list'
 
 
 #
@@ -890,20 +858,17 @@ class DeviceRoleListView(ObjectListView):
 class DeviceRoleEditView(ObjectEditView):
     queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleForm
-    default_return_url = 'dcim:devicerole_list'
 
 
 class DeviceRoleBulkImportView(BulkImportView):
     queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleCSVForm
     table = tables.DeviceRoleTable
-    default_return_url = 'dcim:devicerole_list'
 
 
 class DeviceRoleBulkDeleteView(BulkDeleteView):
     queryset = DeviceRole.objects.all()
     table = tables.DeviceRoleTable
-    default_return_url = 'dcim:devicerole_list'
 
 
 #
@@ -918,20 +883,17 @@ class PlatformListView(ObjectListView):
 class PlatformEditView(ObjectEditView):
     queryset = Platform.objects.all()
     model_form = forms.PlatformForm
-    default_return_url = 'dcim:platform_list'
 
 
 class PlatformBulkImportView(BulkImportView):
     queryset = Platform.objects.all()
     model_form = forms.PlatformCSVForm
     table = tables.PlatformTable
-    default_return_url = 'dcim:platform_list'
 
 
 class PlatformBulkDeleteView(BulkDeleteView):
     queryset = Platform.objects.all()
     table = tables.PlatformTable
-    default_return_url = 'dcim:platform_list'
 
 
 #
@@ -1118,12 +1080,10 @@ class DeviceEditView(ObjectEditView):
     queryset = Device.objects.all()
     model_form = forms.DeviceForm
     template_name = 'dcim/device_edit.html'
-    default_return_url = 'dcim:device_list'
 
 
 class DeviceDeleteView(ObjectDeleteView):
     queryset = Device.objects.all()
-    default_return_url = 'dcim:device_list'
 
 
 class DeviceBulkImportView(BulkImportView):
@@ -1131,7 +1091,6 @@ class DeviceBulkImportView(BulkImportView):
     model_form = forms.DeviceCSVForm
     table = tables.DeviceImportTable
     template_name = 'dcim/device_import.html'
-    default_return_url = 'dcim:device_list'
 
 
 class ChildDeviceBulkImportView(BulkImportView):
@@ -1139,7 +1098,6 @@ class ChildDeviceBulkImportView(BulkImportView):
     model_form = forms.ChildDeviceCSVForm
     table = tables.DeviceImportTable
     template_name = 'dcim/device_import_child.html'
-    default_return_url = 'dcim:device_list'
 
     def _save_obj(self, obj_form, request):
 
@@ -1158,14 +1116,12 @@ class DeviceBulkEditView(BulkEditView):
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
     form = forms.DeviceBulkEditForm
-    default_return_url = 'dcim:device_list'
 
 
 class DeviceBulkDeleteView(BulkDeleteView):
     queryset = Device.objects.prefetch_related('tenant', 'site', 'rack', 'device_role', 'device_type__manufacturer')
     filterset = filters.DeviceFilterSet
     table = tables.DeviceTable
-    default_return_url = 'dcim:device_list'
 
 
 #
@@ -1204,7 +1160,6 @@ class ConsolePortBulkImportView(BulkImportView):
     queryset = ConsolePort.objects.all()
     model_form = forms.ConsolePortCSVForm
     table = tables.ConsolePortTable
-    default_return_url = 'dcim:consoleport_list'
 
 
 class ConsolePortBulkEditView(BulkEditView):
@@ -1226,7 +1181,6 @@ class ConsolePortBulkDeleteView(BulkDeleteView):
     queryset = ConsolePort.objects.all()
     filterset = filters.ConsolePortFilterSet
     table = tables.ConsolePortTable
-    default_return_url = 'dcim:consoleport_list'
 
 
 #
@@ -1265,7 +1219,6 @@ class ConsoleServerPortBulkImportView(BulkImportView):
     queryset = ConsoleServerPort.objects.all()
     model_form = forms.ConsoleServerPortCSVForm
     table = tables.ConsoleServerPortTable
-    default_return_url = 'dcim:consoleserverport_list'
 
 
 class ConsoleServerPortBulkEditView(BulkEditView):
@@ -1287,7 +1240,6 @@ class ConsoleServerPortBulkDeleteView(BulkDeleteView):
     queryset = ConsoleServerPort.objects.all()
     filterset = filters.ConsoleServerPortFilterSet
     table = tables.ConsoleServerPortTable
-    default_return_url = 'dcim:consoleserverport_list'
 
 
 #
@@ -1326,7 +1278,6 @@ class PowerPortBulkImportView(BulkImportView):
     queryset = PowerPort.objects.all()
     model_form = forms.PowerPortCSVForm
     table = tables.PowerPortTable
-    default_return_url = 'dcim:powerport_list'
 
 
 class PowerPortBulkEditView(BulkEditView):
@@ -1348,7 +1299,6 @@ class PowerPortBulkDeleteView(BulkDeleteView):
     queryset = PowerPort.objects.all()
     filterset = filters.PowerPortFilterSet
     table = tables.PowerPortTable
-    default_return_url = 'dcim:powerport_list'
 
 
 #
@@ -1387,7 +1337,6 @@ class PowerOutletBulkImportView(BulkImportView):
     queryset = PowerOutlet.objects.all()
     model_form = forms.PowerOutletCSVForm
     table = tables.PowerOutletTable
-    default_return_url = 'dcim:poweroutlet_list'
 
 
 class PowerOutletBulkEditView(BulkEditView):
@@ -1409,7 +1358,6 @@ class PowerOutletBulkDeleteView(BulkDeleteView):
     queryset = PowerOutlet.objects.all()
     filterset = filters.PowerOutletFilterSet
     table = tables.PowerOutletTable
-    default_return_url = 'dcim:poweroutlet_list'
 
 
 #
@@ -1481,7 +1429,6 @@ class InterfaceBulkImportView(BulkImportView):
     queryset = Interface.objects.all()
     model_form = forms.InterfaceCSVForm
     table = tables.InterfaceTable
-    default_return_url = 'dcim:interface_list'
 
 
 class InterfaceBulkEditView(BulkEditView):
@@ -1503,7 +1450,6 @@ class InterfaceBulkDeleteView(BulkDeleteView):
     queryset = Interface.objects.all()
     filterset = filters.InterfaceFilterSet
     table = tables.InterfaceTable
-    default_return_url = 'dcim:interface_list'
 
 
 #
@@ -1542,7 +1488,6 @@ class FrontPortBulkImportView(BulkImportView):
     queryset = FrontPort.objects.all()
     model_form = forms.FrontPortCSVForm
     table = tables.FrontPortTable
-    default_return_url = 'dcim:frontport_list'
 
 
 class FrontPortBulkEditView(BulkEditView):
@@ -1564,7 +1509,6 @@ class FrontPortBulkDeleteView(BulkDeleteView):
     queryset = FrontPort.objects.all()
     filterset = filters.FrontPortFilterSet
     table = tables.FrontPortTable
-    default_return_url = 'dcim:frontport_list'
 
 
 #
@@ -1603,7 +1547,6 @@ class RearPortBulkImportView(BulkImportView):
     queryset = RearPort.objects.all()
     model_form = forms.RearPortCSVForm
     table = tables.RearPortTable
-    default_return_url = 'dcim:rearport_list'
 
 
 class RearPortBulkEditView(BulkEditView):
@@ -1625,7 +1568,6 @@ class RearPortBulkDeleteView(BulkDeleteView):
     queryset = RearPort.objects.all()
     filterset = filters.RearPortFilterSet
     table = tables.RearPortTable
-    default_return_url = 'dcim:rearport_list'
 
 
 #
@@ -1731,7 +1673,6 @@ class DeviceBayBulkImportView(BulkImportView):
     queryset = DeviceBay.objects.all()
     model_form = forms.DeviceBayCSVForm
     table = tables.DeviceBayTable
-    default_return_url = 'dcim:devicebay_list'
 
 
 class DeviceBayBulkEditView(BulkEditView):
@@ -1749,7 +1690,6 @@ class DeviceBayBulkDeleteView(BulkDeleteView):
     queryset = DeviceBay.objects.all()
     filterset = filters.DeviceBayFilterSet
     table = tables.DeviceBayTable
-    default_return_url = 'dcim:devicebay_list'
 
 
 #
@@ -1901,7 +1841,6 @@ class CableTraceView(ObjectView):
 class CableCreateView(ObjectEditView):
     queryset = Cable.objects.all()
     template_name = 'dcim/cable_connect.html'
-    default_return_url = 'dcim:cable_list'
 
     def dispatch(self, request, *args, **kwargs):
 
@@ -1959,19 +1898,16 @@ class CableEditView(ObjectEditView):
     queryset = Cable.objects.all()
     model_form = forms.CableForm
     template_name = 'dcim/cable_edit.html'
-    default_return_url = 'dcim:cable_list'
 
 
 class CableDeleteView(ObjectDeleteView):
     queryset = Cable.objects.all()
-    default_return_url = 'dcim:cable_list'
 
 
 class CableBulkImportView(BulkImportView):
     queryset = Cable.objects.all()
     model_form = forms.CableCSVForm
     table = tables.CableTable
-    default_return_url = 'dcim:cable_list'
 
 
 class CableBulkEditView(BulkEditView):
@@ -1979,14 +1915,12 @@ class CableBulkEditView(BulkEditView):
     filterset = filters.CableFilterSet
     table = tables.CableTable
     form = forms.CableBulkEditForm
-    default_return_url = 'dcim:cable_list'
 
 
 class CableBulkDeleteView(BulkDeleteView):
     queryset = Cable.objects.prefetch_related('termination_a', 'termination_b')
     filterset = filters.CableFilterSet
     table = tables.CableTable
-    default_return_url = 'dcim:cable_list'
 
 
 #
@@ -2122,7 +2056,6 @@ class InventoryItemBulkImportView(BulkImportView):
     queryset = InventoryItem.objects.all()
     model_form = forms.InventoryItemCSVForm
     table = tables.InventoryItemTable
-    default_return_url = 'dcim:inventoryitem_list'
 
 
 class InventoryItemBulkEditView(BulkEditView):
@@ -2130,14 +2063,12 @@ class InventoryItemBulkEditView(BulkEditView):
     filterset = filters.InventoryItemFilterSet
     table = tables.InventoryItemTable
     form = forms.InventoryItemBulkEditForm
-    default_return_url = 'dcim:inventoryitem_list'
 
 
 class InventoryItemBulkDeleteView(BulkDeleteView):
     queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
     table = tables.InventoryItemTable
     template_name = 'dcim/inventoryitem_bulk_delete.html'
-    default_return_url = 'dcim:inventoryitem_list'
 
 
 #
@@ -2169,7 +2100,6 @@ class VirtualChassisCreateView(ObjectEditView):
     queryset = VirtualChassis.objects.all()
     model_form = forms.VirtualChassisCreateForm
     template_name = 'dcim/virtualchassis_add.html'
-    default_return_url = 'dcim:virtualchassis_list'
 
 
 class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
@@ -2242,7 +2172,6 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
 
 class VirtualChassisDeleteView(ObjectDeleteView):
     queryset = VirtualChassis.objects.all()
-    default_return_url = 'dcim:device_list'
 
 
 class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMixin, View):
@@ -2356,7 +2285,6 @@ class VirtualChassisBulkImportView(BulkImportView):
     queryset = VirtualChassis.objects.all()
     model_form = forms.VirtualChassisCSVForm
     table = tables.VirtualChassisTable
-    default_return_url = 'dcim:virtualchassis_list'
 
 
 class VirtualChassisBulkEditView(BulkEditView):
@@ -2364,14 +2292,12 @@ class VirtualChassisBulkEditView(BulkEditView):
     filterset = filters.VirtualChassisFilterSet
     table = tables.VirtualChassisTable
     form = forms.VirtualChassisBulkEditForm
-    default_return_url = 'dcim:virtualchassis_list'
 
 
 class VirtualChassisBulkDeleteView(BulkDeleteView):
     queryset = VirtualChassis.objects.all()
     filterset = filters.VirtualChassisFilterSet
     table = tables.VirtualChassisTable
-    default_return_url = 'dcim:virtualchassis_list'
 
 
 #
@@ -2411,19 +2337,16 @@ class PowerPanelView(ObjectView):
 class PowerPanelEditView(ObjectEditView):
     queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelForm
-    default_return_url = 'dcim:powerpanel_list'
 
 
 class PowerPanelDeleteView(ObjectDeleteView):
     queryset = PowerPanel.objects.all()
-    default_return_url = 'dcim:powerpanel_list'
 
 
 class PowerPanelBulkImportView(BulkImportView):
     queryset = PowerPanel.objects.all()
     model_form = forms.PowerPanelCSVForm
     table = tables.PowerPanelTable
-    default_return_url = 'dcim:powerpanel_list'
 
 
 class PowerPanelBulkEditView(BulkEditView):
@@ -2431,7 +2354,6 @@ class PowerPanelBulkEditView(BulkEditView):
     filterset = filters.PowerPanelFilterSet
     table = tables.PowerPanelTable
     form = forms.PowerPanelBulkEditForm
-    default_return_url = 'dcim:powerpanel_list'
 
 
 class PowerPanelBulkDeleteView(BulkDeleteView):
@@ -2442,7 +2364,6 @@ class PowerPanelBulkDeleteView(BulkDeleteView):
     )
     filterset = filters.PowerPanelFilterSet
     table = tables.PowerPanelTable
-    default_return_url = 'dcim:powerpanel_list'
 
 
 #
@@ -2474,19 +2395,16 @@ class PowerFeedEditView(ObjectEditView):
     queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedForm
     template_name = 'dcim/powerfeed_edit.html'
-    default_return_url = 'dcim:powerfeed_list'
 
 
 class PowerFeedDeleteView(ObjectDeleteView):
     queryset = PowerFeed.objects.all()
-    default_return_url = 'dcim:powerfeed_list'
 
 
 class PowerFeedBulkImportView(BulkImportView):
     queryset = PowerFeed.objects.all()
     model_form = forms.PowerFeedCSVForm
     table = tables.PowerFeedTable
-    default_return_url = 'dcim:powerfeed_list'
 
 
 class PowerFeedBulkEditView(BulkEditView):
@@ -2494,11 +2412,9 @@ class PowerFeedBulkEditView(BulkEditView):
     filterset = filters.PowerFeedFilterSet
     table = tables.PowerFeedTable
     form = forms.PowerFeedBulkEditForm
-    default_return_url = 'dcim:powerfeed_list'
 
 
 class PowerFeedBulkDeleteView(BulkDeleteView):
     queryset = PowerFeed.objects.prefetch_related('power_panel', 'rack')
     filterset = filters.PowerFeedFilterSet
     table = tables.PowerFeedTable
-    default_return_url = 'dcim:powerfeed_list'
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 55064b5cf..879ca89d0 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -70,20 +70,17 @@ class TagView(ObjectView):
 class TagEditView(ObjectEditView):
     queryset = Tag.objects.all()
     model_form = forms.TagForm
-    default_return_url = 'extras:tag_list'
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
     queryset = Tag.objects.all()
-    default_return_url = 'extras:tag_list'
 
 
 class TagBulkImportView(BulkImportView):
     queryset = Tag.objects.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
-    default_return_url = 'extras:tag_list'
 
 
 class TagBulkEditView(BulkEditView):
@@ -94,7 +91,6 @@ class TagBulkEditView(BulkEditView):
     )
     table = tables.TagTable
     form = forms.TagBulkEditForm
-    default_return_url = 'extras:tag_list'
 
 
 class TagBulkDeleteView(BulkDeleteView):
@@ -104,7 +100,6 @@ class TagBulkDeleteView(BulkDeleteView):
         'name'
     )
     table = tables.TagTable
-    default_return_url = 'extras:tag_list'
 
 
 #
@@ -156,7 +151,6 @@ class ConfigContextView(ObjectView):
 class ConfigContextEditView(ObjectEditView):
     queryset = ConfigContext.objects.all()
     model_form = forms.ConfigContextForm
-    default_return_url = 'extras:configcontext_list'
     template_name = 'extras/configcontext_edit.html'
 
 
@@ -165,18 +159,15 @@ class ConfigContextBulkEditView(BulkEditView):
     filterset = filters.ConfigContextFilterSet
     table = tables.ConfigContextTable
     form = forms.ConfigContextBulkEditForm
-    default_return_url = 'extras:configcontext_list'
 
 
 class ConfigContextDeleteView(ObjectDeleteView):
     queryset = ConfigContext.objects.all()
-    default_return_url = 'extras:configcontext_list'
 
 
 class ConfigContextBulkDeleteView(BulkDeleteView):
     queryset = ConfigContext.objects.all()
     table = tables.ConfigContextTable
-    default_return_url = 'extras:configcontext_list'
 
 
 class ObjectConfigContextView(ObjectView):
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index e33cb3c6e..81e210958 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -48,19 +48,16 @@ class VRFEditView(ObjectEditView):
     queryset = VRF.objects.all()
     model_form = forms.VRFForm
     template_name = 'ipam/vrf_edit.html'
-    default_return_url = 'ipam:vrf_list'
 
 
 class VRFDeleteView(ObjectDeleteView):
     queryset = VRF.objects.all()
-    default_return_url = 'ipam:vrf_list'
 
 
 class VRFBulkImportView(BulkImportView):
     queryset = VRF.objects.all()
     model_form = forms.VRFCSVForm
     table = tables.VRFTable
-    default_return_url = 'ipam:vrf_list'
 
 
 class VRFBulkEditView(BulkEditView):
@@ -68,14 +65,12 @@ class VRFBulkEditView(BulkEditView):
     filterset = filters.VRFFilterSet
     table = tables.VRFTable
     form = forms.VRFBulkEditForm
-    default_return_url = 'ipam:vrf_list'
 
 
 class VRFBulkDeleteView(BulkDeleteView):
     queryset = VRF.objects.prefetch_related('tenant')
     filterset = filters.VRFFilterSet
     table = tables.VRFTable
-    default_return_url = 'ipam:vrf_list'
 
 
 #
@@ -163,21 +158,18 @@ class RIRListView(ObjectListView):
 class RIREditView(ObjectEditView):
     queryset = RIR.objects.all()
     model_form = forms.RIRForm
-    default_return_url = 'ipam:rir_list'
 
 
 class RIRBulkImportView(BulkImportView):
     queryset = RIR.objects.all()
     model_form = forms.RIRCSVForm
     table = tables.RIRTable
-    default_return_url = 'ipam:rir_list'
 
 
 class RIRBulkDeleteView(BulkDeleteView):
     queryset = RIR.objects.annotate(aggregate_count=Count('aggregates'))
     filterset = filters.RIRFilterSet
     table = tables.RIRTable
-    default_return_url = 'ipam:rir_list'
 
 
 #
@@ -259,19 +251,16 @@ class AggregateEditView(ObjectEditView):
     queryset = Aggregate.objects.all()
     model_form = forms.AggregateForm
     template_name = 'ipam/aggregate_edit.html'
-    default_return_url = 'ipam:aggregate_list'
 
 
 class AggregateDeleteView(ObjectDeleteView):
     queryset = Aggregate.objects.all()
-    default_return_url = 'ipam:aggregate_list'
 
 
 class AggregateBulkImportView(BulkImportView):
     queryset = Aggregate.objects.all()
     model_form = forms.AggregateCSVForm
     table = tables.AggregateTable
-    default_return_url = 'ipam:aggregate_list'
 
 
 class AggregateBulkEditView(BulkEditView):
@@ -279,14 +268,12 @@ class AggregateBulkEditView(BulkEditView):
     filterset = filters.AggregateFilterSet
     table = tables.AggregateTable
     form = forms.AggregateBulkEditForm
-    default_return_url = 'ipam:aggregate_list'
 
 
 class AggregateBulkDeleteView(BulkDeleteView):
     queryset = Aggregate.objects.prefetch_related('rir')
     filterset = filters.AggregateFilterSet
     table = tables.AggregateTable
-    default_return_url = 'ipam:aggregate_list'
 
 
 #
@@ -301,20 +288,17 @@ class RoleListView(ObjectListView):
 class RoleEditView(ObjectEditView):
     queryset = Role.objects.all()
     model_form = forms.RoleForm
-    default_return_url = 'ipam:role_list'
 
 
 class RoleBulkImportView(BulkImportView):
     queryset = Role.objects.all()
     model_form = forms.RoleCSVForm
     table = tables.RoleTable
-    default_return_url = 'ipam:role_list'
 
 
 class RoleBulkDeleteView(BulkDeleteView):
     queryset = Role.objects.all()
     table = tables.RoleTable
-    default_return_url = 'ipam:role_list'
 
 
 #
@@ -470,20 +454,17 @@ class PrefixEditView(ObjectEditView):
     queryset = Prefix.objects.all()
     model_form = forms.PrefixForm
     template_name = 'ipam/prefix_edit.html'
-    default_return_url = 'ipam:prefix_list'
 
 
 class PrefixDeleteView(ObjectDeleteView):
     queryset = Prefix.objects.all()
     template_name = 'ipam/prefix_delete.html'
-    default_return_url = 'ipam:prefix_list'
 
 
 class PrefixBulkImportView(BulkImportView):
     queryset = Prefix.objects.all()
     model_form = forms.PrefixCSVForm
     table = tables.PrefixTable
-    default_return_url = 'ipam:prefix_list'
 
 
 class PrefixBulkEditView(BulkEditView):
@@ -491,14 +472,12 @@ class PrefixBulkEditView(BulkEditView):
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
     form = forms.PrefixBulkEditForm
-    default_return_url = 'ipam:prefix_list'
 
 
 class PrefixBulkDeleteView(BulkDeleteView):
     queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
     filterset = filters.PrefixFilterSet
     table = tables.PrefixTable
-    default_return_url = 'ipam:prefix_list'
 
 
 #
@@ -569,7 +548,6 @@ class IPAddressEditView(ObjectEditView):
     queryset = IPAddress.objects.all()
     model_form = forms.IPAddressForm
     template_name = 'ipam/ipaddress_edit.html'
-    default_return_url = 'ipam:ipaddress_list'
 
     def alter_obj(self, obj, request, url_args, url_kwargs):
 
@@ -630,7 +608,6 @@ class IPAddressAssignView(ObjectView):
 
 class IPAddressDeleteView(ObjectDeleteView):
     queryset = IPAddress.objects.all()
-    default_return_url = 'ipam:ipaddress_list'
 
 
 class IPAddressBulkCreateView(BulkCreateView):
@@ -639,14 +616,12 @@ class IPAddressBulkCreateView(BulkCreateView):
     model_form = forms.IPAddressBulkAddForm
     pattern_target = 'address'
     template_name = 'ipam/ipaddress_bulk_add.html'
-    default_return_url = 'ipam:ipaddress_list'
 
 
 class IPAddressBulkImportView(BulkImportView):
     queryset = IPAddress.objects.all()
     model_form = forms.IPAddressCSVForm
     table = tables.IPAddressTable
-    default_return_url = 'ipam:ipaddress_list'
 
 
 class IPAddressBulkEditView(BulkEditView):
@@ -654,14 +629,12 @@ class IPAddressBulkEditView(BulkEditView):
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
     form = forms.IPAddressBulkEditForm
-    default_return_url = 'ipam:ipaddress_list'
 
 
 class IPAddressBulkDeleteView(BulkDeleteView):
     queryset = IPAddress.objects.prefetch_related('vrf__tenant', 'tenant')
     filterset = filters.IPAddressFilterSet
     table = tables.IPAddressTable
-    default_return_url = 'ipam:ipaddress_list'
 
 
 #
@@ -678,21 +651,18 @@ class VLANGroupListView(ObjectListView):
 class VLANGroupEditView(ObjectEditView):
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupForm
-    default_return_url = 'ipam:vlangroup_list'
 
 
 class VLANGroupBulkImportView(BulkImportView):
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupCSVForm
     table = tables.VLANGroupTable
-    default_return_url = 'ipam:vlangroup_list'
 
 
 class VLANGroupBulkDeleteView(BulkDeleteView):
     queryset = VLANGroup.objects.prefetch_related('site').annotate(vlan_count=Count('vlans'))
     filterset = filters.VLANGroupFilterSet
     table = tables.VLANGroupTable
-    default_return_url = 'ipam:vlangroup_list'
 
 
 class VLANGroupVLANsView(ObjectView):
@@ -789,19 +759,16 @@ class VLANEditView(ObjectEditView):
     queryset = VLAN.objects.all()
     model_form = forms.VLANForm
     template_name = 'ipam/vlan_edit.html'
-    default_return_url = 'ipam:vlan_list'
 
 
 class VLANDeleteView(ObjectDeleteView):
     queryset = VLAN.objects.all()
-    default_return_url = 'ipam:vlan_list'
 
 
 class VLANBulkImportView(BulkImportView):
     queryset = VLAN.objects.all()
     model_form = forms.VLANCSVForm
     table = tables.VLANTable
-    default_return_url = 'ipam:vlan_list'
 
 
 class VLANBulkEditView(BulkEditView):
@@ -809,14 +776,12 @@ class VLANBulkEditView(BulkEditView):
     filterset = filters.VLANFilterSet
     table = tables.VLANTable
     form = forms.VLANBulkEditForm
-    default_return_url = 'ipam:vlan_list'
 
 
 class VLANBulkDeleteView(BulkDeleteView):
     queryset = VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role')
     filterset = filters.VLANFilterSet
     table = tables.VLANTable
-    default_return_url = 'ipam:vlan_list'
 
 
 #
@@ -863,7 +828,6 @@ class ServiceBulkImportView(BulkImportView):
     queryset = Service.objects.all()
     model_form = forms.ServiceCSVForm
     table = tables.ServiceTable
-    default_return_url = 'ipam:service_list'
 
 
 class ServiceDeleteView(ObjectDeleteView):
@@ -875,11 +839,9 @@ class ServiceBulkEditView(BulkEditView):
     filterset = filters.ServiceFilterSet
     table = tables.ServiceTable
     form = forms.ServiceBulkEditForm
-    default_return_url = 'ipam:service_list'
 
 
 class ServiceBulkDeleteView(BulkDeleteView):
     queryset = Service.objects.prefetch_related('device', 'virtual_machine')
     filterset = filters.ServiceFilterSet
     table = tables.ServiceTable
-    default_return_url = 'ipam:service_list'
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index a5aabaecd..fec7c65d1 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -36,20 +36,17 @@ class SecretRoleListView(ObjectListView):
 class SecretRoleEditView(ObjectEditView):
     queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleForm
-    default_return_url = 'secrets:secretrole_list'
 
 
 class SecretRoleBulkImportView(BulkImportView):
     queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleCSVForm
     table = tables.SecretRoleTable
-    default_return_url = 'secrets:secretrole_list'
 
 
 class SecretRoleBulkDeleteView(BulkDeleteView):
     queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
     table = tables.SecretRoleTable
-    default_return_url = 'secrets:secretrole_list'
 
 
 #
@@ -147,7 +144,6 @@ class SecretEditView(ObjectEditView):
 
 class SecretDeleteView(ObjectDeleteView):
     queryset = Secret.objects.all()
-    default_return_url = 'secrets:secret_list'
 
 
 class SecretBulkImportView(BulkImportView):
@@ -155,7 +151,6 @@ class SecretBulkImportView(BulkImportView):
     model_form = forms.SecretCSVForm
     table = tables.SecretTable
     template_name = 'secrets/secret_import.html'
-    default_return_url = 'secrets:secret_list'
     widget_attrs = {'class': 'requires-session-key'}
 
     master_key = None
@@ -203,11 +198,9 @@ class SecretBulkEditView(BulkEditView):
     filterset = filters.SecretFilterSet
     table = tables.SecretTable
     form = forms.SecretBulkEditForm
-    default_return_url = 'secrets:secret_list'
 
 
 class SecretBulkDeleteView(BulkDeleteView):
     queryset = Secret.objects.prefetch_related('role', 'device')
     filterset = filters.SecretFilterSet
     table = tables.SecretTable
-    default_return_url = 'secrets:secret_list'
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index a82b231f5..26b1ce027 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -30,20 +30,17 @@ class TenantGroupListView(ObjectListView):
 class TenantGroupEditView(ObjectEditView):
     queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupForm
-    default_return_url = 'tenancy:tenantgroup_list'
 
 
 class TenantGroupBulkImportView(BulkImportView):
     queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupCSVForm
     table = tables.TenantGroupTable
-    default_return_url = 'tenancy:tenantgroup_list'
 
 
 class TenantGroupBulkDeleteView(BulkDeleteView):
     queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
     table = tables.TenantGroupTable
-    default_return_url = 'tenancy:tenantgroup_list'
 
 
 #
@@ -87,19 +84,16 @@ class TenantEditView(ObjectEditView):
     queryset = Tenant.objects.all()
     model_form = forms.TenantForm
     template_name = 'tenancy/tenant_edit.html'
-    default_return_url = 'tenancy:tenant_list'
 
 
 class TenantDeleteView(ObjectDeleteView):
     queryset = Tenant.objects.all()
-    default_return_url = 'tenancy:tenant_list'
 
 
 class TenantBulkImportView(BulkImportView):
     queryset = Tenant.objects.all()
     model_form = forms.TenantCSVForm
     table = tables.TenantTable
-    default_return_url = 'tenancy:tenant_list'
 
 
 class TenantBulkEditView(BulkEditView):
@@ -107,11 +101,9 @@ class TenantBulkEditView(BulkEditView):
     filterset = filters.TenantFilterSet
     table = tables.TenantTable
     form = forms.TenantBulkEditForm
-    default_return_url = 'tenancy:tenant_list'
 
 
 class TenantBulkDeleteView(BulkDeleteView):
     queryset = Tenant.objects.prefetch_related('group')
     filterset = filters.TenantFilterSet
     table = tables.TenantTable
-    default_return_url = 'tenancy:tenant_list'
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 6596660ce..f06fb622b 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -16,6 +16,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader
 from django.template.exceptions import TemplateDoesNotExist
 from django.urls import reverse
+from django.urls.exceptions import NoReverseMatch
 from django.utils.decorators import method_decorator
 from django.utils.html import escape
 from django.utils.http import is_safe_url
@@ -86,7 +87,7 @@ class ObjectPermissionRequiredMixin(AccessMixin):
         return super().dispatch(request, *args, **kwargs)
 
 
-class GetReturnURLMixin(object):
+class GetReturnURLMixin:
     """
     Provides logic for determining where a user should be redirected after processing a form.
     """
@@ -101,13 +102,21 @@ class GetReturnURLMixin(object):
             return query_param
 
         # Next, check if the object being modified (if any) has an absolute URL.
-        elif obj is not None and obj.pk and hasattr(obj, 'get_absolute_url'):
+        if obj is not None and obj.pk and hasattr(obj, 'get_absolute_url'):
             return obj.get_absolute_url()
 
         # Fall back to the default URL (if specified) for the view.
-        elif self.default_return_url is not None:
+        if self.default_return_url is not None:
             return reverse(self.default_return_url)
 
+        # Attempt to dynamically resolve the list view for the object
+        if hasattr(self, 'queryset'):
+            model_opts = self.queryset.model._meta
+            try:
+                return reverse(f'{model_opts.app_label}:{model_opts.model_name}_list')
+            except NoReverseMatch:
+                pass
+
         # If all else fails, return home. Ideally this should never happen.
         return reverse('home')
 
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index fadd614c3..478fead94 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -29,20 +29,17 @@ class ClusterTypeListView(ObjectListView):
 class ClusterTypeEditView(ObjectEditView):
     queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeForm
-    default_return_url = 'virtualization:clustertype_list'
 
 
 class ClusterTypeBulkImportView(BulkImportView):
     queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeCSVForm
     table = tables.ClusterTypeTable
-    default_return_url = 'virtualization:clustertype_list'
 
 
 class ClusterTypeBulkDeleteView(BulkDeleteView):
     queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterTypeTable
-    default_return_url = 'virtualization:clustertype_list'
 
 
 #
@@ -57,20 +54,17 @@ class ClusterGroupListView(ObjectListView):
 class ClusterGroupEditView(ObjectEditView):
     queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupForm
-    default_return_url = 'virtualization:clustergroup_list'
 
 
 class ClusterGroupBulkImportView(BulkImportView):
     queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupCSVForm
     table = tables.ClusterGroupTable
-    default_return_url = 'virtualization:clustergroup_list'
 
 
 class ClusterGroupBulkDeleteView(BulkDeleteView):
     queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
     table = tables.ClusterGroupTable
-    default_return_url = 'virtualization:clustergroup_list'
 
 
 #
@@ -114,14 +108,12 @@ class ClusterEditView(ObjectEditView):
 
 class ClusterDeleteView(ObjectDeleteView):
     queryset = Cluster.objects.all()
-    default_return_url = 'virtualization:cluster_list'
 
 
 class ClusterBulkImportView(BulkImportView):
     queryset = Cluster.objects.all()
     model_form = forms.ClusterCSVForm
     table = tables.ClusterTable
-    default_return_url = 'virtualization:cluster_list'
 
 
 class ClusterBulkEditView(BulkEditView):
@@ -129,14 +121,12 @@ class ClusterBulkEditView(BulkEditView):
     filterset = filters.ClusterFilterSet
     table = tables.ClusterTable
     form = forms.ClusterBulkEditForm
-    default_return_url = 'virtualization:cluster_list'
 
 
 class ClusterBulkDeleteView(BulkDeleteView):
     queryset = Cluster.objects.prefetch_related('type', 'group', 'site')
     filterset = filters.ClusterFilterSet
     table = tables.ClusterTable
-    default_return_url = 'virtualization:cluster_list'
 
 
 class ClusterAddDevicesView(ObjectEditView):
@@ -266,19 +256,16 @@ class VirtualMachineEditView(ObjectEditView):
     queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineForm
     template_name = 'virtualization/virtualmachine_edit.html'
-    default_return_url = 'virtualization:virtualmachine_list'
 
 
 class VirtualMachineDeleteView(ObjectDeleteView):
     queryset = VirtualMachine.objects.all()
-    default_return_url = 'virtualization:virtualmachine_list'
 
 
 class VirtualMachineBulkImportView(BulkImportView):
     queryset = VirtualMachine.objects.all()
     model_form = forms.VirtualMachineCSVForm
     table = tables.VirtualMachineTable
-    default_return_url = 'virtualization:virtualmachine_list'
 
 
 class VirtualMachineBulkEditView(BulkEditView):
@@ -286,14 +273,12 @@ class VirtualMachineBulkEditView(BulkEditView):
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
     form = forms.VirtualMachineBulkEditForm
-    default_return_url = 'virtualization:virtualmachine_list'
 
 
 class VirtualMachineBulkDeleteView(BulkDeleteView):
     queryset = VirtualMachine.objects.prefetch_related('cluster', 'tenant', 'role')
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
-    default_return_url = 'virtualization:virtualmachine_list'
 
 
 #
@@ -364,7 +349,6 @@ class VMInterfaceBulkImportView(BulkImportView):
     queryset = VMInterface.objects.all()
     model_form = forms.VMInterfaceCSVForm
     table = tables.VMInterfaceTable
-    default_return_url = 'virtualization:vminterface_list'
 
 
 class VMInterfaceBulkEditView(BulkEditView):
@@ -395,4 +379,3 @@ class VirtualMachineBulkAddInterfaceView(BulkComponentCreateView):
     model_form = forms.VMInterfaceForm
     filterset = filters.VirtualMachineFilterSet
     table = tables.VirtualMachineTable
-    default_return_url = 'virtualization:virtualmachine_list'

From 8959d2e0a70d7e5063ceb14121e8d871977f2034 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 12:08:26 -0400
Subject: [PATCH 277/505] #4416: Add individual delete views for organizational
 objects

---
 netbox/circuits/urls.py           |  1 +
 netbox/circuits/views.py          |  4 ++++
 netbox/dcim/urls.py               |  6 ++++++
 netbox/dcim/views.py              | 24 ++++++++++++++++++++++++
 netbox/ipam/urls.py               |  3 +++
 netbox/ipam/views.py              | 12 ++++++++++++
 netbox/secrets/urls.py            |  1 +
 netbox/secrets/views.py           |  4 ++++
 netbox/tenancy/urls.py            |  1 +
 netbox/tenancy/views.py           |  4 ++++
 netbox/utilities/testing/views.py |  1 +
 netbox/virtualization/urls.py     |  2 ++
 netbox/virtualization/views.py    |  8 ++++++++
 13 files changed, 71 insertions(+)

diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py
index 1c0f0715b..86ea55fa8 100644
--- a/netbox/circuits/urls.py
+++ b/netbox/circuits/urls.py
@@ -25,6 +25,7 @@ urlpatterns = [
     path('circuit-types/import/', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'),
     path('circuit-types/delete/', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'),
     path('circuit-types/<slug:slug>/edit/', views.CircuitTypeEditView.as_view(), name='circuittype_edit'),
+    path('circuit-types/<slug:slug>/delete/', views.CircuitTypeDeleteView.as_view(), name='circuittype_delete'),
     path('circuit-types/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='circuittype_changelog', kwargs={'model': CircuitType}),
 
     # Circuits
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 83b6fcd81..e2dc80816 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -99,6 +99,10 @@ class CircuitTypeEditView(ObjectEditView):
     model_form = forms.CircuitTypeForm
 
 
+class CircuitTypeDeleteView(ObjectDeleteView):
+    queryset = CircuitType.objects.all()
+
+
 class CircuitTypeBulkImportView(BulkImportView):
     queryset = CircuitType.objects.all()
     model_form = forms.CircuitTypeCSVForm
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 087f9db62..4d5964ee1 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -18,6 +18,7 @@ urlpatterns = [
     path('regions/import/', views.RegionBulkImportView.as_view(), name='region_import'),
     path('regions/delete/', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'),
     path('regions/<int:pk>/edit/', views.RegionEditView.as_view(), name='region_edit'),
+    path('regions/<int:pk>/delete/', views.RegionDeleteView.as_view(), name='region_delete'),
     path('regions/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='region_changelog', kwargs={'model': Region}),
 
     # Sites
@@ -38,6 +39,7 @@ urlpatterns = [
     path('rack-groups/import/', views.RackGroupBulkImportView.as_view(), name='rackgroup_import'),
     path('rack-groups/delete/', views.RackGroupBulkDeleteView.as_view(), name='rackgroup_bulk_delete'),
     path('rack-groups/<int:pk>/edit/', views.RackGroupEditView.as_view(), name='rackgroup_edit'),
+    path('rack-groups/<int:pk>/delete/', views.RackGroupDeleteView.as_view(), name='rackgroup_delete'),
     path('rack-groups/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='rackgroup_changelog', kwargs={'model': RackGroup}),
 
     # Rack roles
@@ -46,6 +48,7 @@ urlpatterns = [
     path('rack-roles/import/', views.RackRoleBulkImportView.as_view(), name='rackrole_import'),
     path('rack-roles/delete/', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'),
     path('rack-roles/<int:pk>/edit/', views.RackRoleEditView.as_view(), name='rackrole_edit'),
+    path('rack-roles/<int:pk>/delete/', views.RackRoleDeleteView.as_view(), name='rackrole_delete'),
     path('rack-roles/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='rackrole_changelog', kwargs={'model': RackRole}),
 
     # Rack reservations
@@ -78,6 +81,7 @@ urlpatterns = [
     path('manufacturers/import/', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'),
     path('manufacturers/delete/', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'),
     path('manufacturers/<slug:slug>/edit/', views.ManufacturerEditView.as_view(), name='manufacturer_edit'),
+    path('manufacturers/<slug:slug>/delete/', views.ManufacturerDeleteView.as_view(), name='manufacturer_delete'),
     path('manufacturers/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='manufacturer_changelog', kwargs={'model': Manufacturer}),
 
     # Device types
@@ -153,6 +157,7 @@ urlpatterns = [
     path('device-roles/import/', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'),
     path('device-roles/delete/', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'),
     path('device-roles/<slug:slug>/edit/', views.DeviceRoleEditView.as_view(), name='devicerole_edit'),
+    path('device-roles/<slug:slug>/delete/', views.DeviceRoleDeleteView.as_view(), name='devicerole_delete'),
     path('device-roles/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='devicerole_changelog', kwargs={'model': DeviceRole}),
 
     # Platforms
@@ -161,6 +166,7 @@ urlpatterns = [
     path('platforms/import/', views.PlatformBulkImportView.as_view(), name='platform_import'),
     path('platforms/delete/', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'),
     path('platforms/<slug:slug>/edit/', views.PlatformEditView.as_view(), name='platform_edit'),
+    path('platforms/<slug:slug>/delete/', views.PlatformDeleteView.as_view(), name='platform_delete'),
     path('platforms/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='platform_changelog', kwargs={'model': Platform}),
 
     # Devices
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 3edc9b061..3eebbabae 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -122,6 +122,10 @@ class RegionEditView(ObjectEditView):
     model_form = forms.RegionForm
 
 
+class RegionDeleteView(ObjectDeleteView):
+    queryset = Region.objects.all()
+
+
 class RegionBulkImportView(BulkImportView):
     queryset = Region.objects.all()
     model_form = forms.RegionCSVForm
@@ -223,6 +227,10 @@ class RackGroupEditView(ObjectEditView):
     model_form = forms.RackGroupForm
 
 
+class RackGroupDeleteView(ObjectDeleteView):
+    queryset = RackGroup.objects.all()
+
+
 class RackGroupBulkImportView(BulkImportView):
     queryset = RackGroup.objects.all()
     model_form = forms.RackGroupCSVForm
@@ -249,6 +257,10 @@ class RackRoleEditView(ObjectEditView):
     model_form = forms.RackRoleForm
 
 
+class RackRoleDeleteView(ObjectDeleteView):
+    queryset = RackRole.objects.all()
+
+
 class RackRoleBulkImportView(BulkImportView):
     queryset = RackRole.objects.all()
     model_form = forms.RackRoleCSVForm
@@ -462,6 +474,10 @@ class ManufacturerEditView(ObjectEditView):
     model_form = forms.ManufacturerForm
 
 
+class ManufacturerDeleteView(ObjectDeleteView):
+    queryset = Manufacturer.objects.all()
+
+
 class ManufacturerBulkImportView(BulkImportView):
     queryset = Manufacturer.objects.all()
     model_form = forms.ManufacturerCSVForm
@@ -860,6 +876,10 @@ class DeviceRoleEditView(ObjectEditView):
     model_form = forms.DeviceRoleForm
 
 
+class DeviceRoleDeleteView(ObjectDeleteView):
+    queryset = DeviceRole.objects.all()
+
+
 class DeviceRoleBulkImportView(BulkImportView):
     queryset = DeviceRole.objects.all()
     model_form = forms.DeviceRoleCSVForm
@@ -885,6 +905,10 @@ class PlatformEditView(ObjectEditView):
     model_form = forms.PlatformForm
 
 
+class PlatformDeleteView(ObjectDeleteView):
+    queryset = Platform.objects.all()
+
+
 class PlatformBulkImportView(BulkImportView):
     queryset = Platform.objects.all()
     model_form = forms.PlatformCSVForm
diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py
index de8fc86eb..b2080c0a8 100644
--- a/netbox/ipam/urls.py
+++ b/netbox/ipam/urls.py
@@ -24,6 +24,7 @@ urlpatterns = [
     path('rirs/import/', views.RIRBulkImportView.as_view(), name='rir_import'),
     path('rirs/delete/', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'),
     path('rirs/<slug:slug>/edit/', views.RIREditView.as_view(), name='rir_edit'),
+    path('rirs/<slug:slug>/delete/', views.RIRDeleteView.as_view(), name='rir_delete'),
     path('vrfs/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='rir_changelog', kwargs={'model': RIR}),
 
     # Aggregates
@@ -43,6 +44,7 @@ urlpatterns = [
     path('roles/import/', views.RoleBulkImportView.as_view(), name='role_import'),
     path('roles/delete/', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'),
     path('roles/<slug:slug>/edit/', views.RoleEditView.as_view(), name='role_edit'),
+    path('roles/<slug:slug>/delete/', views.RoleDeleteView.as_view(), name='role_delete'),
     path('roles/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='role_changelog', kwargs={'model': Role}),
 
     # Prefixes
@@ -77,6 +79,7 @@ urlpatterns = [
     path('vlan-groups/import/', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'),
     path('vlan-groups/delete/', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'),
     path('vlan-groups/<int:pk>/edit/', views.VLANGroupEditView.as_view(), name='vlangroup_edit'),
+    path('vlan-groups/<int:pk>/delete/', views.VLANGroupDeleteView.as_view(), name='vlangroup_delete'),
     path('vlan-groups/<int:pk>/vlans/', views.VLANGroupVLANsView.as_view(), name='vlangroup_vlans'),
     path('vlan-groups/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='vlangroup_changelog', kwargs={'model': VLANGroup}),
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 81e210958..5c0df3a16 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -160,6 +160,10 @@ class RIREditView(ObjectEditView):
     model_form = forms.RIRForm
 
 
+class RIRDeleteView(ObjectDeleteView):
+    queryset = RIR.objects.all()
+
+
 class RIRBulkImportView(BulkImportView):
     queryset = RIR.objects.all()
     model_form = forms.RIRCSVForm
@@ -290,6 +294,10 @@ class RoleEditView(ObjectEditView):
     model_form = forms.RoleForm
 
 
+class RoleDeleteView(ObjectDeleteView):
+    queryset = Role.objects.all()
+
+
 class RoleBulkImportView(BulkImportView):
     queryset = Role.objects.all()
     model_form = forms.RoleCSVForm
@@ -653,6 +661,10 @@ class VLANGroupEditView(ObjectEditView):
     model_form = forms.VLANGroupForm
 
 
+class VLANGroupDeleteView(ObjectDeleteView):
+    queryset = VLANGroup.objects.all()
+
+
 class VLANGroupBulkImportView(BulkImportView):
     queryset = VLANGroup.objects.all()
     model_form = forms.VLANGroupCSVForm
diff --git a/netbox/secrets/urls.py b/netbox/secrets/urls.py
index 84c2da398..9dbb5d044 100644
--- a/netbox/secrets/urls.py
+++ b/netbox/secrets/urls.py
@@ -13,6 +13,7 @@ urlpatterns = [
     path('secret-roles/import/', views.SecretRoleBulkImportView.as_view(), name='secretrole_import'),
     path('secret-roles/delete/', views.SecretRoleBulkDeleteView.as_view(), name='secretrole_bulk_delete'),
     path('secret-roles/<slug:slug>/edit/', views.SecretRoleEditView.as_view(), name='secretrole_edit'),
+    path('secret-roles/<slug:slug>/delete/', views.SecretRoleDeleteView.as_view(), name='secretrole_delete'),
     path('secret-roles/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='secretrole_changelog', kwargs={'model': SecretRole}),
 
     # Secrets
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index fec7c65d1..e9ea1835f 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -38,6 +38,10 @@ class SecretRoleEditView(ObjectEditView):
     model_form = forms.SecretRoleForm
 
 
+class SecretRoleDeleteView(ObjectDeleteView):
+    queryset = SecretRole.objects.all()
+
+
 class SecretRoleBulkImportView(BulkImportView):
     queryset = SecretRole.objects.all()
     model_form = forms.SecretRoleCSVForm
diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py
index 4c65ce4e8..372308bb8 100644
--- a/netbox/tenancy/urls.py
+++ b/netbox/tenancy/urls.py
@@ -13,6 +13,7 @@ urlpatterns = [
     path('tenant-groups/import/', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'),
     path('tenant-groups/delete/', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'),
     path('tenant-groups/<slug:slug>/edit/', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'),
+    path('tenant-groups/<slug:slug>/delete/', views.TenantGroupDeleteView.as_view(), name='tenantgroup_delete'),
     path('tenant-groups/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}),
 
     # Tenants
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 26b1ce027..9ef44206c 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -32,6 +32,10 @@ class TenantGroupEditView(ObjectEditView):
     model_form = forms.TenantGroupForm
 
 
+class TenantGroupDeleteView(ObjectDeleteView):
+    queryset = TenantGroup.objects.all()
+
+
 class TenantGroupBulkImportView(BulkImportView):
     queryset = TenantGroup.objects.all()
     model_form = forms.TenantGroupCSVForm
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 12c811396..b4ca52246 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -905,6 +905,7 @@ class ViewTestCases:
         GetObjectChangelogViewTestCase,
         CreateObjectViewTestCase,
         EditObjectViewTestCase,
+        DeleteObjectViewTestCase,
         ListObjectsViewTestCase,
         BulkImportObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py
index 34172ee88..3d6f07566 100644
--- a/netbox/virtualization/urls.py
+++ b/netbox/virtualization/urls.py
@@ -14,6 +14,7 @@ urlpatterns = [
     path('cluster-types/import/', views.ClusterTypeBulkImportView.as_view(), name='clustertype_import'),
     path('cluster-types/delete/', views.ClusterTypeBulkDeleteView.as_view(), name='clustertype_bulk_delete'),
     path('cluster-types/<slug:slug>/edit/', views.ClusterTypeEditView.as_view(), name='clustertype_edit'),
+    path('cluster-types/<slug:slug>/delete/', views.ClusterTypeDeleteView.as_view(), name='clustertype_delete'),
     path('cluster-types/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='clustertype_changelog', kwargs={'model': ClusterType}),
 
     # Cluster groups
@@ -22,6 +23,7 @@ urlpatterns = [
     path('cluster-groups/import/', views.ClusterGroupBulkImportView.as_view(), name='clustergroup_import'),
     path('cluster-groups/delete/', views.ClusterGroupBulkDeleteView.as_view(), name='clustergroup_bulk_delete'),
     path('cluster-groups/<slug:slug>/edit/', views.ClusterGroupEditView.as_view(), name='clustergroup_edit'),
+    path('cluster-groups/<slug:slug>/delete/', views.ClusterGroupDeleteView.as_view(), name='clustergroup_delete'),
     path('cluster-groups/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='clustergroup_changelog', kwargs={'model': ClusterGroup}),
 
     # Clusters
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 478fead94..176c89f2e 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -31,6 +31,10 @@ class ClusterTypeEditView(ObjectEditView):
     model_form = forms.ClusterTypeForm
 
 
+class ClusterTypeDeleteView(ObjectDeleteView):
+    queryset = ClusterType.objects.all()
+
+
 class ClusterTypeBulkImportView(BulkImportView):
     queryset = ClusterType.objects.all()
     model_form = forms.ClusterTypeCSVForm
@@ -56,6 +60,10 @@ class ClusterGroupEditView(ObjectEditView):
     model_form = forms.ClusterGroupForm
 
 
+class ClusterGroupDeleteView(ObjectDeleteView):
+    queryset = ClusterGroup.objects.all()
+
+
 class ClusterGroupBulkImportView(BulkImportView):
     queryset = ClusterGroup.objects.all()
     model_form = forms.ClusterGroupCSVForm

From c484fa99e24313ab258e963f0066d17a5e9e79df Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 13:47:01 -0400
Subject: [PATCH 278/505] Introduce ButtonsColumn to reduce boilerplate and
 standardize organizational object links

---
 netbox/circuits/tables.py       |  18 +----
 netbox/dcim/tables.py           | 112 ++++----------------------------
 netbox/extras/tables.py         |  20 +-----
 netbox/ipam/tables.py           |  47 ++------------
 netbox/secrets/tables.py        |  17 +----
 netbox/tenancy/tables.py        |  17 +----
 netbox/utilities/tables.py      |  43 ++++++++++++
 netbox/virtualization/tables.py |  32 +--------
 8 files changed, 75 insertions(+), 231 deletions(-)

diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
index ea17031a1..ce3368f31 100644
--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -2,19 +2,9 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, TagColumn, ToggleColumn
 from .models import Circuit, CircuitType, Provider
 
-CIRCUITTYPE_ACTIONS = """
-<a href="{% url 'circuits:circuittype_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.circuit.change_circuittype %}
-    <a href="{% url 'circuits:circuittype_edit' slug=record.slug %}?return_url={{ request.path }}"
-      class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 STATUS_LABEL = """
 <span class="label label-{{ record.get_status_class }}">{{ record.get_status_display }}</span>
 """
@@ -53,11 +43,7 @@ class CircuitTypeTable(BaseTable):
     circuit_count = tables.Column(
         verbose_name='Circuits'
     )
-    actions = tables.TemplateColumn(
-        template_code=CIRCUITTYPE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(CircuitType, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = CircuitType
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index dd6b96406..871679fc7 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -2,7 +2,9 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ColoredLabelColumn, TagColumn, ToggleColumn
+from utilities.tables import (
+    BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ColoredLabelColumn, TagColumn, ToggleColumn,
+)
 from .models import (
     Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay,
     DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate,
@@ -40,69 +42,16 @@ DEVICE_LINK = """
 </a>
 """
 
-REGION_ACTIONS = """
-<a href="{% url 'dcim:region_changelog' pk=record.pk %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_region %}
-    <a href="{% url 'dcim:region_edit' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
-RACKGROUP_ACTIONS = """
-<a href="{% url 'dcim:rackgroup_changelog' pk=record.pk %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
+RACKGROUP_ELEVATIONS = """
 <a href="{% url 'dcim:rack_elevation_list' %}?site={{ record.site.slug }}&group_id={{ record.pk }}" class="btn btn-xs btn-primary" title="View elevations">
     <i class="fa fa-eye"></i>
 </a>
-{% if perms.dcim.change_rackgroup %}
-    <a href="{% url 'dcim:rackgroup_edit' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-xs btn-warning" title="Edit">
-        <i class="glyphicon glyphicon-pencil"></i>
-    </a>
-{% endif %}
-"""
-
-RACKROLE_ACTIONS = """
-<a href="{% url 'dcim:rackrole_changelog' pk=record.pk %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_rackrole %}
-    <a href="{% url 'dcim:rackrole_edit' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
 """
 
 RACK_DEVICE_COUNT = """
 <a href="{% url 'dcim:device_list' %}?rack_id={{ record.pk }}">{{ value }}</a>
 """
 
-RACKRESERVATION_ACTIONS = """
-<a href="{% url 'dcim:rackreservation_changelog' pk=record.pk %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_rackreservation %}
-    <a href="{% url 'dcim:rackreservation_edit' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
-MANUFACTURER_ACTIONS = """
-<a href="{% url 'dcim:manufacturer_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_manufacturer %}
-    <a href="{% url 'dcim:manufacturer_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
-DEVICEROLE_ACTIONS = """
-<a href="{% url 'dcim:devicerole_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_devicerole %}
-    <a href="{% url 'dcim:devicerole_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 DEVICEROLE_DEVICE_COUNT = """
 <a href="{% url 'dcim:device_list' %}?role={{ record.slug }}">{{ value }}</a>
 """
@@ -119,15 +68,6 @@ PLATFORM_VM_COUNT = """
 <a href="{% url 'virtualization:virtualmachine_list' %}?platform={{ record.slug }}">{{ value }}</a>
 """
 
-PLATFORM_ACTIONS = """
-<a href="{% url 'dcim:platform_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.dcim.change_platform %}
-    <a href="{% url 'dcim:platform_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 STATUS_LABEL = """
 <span class="label label-{{ record.get_status_class }}">{{ record.get_status_display }}</span>
 """
@@ -198,11 +138,7 @@ class RegionTable(BaseTable):
     site_count = tables.Column(
         verbose_name='Sites'
     )
-    actions = tables.TemplateColumn(
-        template_code=REGION_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(Region)
 
     class Meta(BaseTable.Meta):
         model = Region
@@ -260,10 +196,9 @@ class RackGroupTable(BaseTable):
     rack_count = tables.Column(
         verbose_name='Racks'
     )
-    actions = tables.TemplateColumn(
-        template_code=RACKGROUP_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=RackGroup,
+        prepend_template=RACKGROUP_ELEVATIONS
     )
 
     class Meta(BaseTable.Meta):
@@ -280,11 +215,7 @@ class RackRoleTable(BaseTable):
     pk = ToggleColumn()
     rack_count = tables.Column(verbose_name='Racks')
     color = tables.TemplateColumn(COLOR_LABEL)
-    actions = tables.TemplateColumn(
-        template_code=RACKROLE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(RackRole)
 
     class Meta(BaseTable.Meta):
         model = RackRole
@@ -386,11 +317,7 @@ class RackReservationTable(BaseTable):
     tags = TagColumn(
         url_name='dcim:rackreservation_list'
     )
-    actions = tables.TemplateColumn(
-        template_code=RACKRESERVATION_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(RackReservation)
 
     class Meta(BaseTable.Meta):
         model = RackReservation
@@ -420,11 +347,7 @@ class ManufacturerTable(BaseTable):
         verbose_name='Platforms'
     )
     slug = tables.Column()
-    actions = tables.TemplateColumn(
-        template_code=MANUFACTURER_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(Manufacturer, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = Manufacturer
@@ -609,11 +532,8 @@ class DeviceRoleTable(BaseTable):
         template_code=COLOR_LABEL,
         verbose_name='Label'
     )
-    actions = tables.TemplateColumn(
-        template_code=DEVICEROLE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    vm_role = BooleanColumn()
+    actions = ButtonsColumn(DeviceRole, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = DeviceRole
@@ -639,11 +559,7 @@ class PlatformTable(BaseTable):
         orderable=False,
         verbose_name='VMs'
     )
-    actions = tables.TemplateColumn(
-        template_code=PLATFORM_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(Platform, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = Platform
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 7a78d4b19..79a529059 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -1,21 +1,9 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange, Tag, TaggedItem
 
-TAG_ACTIONS = """
-<a href="{% url 'extras:tag_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.taggit.change_tag %}
-    <a href="{% url 'extras:tag_edit' slug=record.slug %}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-{% if perms.taggit.delete_tag %}
-    <a href="{% url 'extras:tag_delete' slug=record.slug %}" class="btn btn-xs btn-danger"><i class="glyphicon glyphicon-trash" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 TAGGED_ITEM = """
 {% if value.get_absolute_url %}
     <a href="{{ value.get_absolute_url }}">{{ value }}</a>
@@ -68,12 +56,8 @@ class TagTable(BaseTable):
         viewname='extras:tag',
         args=[Accessor('slug')]
     )
-    actions = tables.TemplateColumn(
-        template_code=TAG_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
     color = ColorColumn()
+    actions = ButtonsColumn(Tag, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = Tag
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index f1855327b..72ac3eb45 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -3,7 +3,7 @@ from django_tables2.utils import Accessor
 
 from dcim.models import Interface
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, BooleanColumn, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, TagColumn, ToggleColumn
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
 
 RIR_UTILIZATION = """
@@ -25,15 +25,6 @@ RIR_UTILIZATION = """
 </div>
 """
 
-RIR_ACTIONS = """
-<a href="{% url 'ipam:rir_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.ipam.change_rir %}
-    <a href="{% url 'ipam:rir_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 UTILIZATION_GRAPH = """
 {% load helpers %}
 {% if record.pk %}{% utilization_graph record.get_utilization %}{% else %}&mdash;{% endif %}
@@ -47,15 +38,6 @@ ROLE_VLAN_COUNT = """
 <a href="{% url 'ipam:vlan_list' %}?role={{ record.slug }}">{{ value }}</a>
 """
 
-ROLE_ACTIONS = """
-<a href="{% url 'ipam:role_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.ipam.change_role %}
-    <a href="{% url 'ipam:role_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 PREFIX_LINK = """
 {% if record.has_children %}
     <span class="text-nowrap" style="padding-left: {{ record.depth }}0px "><i class="fa fa-caret-right"></i></a>
@@ -136,10 +118,7 @@ VLAN_ROLE_LINK = """
 {% endif %}
 """
 
-VLANGROUP_ACTIONS = """
-<a href="{% url 'ipam:vlangroup_changelog' pk=record.pk %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
+VLANGROUP_ADD_VLAN = """
 {% with next_vid=record.get_next_available_vid %}
     {% if next_vid and perms.ipam.add_vlan %}
         <a href="{% url 'ipam:vlan_add' %}?site={{ record.site_id }}&group={{ record.pk }}&vid={{ next_vid }}" title="Add VLAN" class="btn btn-xs btn-success">
@@ -147,9 +126,6 @@ VLANGROUP_ACTIONS = """
         </a>
     {% endif %}
 {% endwith %}
-{% if perms.ipam.change_vlangroup %}
-    <a href="{% url 'ipam:vlangroup_edit' pk=record.pk %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
 """
 
 VLAN_MEMBER_UNTAGGED = """
@@ -214,11 +190,7 @@ class RIRTable(BaseTable):
     aggregate_count = tables.Column(
         verbose_name='Aggregates'
     )
-    actions = tables.TemplateColumn(
-        template_code=RIR_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(RIR, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = RIR
@@ -322,11 +294,7 @@ class RoleTable(BaseTable):
         orderable=False,
         verbose_name='VLANs'
     )
-    actions = tables.TemplateColumn(
-        template_code=ROLE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(Role, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = Role
@@ -516,10 +484,9 @@ class VLANGroupTable(BaseTable):
     vlan_count = tables.Column(
         verbose_name='VLANs'
     )
-    actions = tables.TemplateColumn(
-        template_code=VLANGROUP_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=VLANGroup,
+        prepend_template=VLANGROUP_ADD_VLAN
     )
 
     class Meta(BaseTable.Meta):
diff --git a/netbox/secrets/tables.py b/netbox/secrets/tables.py
index f92c9216b..f773a278f 100644
--- a/netbox/secrets/tables.py
+++ b/netbox/secrets/tables.py
@@ -1,17 +1,8 @@
 import django_tables2 as tables
 
-from utilities.tables import BaseTable, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, TagColumn, ToggleColumn
 from .models import SecretRole, Secret
 
-SECRETROLE_ACTIONS = """
-<a href="{% url 'secrets:secretrole_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.secrets.change_secretrole %}
-    <a href="{% url 'secrets:secretrole_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 
 #
 # Secret roles
@@ -23,11 +14,7 @@ class SecretRoleTable(BaseTable):
     secret_count = tables.Column(
         verbose_name='Secrets'
     )
-    actions = tables.TemplateColumn(
-        template_code=SECRETROLE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(SecretRole, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = SecretRole
diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py
index 147a20707..dc96b839c 100644
--- a/netbox/tenancy/tables.py
+++ b/netbox/tenancy/tables.py
@@ -1,6 +1,6 @@
 import django_tables2 as tables
 
-from utilities.tables import BaseTable, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, TagColumn, ToggleColumn
 from .models import Tenant, TenantGroup
 
 MPTT_LINK = """
@@ -13,15 +13,6 @@ MPTT_LINK = """
 </span>
 """
 
-TENANTGROUP_ACTIONS = """
-<a href="{% url 'tenancy:tenantgroup_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.tenancy.change_tenantgroup %}
-    <a href="{% url 'tenancy:tenantgroup_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 COL_TENANT = """
 {% if record.tenant %}
     <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" title="{{ record.tenant.description }}">{{ record.tenant }}</a>
@@ -44,11 +35,7 @@ class TenantGroupTable(BaseTable):
     tenant_count = tables.Column(
         verbose_name='Tenants'
     )
-    actions = tables.TemplateColumn(
-        template_code=TENANTGROUP_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(TenantGroup, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = TenantGroup
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 5e277e633..ec3d5dff5 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -123,6 +123,49 @@ class BooleanColumn(tables.Column):
         return mark_safe(rendered)
 
 
+class ButtonsColumn(tables.TemplateColumn):
+    """
+    Render edit, delete, and changelog buttons for an object.
+
+    :param model: Model class to use for calculating URL view names
+    :param prepend_content: Additional template content to render in the column (optional)
+    """
+    attrs = {'td': {'class': 'text-right text-nowrap noprint'}}
+    # Note that braces are escaped to allow for string formatting prior to template rendering
+    template_code = """
+    <a href="{{% url '{app_label}:{model_name}_changelog' {pk_field}=record.{pk_field} %}}" class="btn btn-default btn-xs" title="Change log">
+        <i class="fa fa-history"></i>
+    </a>
+    {{% if perms.{app_label}.change_{model_name} %}}
+        <a href="{{% url '{app_label}:{model_name}_edit' {pk_field}=record.{pk_field} %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-warning" title="Edit">
+            <i class="fa fa-pencil"></i>
+        </a>
+    {{% endif %}}
+    {{% if perms.{app_label}.delete_{model_name} %}}
+        <a href="{{% url '{app_label}:{model_name}_delete' {pk_field}=record.{pk_field} %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-danger" title="Delete">
+            <i class="fa fa-trash"></i>
+        </a>
+    {{% endif %}}
+    """
+
+    def __init__(self, model, *args, pk_field='pk', prepend_template=None, **kwargs):
+        if prepend_template:
+            prepend_template = prepend_template.replace('{', '{{')
+            prepend_template = prepend_template.replace('}', '}}')
+            self.template_code = prepend_template + self.template_code
+
+        template_code = self.template_code.format(
+            app_label=model._meta.app_label,
+            model_name=model._meta.model_name,
+            pk_field=pk_field
+        )
+
+        super().__init__(template_code=template_code, *args, **kwargs)
+
+    def header(self):
+        return ''
+
+
 class ColorColumn(tables.Column):
     """
     Display a color (#RRGGBB).
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index de319361c..d53572583 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -2,27 +2,9 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, ColoredLabelColumn, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
-CLUSTERTYPE_ACTIONS = """
-<a href="{% url 'virtualization:clustertype_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.virtualization.change_clustertype %}
-    <a href="{% url 'virtualization:clustertype_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
-CLUSTERGROUP_ACTIONS = """
-<a href="{% url 'virtualization:clustergroup_changelog' slug=record.slug %}" class="btn btn-default btn-xs" title="Change log">
-    <i class="fa fa-history"></i>
-</a>
-{% if perms.virtualization.change_clustergroup %}
-    <a href="{% url 'virtualization:clustergroup_edit' slug=record.slug %}?return_url={{ request.path }}" class="btn btn-xs btn-warning"><i class="glyphicon glyphicon-pencil" aria-hidden="true"></i></a>
-{% endif %}
-"""
-
 VIRTUALMACHINE_STATUS = """
 <span class="label label-{{ record.get_status_class }}">{{ record.get_status_display }}</span>
 """
@@ -44,11 +26,7 @@ class ClusterTypeTable(BaseTable):
     cluster_count = tables.Column(
         verbose_name='Clusters'
     )
-    actions = tables.TemplateColumn(
-        template_code=CLUSTERTYPE_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(ClusterType, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = ClusterType
@@ -66,11 +44,7 @@ class ClusterGroupTable(BaseTable):
     cluster_count = tables.Column(
         verbose_name='Clusters'
     )
-    actions = tables.TemplateColumn(
-        template_code=CLUSTERGROUP_ACTIONS,
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
-    )
+    actions = ButtonsColumn(ClusterGroup, pk_field='slug')
 
     class Meta(BaseTable.Meta):
         model = ClusterGroup

From 57b73c485fa213b8437db7340131822fca4eed26 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 14:21:51 -0400
Subject: [PATCH 279/505] #4416: Remove individual view for extras.Tag

---
 netbox/extras/models/tags.py      |  3 ---
 netbox/extras/tables.py           |  4 ----
 netbox/extras/tests/test_views.py |  2 +-
 netbox/extras/urls.py             |  1 -
 netbox/extras/views.py            | 27 ---------------------------
 5 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index 9bb90f21e..39ac86073 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -26,9 +26,6 @@ class Tag(TagBase, ChangeLoggedModel):
 
     csv_headers = ['name', 'slug', 'color', 'description']
 
-    def get_absolute_url(self):
-        return reverse('extras:tag', args=[self.slug])
-
     def slugify(self, tag, i=None):
         # Allow Unicode in Tag slugs (avoids empty slugs for Tags with all-Unicode names)
         slug = slugify(tag, allow_unicode=True)
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 79a529059..9d49988e7 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -52,10 +52,6 @@ OBJECTCHANGE_REQUEST_ID = """
 
 class TagTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn(
-        viewname='extras:tag',
-        args=[Accessor('slug')]
-    )
     color = ColorColumn()
     actions = ButtonsColumn(Tag, pk_field='slug')
 
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index b3abf5b22..f14f02e43 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -10,7 +10,7 @@ from extras.models import ConfigContext, ObjectChange, Tag
 from utilities.testing import ViewTestCases, TestCase
 
 
-class TagTestCase(ViewTestCases.PrimaryObjectViewTestCase):
+class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
     model = Tag
 
     @classmethod
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index 3007e6524..95c0ae8d9 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -13,7 +13,6 @@ urlpatterns = [
     path('tags/import/', views.TagBulkImportView.as_view(), name='tag_import'),
     path('tags/edit/', views.TagBulkEditView.as_view(), name='tag_bulk_edit'),
     path('tags/delete/', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'),
-    path('tags/<str:slug>/', views.TagView.as_view(), name='tag'),
     path('tags/<str:slug>/edit/', views.TagEditView.as_view(), name='tag_edit'),
     path('tags/<str:slug>/delete/', views.TagDeleteView.as_view(), name='tag_delete'),
     path('tags/<str:slug>/changelog/', views.ObjectChangeLogView.as_view(), name='tag_changelog', kwargs={'model': Tag}),
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 879ca89d0..921b05792 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -40,33 +40,6 @@ class TagListView(ObjectListView):
     table = tables.TagTable
 
 
-class TagView(ObjectView):
-    queryset = Tag.objects.all()
-
-    def get(self, request, slug):
-
-        tag = get_object_or_404(self.queryset, slug=slug)
-        tagged_items = TaggedItem.objects.filter(
-            tag=tag
-        ).prefetch_related(
-            'content_type', 'content_object'
-        )
-
-        # Generate a table of all items tagged with this Tag
-        items_table = tables.TaggedItemTable(tagged_items)
-        paginate = {
-            'paginator_class': EnhancedPaginator,
-            'per_page': request.GET.get('per_page', settings.PAGINATE_COUNT)
-        }
-        RequestConfig(request, paginate).configure(items_table)
-
-        return render(request, 'extras/tag.html', {
-            'tag': tag,
-            'items_count': tagged_items.count(),
-            'items_table': items_table,
-        })
-
-
 class TagEditView(ObjectEditView):
     queryset = Tag.objects.all()
     model_form = forms.TagForm

From 225b6c695839984a8246c574b42b3094f4347002 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 14:23:21 -0400
Subject: [PATCH 280/505] Fix collection of assigned IPs when editing a device

---
 netbox/dcim/forms.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index df2625e67..2b65940a5 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1843,20 +1843,22 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                 interface_ids = self.instance.vc_interfaces.values_list('pk', flat=True)
 
                 # Collect interface IPs
-                interface_ips = IPAddress.objects.prefetch_related('interface').filter(
+                interface_ips = IPAddress.objects.filter(
                     address__family=family,
-                    interface__in=interface_ids
-                )
+                    assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    assigned_object_id__in=interface_ids
+                ).prefetch_related('assigned_object')
                 if interface_ips:
-                    ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips]
+                    ip_list = [(ip.id, f'{ip.address} ({ip.assigned_object})') for ip in interface_ips]
                     ip_choices.append(('Interface IPs', ip_list))
                 # Collect NAT IPs
                 nat_ips = IPAddress.objects.prefetch_related('nat_inside').filter(
                     address__family=family,
-                    nat_inside__interface__in=interface_ids
-                )
+                    nat_inside__assigned_object_type=ContentType.objects.get_for_model(Interface),
+                    nat_inside__assigned_object_id__in=interface_ids
+                ).prefetch_related('assigned_object')
                 if nat_ips:
-                    ip_list = [(ip.id, '{} ({})'.format(ip.address, ip.nat_inside.address)) for ip in nat_ips]
+                    ip_list = [(ip.id, f'{ip.address} ({ip.assigned_object})') for ip in nat_ips]
                     ip_choices.append(('NAT IPs', ip_list))
                 self.fields['primary_ip{}'.format(family)].choices = ip_choices
 

From 7e3e18faeabf419fe97c540e28103e4ceae503d4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 14:46:12 -0400
Subject: [PATCH 281/505] #4416: Add individual & changelog views for
 InventoryItem

---
 netbox/dcim/models/device_components.py      |  2 +-
 netbox/dcim/tables.py                        | 37 +++-----
 netbox/dcim/tests/test_views.py              | 11 +--
 netbox/dcim/urls.py                          |  6 +-
 netbox/dcim/views.py                         | 98 ++++++++++----------
 netbox/templates/dcim/inc/inventoryitem.html |  4 +-
 netbox/templates/dcim/inventoryitem.html     | 73 +++++++++++++++
 netbox/templates/inc/nav_menu.html           | 18 ++--
 8 files changed, 155 insertions(+), 94 deletions(-)
 create mode 100644 netbox/templates/dcim/inventoryitem.html

diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index d94e2484f..eaac1df7a 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1120,7 +1120,7 @@ class InventoryItem(ComponentModel):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('dcim:device_inventory', kwargs={'pk': self.device.pk})
+        return reverse('dcim:inventoryitem', kwargs={'pk': self.pk})
 
     def to_csv(self):
         return (
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 871679fc7..f258df221 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -775,6 +775,20 @@ class DeviceBayTable(DeviceComponentTable):
         default_columns = ('pk', 'device', 'name', 'label', 'installed_device', 'description')
 
 
+class InventoryItemTable(DeviceComponentTable):
+    manufacturer = tables.Column(
+        linkify=True
+    )
+    discovered = BooleanColumn()
+
+    class Meta(DeviceComponentTable.Meta):
+        model = InventoryItem
+        fields = (
+            'pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'discovered'
+        )
+        default_columns = ('pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag')
+
+
 #
 # Cables
 #
@@ -917,29 +931,6 @@ class InterfaceConnectionTable(BaseTable):
         )
 
 
-#
-# InventoryItems
-#
-
-class InventoryItemTable(BaseTable):
-    pk = ToggleColumn()
-    device = tables.LinkColumn(
-        viewname='dcim:device_inventory',
-        args=[Accessor('device.pk')]
-    )
-    manufacturer = tables.Column(
-        accessor=Accessor('manufacturer')
-    )
-    discovered = BooleanColumn()
-
-    class Meta(BaseTable.Meta):
-        model = InventoryItem
-        fields = (
-            'pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'discovered'
-        )
-        default_columns = ('pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag')
-
-
 #
 # Virtual chassis
 #
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index b3994ea8c..799d186b2 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -1419,16 +1419,7 @@ class DeviceBayTestCase(ViewTestCases.DeviceComponentViewTestCase):
         )
 
 
-# TODO: Convert to DeviceComponentViewTestCase?
-class InventoryItemTestCase(
-    ViewTestCases.EditObjectViewTestCase,
-    ViewTestCases.DeleteObjectViewTestCase,
-    ViewTestCases.ListObjectsViewTestCase,
-    ViewTestCases.BulkCreateObjectsViewTestCase,
-    ViewTestCases.BulkImportObjectsViewTestCase,
-    ViewTestCases.BulkEditObjectsViewTestCase,
-    ViewTestCases.BulkDeleteObjectsViewTestCase
-):
+class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
     model = InventoryItem
 
     @classmethod
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 4d5964ee1..53d65502c 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -5,8 +5,8 @@ from ipam.views import ServiceEditView
 from . import views
 from .models import (
     Cable, ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceRole, DeviceType, FrontPort, Interface,
-    Manufacturer, Platform, PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup, RackReservation, RackRole,
-    RearPort, Region, Site, VirtualChassis,
+    InventoryItem, Manufacturer, Platform, PowerFeed, PowerPanel, PowerPort, PowerOutlet, Rack, RackGroup,
+    RackReservation, RackRole, RearPort, Region, Site, VirtualChassis,
 )
 
 app_name = 'dcim'
@@ -322,8 +322,10 @@ urlpatterns = [
     path('inventory-items/edit/', views.InventoryItemBulkEditView.as_view(), name='inventoryitem_bulk_edit'),
     # TODO: Bulk rename view for InventoryItems
     path('inventory-items/delete/', views.InventoryItemBulkDeleteView.as_view(), name='inventoryitem_bulk_delete'),
+    path('inventory-items/<int:pk>/', views.InventoryItemView.as_view(), name='inventoryitem'),
     path('inventory-items/<int:pk>/edit/', views.InventoryItemEditView.as_view(), name='inventoryitem_edit'),
     path('inventory-items/<int:pk>/delete/', views.InventoryItemDeleteView.as_view(), name='inventoryitem_delete'),
+    path('inventory-items/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='inventoryitem_changelog', kwargs={'model': InventoryItem}),
 
     # Cables
     path('cables/', views.CableListView.as_view(), name='cable_list'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 3eebbabae..054d3de34 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1716,6 +1716,57 @@ class DeviceBayBulkDeleteView(BulkDeleteView):
     table = tables.DeviceBayTable
 
 
+#
+# Inventory items
+#
+
+class InventoryItemListView(ObjectListView):
+    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
+    filterset = filters.InventoryItemFilterSet
+    filterset_form = forms.InventoryItemFilterForm
+    table = tables.InventoryItemTable
+    action_buttons = ('import', 'export')
+
+
+class InventoryItemView(ObjectView):
+    queryset = InventoryItem.objects.all()
+
+
+class InventoryItemEditView(ObjectEditView):
+    queryset = InventoryItem.objects.all()
+    model_form = forms.InventoryItemForm
+
+
+class InventoryItemCreateView(ComponentCreateView):
+    queryset = InventoryItem.objects.all()
+    form = forms.InventoryItemCreateForm
+    model_form = forms.InventoryItemForm
+    template_name = 'dcim/device_component_add.html'
+
+
+class InventoryItemDeleteView(ObjectDeleteView):
+    queryset = InventoryItem.objects.all()
+
+
+class InventoryItemBulkImportView(BulkImportView):
+    queryset = InventoryItem.objects.all()
+    model_form = forms.InventoryItemCSVForm
+    table = tables.InventoryItemTable
+
+
+class InventoryItemBulkEditView(BulkEditView):
+    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
+    filterset = filters.InventoryItemFilterSet
+    table = tables.InventoryItemTable
+    form = forms.InventoryItemBulkEditForm
+
+
+class InventoryItemBulkDeleteView(BulkDeleteView):
+    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
+    table = tables.InventoryItemTable
+    template_name = 'dcim/inventoryitem_bulk_delete.html'
+
+
 #
 # Bulk Device component creation
 #
@@ -2048,53 +2099,6 @@ class InterfaceConnectionsListView(ObjectListView):
         return '\n'.join(csv_data)
 
 
-#
-# Inventory items
-#
-
-class InventoryItemListView(ObjectListView):
-    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
-    filterset = filters.InventoryItemFilterSet
-    filterset_form = forms.InventoryItemFilterForm
-    table = tables.InventoryItemTable
-    action_buttons = ('import', 'export')
-
-
-class InventoryItemEditView(ObjectEditView):
-    queryset = InventoryItem.objects.all()
-    model_form = forms.InventoryItemForm
-
-
-class InventoryItemCreateView(ComponentCreateView):
-    queryset = InventoryItem.objects.all()
-    form = forms.InventoryItemCreateForm
-    model_form = forms.InventoryItemForm
-    template_name = 'dcim/device_component_add.html'
-
-
-class InventoryItemDeleteView(ObjectDeleteView):
-    queryset = InventoryItem.objects.all()
-
-
-class InventoryItemBulkImportView(BulkImportView):
-    queryset = InventoryItem.objects.all()
-    model_form = forms.InventoryItemCSVForm
-    table = tables.InventoryItemTable
-
-
-class InventoryItemBulkEditView(BulkEditView):
-    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
-    filterset = filters.InventoryItemFilterSet
-    table = tables.InventoryItemTable
-    form = forms.InventoryItemBulkEditForm
-
-
-class InventoryItemBulkDeleteView(BulkDeleteView):
-    queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
-    table = tables.InventoryItemTable
-    template_name = 'dcim/inventoryitem_bulk_delete.html'
-
-
 #
 # Virtual chassis
 #
diff --git a/netbox/templates/dcim/inc/inventoryitem.html b/netbox/templates/dcim/inc/inventoryitem.html
index 56ccfeace..d3a78afd4 100644
--- a/netbox/templates/dcim/inc/inventoryitem.html
+++ b/netbox/templates/dcim/inc/inventoryitem.html
@@ -1,5 +1,7 @@
 <tr>
-    <td style="padding-left: {{ indent|add:5 }}px">{{ item }}</td>
+    <td style="padding-left: {{ indent|add:5 }}px">
+        <a href="{{ item.get_absolute_url }}">{{ item }}</a>
+    </td>
     <td>{% if not item.discovered %}<i class="fa fa-asterisk" title="Manually created"></i>{% endif %}</td>
     <td>{{ item.manufacturer|default:"" }}</td>
     <td>{{ item.part_id }}</td>
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
new file mode 100644
index 000000000..6e12d9f33
--- /dev/null
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -0,0 +1,73 @@
+{% extends 'dcim/device_component.html' %}
+{% load helpers %}
+{% load plugins %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Inventory Item</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Device</td>
+                        <td>
+                            <a href="{{ instance.device.get_absolute_url }}">{{ instance.device }}</a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Parent Item</td>
+                        <td>
+                            {% if instance.parent %}
+                                <a href="{{ instance.parent.get_absolute_url }}">{{ instance.parent }}</a>
+                            {% else %}
+                                <span class="text-muted">&mdash;</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Name</td>
+                        <td>{{ instance.name }}</td>
+                    </tr>
+                    <tr>
+                        <td>Manufacturer</td>
+                        <td>
+                            {% if instance.manufacturer %}
+                                <a href="{{ instance.manufacturer.get_absolute_url }}">{{ instance.manufacturer }}</a>
+                            {% else %}
+                                <span class="text-muted">&mdash;</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Part ID</td>
+                        <td>{{ instance.part_id|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Serial</td>
+                        <td>{{ instance.serial|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Asset Tag</td>
+                        <td>{{ instance.asset_tag|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Description</td>
+                        <td>{{ instance.description|placeholder }}</td>
+                    </tr>
+                </table>
+            </div>
+            {% include 'extras/inc/tags_panel.html' with tags=instance.tags.all %}
+            {% plugin_left_page instance %}
+        </div>
+        <div class="col-md-6">
+            {% plugin_right_page instance %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page instance %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index f22baf7cc..23808bc04 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -173,16 +173,6 @@
                             <a href="{% url 'dcim:manufacturer_list' %}">Manufacturers</a>
                         </li>
                         <li class="divider"></li>
-                        <li class="dropdown-header">Inventory</li>
-                        <li{% if not perms.dcim.view_inventoryitem %} class="disabled"{% endif %}>
-                            {% if perms.dcim.add_inventoryitem %}
-                                <div class="buttons pull-right">
-                                    <a href="{% url 'dcim:inventoryitem_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
-                                </div>
-                            {% endif %}
-                            <a href="{% url 'dcim:inventoryitem_list' %}">Inventory Items</a>
-                        </li>
-                        <li class="divider"></li>
                         <li class="dropdown-header">Connections</li>
                         <li{% if not perms.dcim.view_cable %} class="disabled"{% endif %}>
                             {% if perms.dcim.add_cable %}
@@ -267,6 +257,14 @@
                             {% endif %}
                             <a href="{% url 'dcim:devicebay_list' %}">Device Bays</a>
                         </li>
+                        <li{% if not perms.dcim.view_inventoryitem %} class="disabled"{% endif %}>
+                            {% if perms.dcim.add_inventoryitem %}
+                                <div class="buttons pull-right">
+                                    <a href="{% url 'dcim:inventoryitem_import' %}" class="btn btn-xs btn-info" title="Import"><i class="fa fa-download"></i></a>
+                                </div>
+                            {% endif %}
+                            <a href="{% url 'dcim:inventoryitem_list' %}">Inventory Items</a>
+                        </li>
                     </ul>
                 </li>
                 <li class="dropdown">

From e4b5045ec76b1c751e3e61247fb5f765429ec89f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 14:55:11 -0400
Subject: [PATCH 282/505] #4416: Add bulk_add view for InventoryItems

---
 netbox/dcim/forms.py                   | 308 +++++++++++++------------
 netbox/dcim/urls.py                    |   1 +
 netbox/dcim/views.py                   |  11 +
 netbox/templates/dcim/device.html      |   3 +
 netbox/templates/dcim/device_list.html |   1 +
 5 files changed, 175 insertions(+), 149 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 2b65940a5..281818895 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3372,6 +3372,165 @@ class DeviceBayCSVForm(CSVModelForm):
             self.fields['installed_device'].queryset = Interface.objects.none()
 
 
+#
+# Inventory items
+#
+
+class InventoryItemForm(BootstrapMixin, forms.ModelForm):
+    device = DynamicModelChoiceField(
+        queryset=Device.objects.prefetch_related('device_type__manufacturer')
+    )
+    manufacturer = DynamicModelChoiceField(
+        queryset=Manufacturer.objects.all(),
+        required=False
+    )
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
+
+    class Meta:
+        model = InventoryItem
+        fields = [
+            'name', 'device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
+        ]
+
+
+class InventoryItemCreateForm(BootstrapMixin, forms.Form):
+    device = DynamicModelChoiceField(
+        queryset=Device.objects.prefetch_related('device_type__manufacturer')
+    )
+    name_pattern = ExpandableNameField(
+        label='Name'
+    )
+    manufacturer = DynamicModelChoiceField(
+        queryset=Manufacturer.objects.all(),
+        required=False
+    )
+    part_id = forms.CharField(
+        max_length=50,
+        required=False,
+        label='Part ID'
+    )
+    serial = forms.CharField(
+        max_length=50,
+        required=False,
+    )
+    asset_tag = forms.CharField(
+        max_length=50,
+        required=False,
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
+
+
+class InventoryItemCSVForm(CSVModelForm):
+    device = CSVModelChoiceField(
+        queryset=Device.objects.all(),
+        to_field_name='name'
+    )
+    manufacturer = CSVModelChoiceField(
+        queryset=Manufacturer.objects.all(),
+        to_field_name='name',
+        required=False
+    )
+
+    class Meta:
+        model = InventoryItem
+        fields = InventoryItem.csv_headers
+
+
+class InventoryItemBulkCreateForm(
+    form_from_model(InventoryItem, ['manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'tags']),
+    DeviceBulkAddComponentForm
+):
+    tags = DynamicModelMultipleChoiceField(
+        queryset=Tag.objects.all(),
+        required=False
+    )
+
+
+class InventoryItemBulkEditForm(BootstrapMixin, BulkEditForm):
+    pk = forms.ModelMultipleChoiceField(
+        queryset=InventoryItem.objects.all(),
+        widget=forms.MultipleHiddenInput()
+    )
+    device = DynamicModelChoiceField(
+        queryset=Device.objects.all(),
+        required=False
+    )
+    manufacturer = DynamicModelChoiceField(
+        queryset=Manufacturer.objects.all(),
+        required=False
+    )
+    part_id = forms.CharField(
+        max_length=50,
+        required=False,
+        label='Part ID'
+    )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
+
+    class Meta:
+        nullable_fields = [
+            'manufacturer', 'part_id', 'description',
+        ]
+
+
+class InventoryItemFilterForm(BootstrapMixin, forms.Form):
+    model = InventoryItem
+    q = forms.CharField(
+        required=False,
+        label='Search'
+    )
+    region = DynamicModelMultipleChoiceField(
+        queryset=Region.objects.all(),
+        to_field_name='slug',
+        required=False,
+        widget=APISelectMultiple(
+            value_field="slug",
+            filter_for={
+                'site': 'region'
+            }
+        )
+    )
+    site = DynamicModelMultipleChoiceField(
+        queryset=Site.objects.all(),
+        to_field_name='slug',
+        required=False,
+        widget=APISelectMultiple(
+            value_field="slug",
+            filter_for={
+                'device_id': 'site'
+            }
+        )
+    )
+    device_id = DynamicModelMultipleChoiceField(
+        queryset=Device.objects.all(),
+        required=False,
+        label='Device'
+    )
+    manufacturer = DynamicModelMultipleChoiceField(
+        queryset=Manufacturer.objects.all(),
+        to_field_name='slug',
+        required=False,
+        widget=APISelect(
+            value_field="slug",
+        )
+    )
+    discovered = forms.NullBooleanField(
+        required=False,
+        widget=StaticSelect2(
+            choices=BOOLEAN_WITH_BLANK_CHOICES
+        )
+    )
+    tag = TagFilterField(model)
+
+
 #
 # Cables
 #
@@ -3919,155 +4078,6 @@ class InterfaceConnectionFilterForm(BootstrapMixin, forms.Form):
     )
 
 
-#
-# Inventory items
-#
-
-class InventoryItemForm(BootstrapMixin, forms.ModelForm):
-    device = DynamicModelChoiceField(
-        queryset=Device.objects.prefetch_related('device_type__manufacturer')
-    )
-    manufacturer = DynamicModelChoiceField(
-        queryset=Manufacturer.objects.all(),
-        required=False
-    )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
-
-    class Meta:
-        model = InventoryItem
-        fields = [
-            'name', 'device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
-        ]
-
-
-class InventoryItemCreateForm(BootstrapMixin, forms.Form):
-    device = DynamicModelChoiceField(
-        queryset=Device.objects.prefetch_related('device_type__manufacturer')
-    )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
-    manufacturer = DynamicModelChoiceField(
-        queryset=Manufacturer.objects.all(),
-        required=False
-    )
-    part_id = forms.CharField(
-        max_length=50,
-        required=False,
-        label='Part ID'
-    )
-    serial = forms.CharField(
-        max_length=50,
-        required=False,
-    )
-    asset_tag = forms.CharField(
-        max_length=50,
-        required=False,
-    )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-
-
-class InventoryItemCSVForm(CSVModelForm):
-    device = CSVModelChoiceField(
-        queryset=Device.objects.all(),
-        to_field_name='name'
-    )
-    manufacturer = CSVModelChoiceField(
-        queryset=Manufacturer.objects.all(),
-        to_field_name='name',
-        required=False
-    )
-
-    class Meta:
-        model = InventoryItem
-        fields = InventoryItem.csv_headers
-
-
-class InventoryItemBulkEditForm(BootstrapMixin, BulkEditForm):
-    pk = forms.ModelMultipleChoiceField(
-        queryset=InventoryItem.objects.all(),
-        widget=forms.MultipleHiddenInput()
-    )
-    device = DynamicModelChoiceField(
-        queryset=Device.objects.all(),
-        required=False
-    )
-    manufacturer = DynamicModelChoiceField(
-        queryset=Manufacturer.objects.all(),
-        required=False
-    )
-    part_id = forms.CharField(
-        max_length=50,
-        required=False,
-        label='Part ID'
-    )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-
-    class Meta:
-        nullable_fields = [
-            'manufacturer', 'part_id', 'description',
-        ]
-
-
-class InventoryItemFilterForm(BootstrapMixin, forms.Form):
-    model = InventoryItem
-    q = forms.CharField(
-        required=False,
-        label='Search'
-    )
-    region = DynamicModelMultipleChoiceField(
-        queryset=Region.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-            filter_for={
-                'site': 'region'
-            }
-        )
-    )
-    site = DynamicModelMultipleChoiceField(
-        queryset=Site.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-            filter_for={
-                'device_id': 'site'
-            }
-        )
-    )
-    device_id = DynamicModelMultipleChoiceField(
-        queryset=Device.objects.all(),
-        required=False,
-        label='Device'
-    )
-    manufacturer = DynamicModelMultipleChoiceField(
-        queryset=Manufacturer.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelect(
-            value_field="slug",
-        )
-    )
-    discovered = forms.NullBooleanField(
-        required=False,
-        widget=StaticSelect2(
-            choices=BOOLEAN_WITH_BLANK_CHOICES
-        )
-    )
-    tag = TagFilterField(model)
-
-
 #
 # Virtual chassis
 #
diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 53d65502c..831d40402 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -326,6 +326,7 @@ urlpatterns = [
     path('inventory-items/<int:pk>/edit/', views.InventoryItemEditView.as_view(), name='inventoryitem_edit'),
     path('inventory-items/<int:pk>/delete/', views.InventoryItemDeleteView.as_view(), name='inventoryitem_delete'),
     path('inventory-items/<int:pk>/changelog/', ObjectChangeLogView.as_view(), name='inventoryitem_changelog', kwargs={'model': InventoryItem}),
+    path('devices/inventory-items/add/', views.DeviceBulkAddInventoryItemView.as_view(), name='device_bulk_add_inventoryitem'),
 
     # Cables
     path('cables/', views.CableListView.as_view(), name='cable_list'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 054d3de34..4456e408d 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1859,6 +1859,17 @@ class DeviceBulkAddDeviceBayView(BulkComponentCreateView):
     default_return_url = 'dcim:device_list'
 
 
+class DeviceBulkAddInventoryItemView(BulkComponentCreateView):
+    parent_model = Device
+    parent_field = 'device'
+    form = forms.InventoryItemBulkCreateForm
+    queryset = InventoryItem.objects.all()
+    model_form = forms.InventoryItemForm
+    filterset = filters.DeviceFilterSet
+    table = tables.DeviceTable
+    default_return_url = 'dcim:device_list'
+
+
 #
 # Cables
 #
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 03ca0f8b4..710288da6 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -74,6 +74,9 @@
                     {% if perms.dcim.add_devicebay %}
                         <li><a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}">Device Bays</a></li>
                     {% endif %}
+                    {% if perms.dcim.add_inventoryitem %}
+                        <li><a href="{% url 'dcim:inventoryitem_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}">Inventory Items</a></li>
+                    {% endif %}
                 </ul>
             </div>
         {% endif %}
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index f236a0550..b1cd32eea 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -14,6 +14,7 @@
                 {% if perms.dcim.add_interface %}<li><a href="{% url 'dcim:device_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Interfaces</a></li>{% endif %}
                 {% if perms.dcim.add_rearport %}<li><a href="{% url 'dcim:device_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Rear Ports</a></li>{% endif %}
                 {% if perms.dcim.add_devicebay %}<li><a href="{% url 'dcim:device_bulk_add_devicebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Device Bays</a></li>{% endif %}
+                {% if perms.dcim.add_inventoryitem %}<li><a href="{% url 'dcim:device_bulk_add_inventoryitem' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Inventory Items</a></li>{% endif %}
             </ul>
         </div>
     {% endif %}

From 06ae424b80f2fca5b6940f55c63084b0fede748c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 15:12:05 -0400
Subject: [PATCH 283/505] #4416: Add bulk rename view for InventoryItem

---
 netbox/dcim/urls.py                          |   2 +-
 netbox/dcim/views.py                         |   4 +
 netbox/templates/dcim/device_inventory.html  | 108 +++++++++----------
 netbox/templates/dcim/inc/inventoryitem.html |  33 ++++--
 4 files changed, 86 insertions(+), 61 deletions(-)

diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 831d40402..7af91f0ae 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -320,7 +320,7 @@ urlpatterns = [
     path('inventory-items/add/', views.InventoryItemCreateView.as_view(), name='inventoryitem_add'),
     path('inventory-items/import/', views.InventoryItemBulkImportView.as_view(), name='inventoryitem_import'),
     path('inventory-items/edit/', views.InventoryItemBulkEditView.as_view(), name='inventoryitem_bulk_edit'),
-    # TODO: Bulk rename view for InventoryItems
+    path('inventory-items/rename/', views.InventoryItemBulkRenameView.as_view(), name='inventoryitem_bulk_rename'),
     path('inventory-items/delete/', views.InventoryItemBulkDeleteView.as_view(), name='inventoryitem_bulk_delete'),
     path('inventory-items/<int:pk>/', views.InventoryItemView.as_view(), name='inventoryitem'),
     path('inventory-items/<int:pk>/edit/', views.InventoryItemEditView.as_view(), name='inventoryitem_edit'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 4456e408d..101c3ea6e 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1761,6 +1761,10 @@ class InventoryItemBulkEditView(BulkEditView):
     form = forms.InventoryItemBulkEditForm
 
 
+class InventoryItemBulkRenameView(BulkRenameView):
+    queryset = InventoryItem.objects.all()
+
+
 class InventoryItemBulkDeleteView(BulkDeleteView):
     queryset = InventoryItem.objects.prefetch_related('device', 'manufacturer')
     table = tables.InventoryItemTable
diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html
index 1a7e5d793..69afbb6a1 100644
--- a/netbox/templates/dcim/device_inventory.html
+++ b/netbox/templates/dcim/device_inventory.html
@@ -5,61 +5,61 @@
 
 {% block content %}
     <div class="row">
-        <div class="col-md-4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Chassis</strong>
-                </div>
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Model</td>
-                        <td>{{ device.device_type.display_name }}</td>
-                    </tr>
-                    <tr>
-                        <td>Serial Number</td>
-                        <td><span>{{ device.serial|placeholder }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Asset Tag</td>
-                        <td><span>{{ device.asset_tag|placeholder }}</span></td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-        <div class="col-md-8">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Hardware</strong>
-                </div>
-                <table class="table table-hover table-condensed panel-body" id="hardware">
-                    <thead>
-                        <tr>
-                            <th>Name</th>
-                            <th></th>
-                            <th>Manufacturer</th>
-                            <th>Part ID</th>
-                            <th>Serial Number</th>
-                            <th>Asset Tag</th>
-                            <th>Description</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for item in inventory_items %}
-                            {% with template_name='dcim/inc/inventoryitem.html' indent=0 %}
-                                {% include template_name %}
-                            {% endwith %}
-                        {% endfor %}
-                    </tbody>
-                </table>
-                {% if perms.dcim.add_inventoryitem %}
-                    <div class="panel-footer text-right noprint">
-                        <a href="{% url 'dcim:inventoryitem_add' %}?device={{ device.pk }}&return_url={% url 'dcim:device_inventory' pk=device.pk %}" class="btn btn-primary btn-xs">
-                            <span class="fa fa-plus" aria-hidden="true"></span> Add Inventory Item
-                        </a>
+        <div class="col-md-12">
+            <form method="post">
+                {% csrf_token %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <strong>Inventory Items</strong>
                     </div>
-                {% endif %}
-            </div>
+                    <table class="table table-hover table-condensed panel-body" id="hardware">
+                        <thead>
+                            <tr>
+                                {% if perms.dcim.change_inventoryitem or perms.dcim.delete_inventoryitem %}
+                                    <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                {% endif %}
+                                <th>Name</th>
+                                <th>Manufacturer</th>
+                                <th>Part ID</th>
+                                <th>Serial Number</th>
+                                <th>Asset Tag</th>
+                                <th>Discovered</th>
+                                <th>Description</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for item in inventory_items %}
+                                {% with template_name='dcim/inc/inventoryitem.html' indent=0 %}
+                                    {% include template_name %}
+                                {% endwith %}
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                    <div class="panel-footer noprint">
+                        {% if inventory_items and perms.dcim.change_inventoryitem %}
+                            <button type="submit" name="_rename" formaction="{% url 'dcim:inventoryitem_bulk_rename' %}?return_url={% url 'dcim:device_inventory' pk=device.pk %}" class="btn btn-warning btn-xs">
+                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                            </button>
+                            <button type="submit" name="_edit" formaction="{% url 'dcim:inventoryitem_bulk_edit' %}?device={{ device.pk }}&return_url={% url 'dcim:device_inventory' pk=device.pk %}" class="btn btn-warning btn-xs">
+                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                            </button>
+                        {% endif %}
+                        {% if inventory_items and perms.dcim.delete_inventoryitem %}
+                            <button type="submit" name="_delete" formaction="{% url 'dcim:inventoryitem_bulk_delete' %}?return_url={% url 'dcim:device_inventory' pk=device.pk %}" class="btn btn-danger btn-xs">
+                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                            </button>
+                        {% endif %}
+                        {% if perms.dcim.add_inventoryitem %}
+                            <div class="pull-right">
+                                <a href="{% url 'dcim:inventoryitem_add' %}?device={{ device.pk }}&return_url={% url 'dcim:device_inventory' pk=device.pk %}" class="btn btn-primary btn-xs">
+                                    <span class="fa fa-plus" aria-hidden="true"></span> Add Inventory Item
+                                </a>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div>
+            </form>
         </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/dcim/inc/inventoryitem.html b/netbox/templates/dcim/inc/inventoryitem.html
index d3a78afd4..1b103893f 100644
--- a/netbox/templates/dcim/inc/inventoryitem.html
+++ b/netbox/templates/dcim/inc/inventoryitem.html
@@ -1,13 +1,34 @@
+{% load helpers %}
 <tr>
+
+    {# Checkbox #}
+    {% if perms.dcim.change_inventoryitem or perms.dcim.delete_inventoryitem %}
+        <td class="pk">
+            <input name="pk" type="checkbox" value="{{ item.pk }}" />
+        </td>
+    {% endif %}
+
     <td style="padding-left: {{ indent|add:5 }}px">
         <a href="{{ item.get_absolute_url }}">{{ item }}</a>
     </td>
-    <td>{% if not item.discovered %}<i class="fa fa-asterisk" title="Manually created"></i>{% endif %}</td>
-    <td>{{ item.manufacturer|default:"" }}</td>
-    <td>{{ item.part_id }}</td>
-    <td>{{ item.serial }}</td>
-    <td>{{ item.asset_tag|default:"" }}</td>
-    <td>{{ item.description }}</td>
+    <td>
+        {% if item.manufacturer %}
+            <a href="{{ item.manufacturer.get_absolute_url }}">{{ item.manufacturer }}</a>
+        {% else %}
+            <span class="text-muted">&mdash;</span>
+        {% endif %}
+    </td>
+    <td>{{ item.part_id|placeholder }}</td>
+    <td>{{ item.serial|placeholder }}</td>
+    <td>{{ item.asset_tag|placeholder }}</td>
+    <td>
+        {% if item.discovered %}
+            <span class="text-success"><i class="fa fa-check"></i></span>
+        {% else %}
+            <span class="text-muted">&mdash;</span>
+        {% endif %}
+    </td>
+    <td>{{ item.description|placeholder }}</td>
     <td class="text-right noprint">
         {% if perms.dcim.change_inventoryitem %}
             <a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}" class="btn btn-xs btn-warning"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>

From fa0c7a76cb2ab461efc12774565a8c3a0fd0abcb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 1 Jul 2020 15:14:06 -0400
Subject: [PATCH 284/505] Fix permission evaluation for add console/power port
 buttons

---
 netbox/templates/dcim/device.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 710288da6..01f125db4 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -358,7 +358,7 @@
                                     <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                 </button>
                             {% endif %}
-                            {% if console_ports and perms.dcim.change_consoleport %}
+                            {% if console_ports and perms.dcim.add_consoleport %}
                                 <div class="pull-right">
                                     <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
                                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
@@ -398,7 +398,7 @@
                                     <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                 </button>
                             {% endif %}
-                            {% if power_ports and perms.dcim.change_powerport %}
+                            {% if power_ports and perms.dcim.add_powerport %}
                                 <div class="pull-right">
                                     <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
                                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port

From f28bde179e09c1bc0ae10346c393e5f106905d57 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 10:46:02 -0400
Subject: [PATCH 285/505] Extend label field to all device components

---
 netbox/dcim/api/serializers.py                |  12 +-
 netbox/dcim/filters.py                        |   1 +
 netbox/dcim/forms.py                          | 120 +++++++-----------
 .../dcim/migrations/0107_component_labels.py  |  51 ++++++--
 .../dcim/models/device_component_templates.py |  41 +-----
 netbox/dcim/models/device_components.py       |  76 ++++-------
 netbox/dcim/tables.py                         |   5 +-
 7 files changed, 119 insertions(+), 187 deletions(-)

diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 6838c3987..3f1eff6a4 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -311,7 +311,7 @@ class RearPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = RearPortTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'positions', 'description']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'positions', 'description']
 
 
 class FrontPortTemplateSerializer(ValidatedModelSerializer):
@@ -321,7 +321,7 @@ class FrontPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = FrontPortTemplate
-        fields = ['id', 'device_type', 'name', 'type', 'rear_port', 'rear_port_position', 'description']
+        fields = ['id', 'device_type', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description']
 
 
 class DeviceBayTemplateSerializer(ValidatedModelSerializer):
@@ -559,7 +559,7 @@ class RearPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
 
     class Meta:
         model = RearPort
-        fields = ['id', 'device', 'name', 'type', 'positions', 'description', 'cable', 'tags']
+        fields = ['id', 'device', 'name', 'label', 'type', 'positions', 'description', 'cable', 'tags']
 
 
 class FrontPortRearPortSerializer(WritableNestedSerializer):
@@ -570,7 +570,7 @@ class FrontPortRearPortSerializer(WritableNestedSerializer):
 
     class Meta:
         model = RearPort
-        fields = ['id', 'url', 'name']
+        fields = ['id', 'url', 'name', 'label']
 
 
 class FrontPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
@@ -581,7 +581,9 @@ class FrontPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
 
     class Meta:
         model = FrontPort
-        fields = ['id', 'device', 'name', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'tags']
+        fields = [
+            'id', 'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'tags',
+        ]
 
 
 class DeviceBaySerializer(TaggedObjectSerializer, ValidatedModelSerializer):
diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index d22511ede..449a96dcc 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -747,6 +747,7 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
             return queryset
         return queryset.filter(
             Q(name__icontains=value) |
+            Q(label__icontains=value) |
             Q(description__icontains=value)
         )
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 281818895..65cce8850 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -59,7 +59,6 @@ def get_device_by_name_or_pk(name):
 
 
 class DeviceComponentFilterForm(BootstrapMixin, forms.Form):
-
     field_order = [
         'q', 'region', 'site'
     ]
@@ -127,7 +126,11 @@ class InterfaceCommonForm:
                 })
 
 
-class LabeledComponentForm(BootstrapMixin, forms.Form):
+class ComponentForm(BootstrapMixin, forms.Form):
+    """
+    Subclass this form when facilitating the creation of one or more device component or component templates based on
+    a name pattern.
+    """
     name_pattern = ExpandableNameField(
         label='Name'
     )
@@ -1033,7 +1036,7 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm):
 # Device component templates
 #
 
-class ComponentTemplateCreateForm(LabeledComponentForm):
+class ComponentTemplateCreateForm(ComponentForm):
     """
     Base form for the creation of device component templates.
     """
@@ -1350,7 +1353,7 @@ class FrontPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = FrontPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'rear_port', 'rear_port_position', 'description',
+            'device_type', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1430,6 +1433,10 @@ class FrontPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=FrontPortTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PortTypeChoices),
         required=False,
@@ -1448,7 +1455,7 @@ class RearPortTemplateForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = RearPortTemplate
         fields = [
-            'device_type', 'name', 'type', 'positions', 'description',
+            'device_type', 'name', 'label', 'type', 'positions', 'description',
         ]
         widgets = {
             'device_type': forms.HiddenInput(),
@@ -1474,6 +1481,10 @@ class RearPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=RearPortTemplate.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    label = forms.CharField(
+        max_length=64,
+        required=False
+    )
     type = forms.ChoiceField(
         choices=add_blank_choice(PortTypeChoices),
         required=False,
@@ -2248,7 +2259,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
 # Device components
 #
 
-class ComponentCreateForm(LabeledComponentForm):
+class ComponentCreateForm(ComponentForm):
     """
     Base form for the creation of device components.
     """
@@ -2261,7 +2272,7 @@ class ComponentCreateForm(LabeledComponentForm):
     )
 
 
-class DeviceBulkAddComponentForm(LabeledComponentForm):
+class DeviceBulkAddComponentForm(ComponentForm):
     pk = forms.ModelMultipleChoiceField(
         queryset=Device.objects.all(),
         widget=forms.MultipleHiddenInput()
@@ -3013,7 +3024,7 @@ class FrontPortForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = FrontPort
         fields = [
-            'device', 'name', 'type', 'rear_port', 'rear_port_position', 'description', 'tags',
+            'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'tags',
         ]
         widgets = {
             'device': forms.HiddenInput(),
@@ -3094,14 +3105,14 @@ class FrontPortCreateForm(ComponentCreateForm):
 
 
 # class FrontPortBulkCreateForm(
-#     form_from_model(FrontPort, ['type', 'description', 'tags']),
+#     form_from_model(FrontPort, ['label', 'type', 'description', 'tags']),
 #     DeviceBulkAddComponentForm
 # ):
 #     pass
 
 
 class FrontPortBulkEditForm(
-    form_from_model(FrontPort, ['type', 'description']),
+    form_from_model(FrontPort, ['label', 'type', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -3112,9 +3123,7 @@ class FrontPortBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = [
-            'description',
-        ]
+        nullable_fields = ('label', 'description')
 
 
 class FrontPortCSVForm(CSVModelForm):
@@ -3185,7 +3194,7 @@ class RearPortForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = RearPort
         fields = [
-            'device', 'name', 'type', 'positions', 'description', 'tags',
+            'device', 'name', 'label', 'type', 'positions', 'description', 'tags',
         ]
         widgets = {
             'device': forms.HiddenInput(),
@@ -3210,14 +3219,14 @@ class RearPortCreateForm(ComponentCreateForm):
 
 
 class RearPortBulkCreateForm(
-    form_from_model(RearPort, ['type', 'positions', 'description', 'tags']),
+    form_from_model(RearPort, ['label', 'type', 'positions', 'description', 'tags']),
     DeviceBulkAddComponentForm
 ):
     pass
 
 
 class RearPortBulkEditForm(
-    form_from_model(RearPort, ['type', 'description']),
+    form_from_model(RearPort, ['label', 'type', 'description']),
     BootstrapMixin,
     AddRemoveTagsForm,
     BulkEditForm
@@ -3228,9 +3237,7 @@ class RearPortBulkEditForm(
     )
 
     class Meta:
-        nullable_fields = [
-            'description',
-        ]
+        nullable_fields = ('label', 'description')
 
 
 class RearPortCSVForm(CSVModelForm):
@@ -3392,17 +3399,11 @@ class InventoryItemForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = InventoryItem
         fields = [
-            'name', 'device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
+            'name', 'label', 'device', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'tags',
         ]
 
 
-class InventoryItemCreateForm(BootstrapMixin, forms.Form):
-    device = DynamicModelChoiceField(
-        queryset=Device.objects.prefetch_related('device_type__manufacturer')
-    )
-    name_pattern = ExpandableNameField(
-        label='Name'
-    )
+class InventoryItemCreateForm(ComponentCreateForm):
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         required=False
@@ -3443,7 +3444,7 @@ class InventoryItemCSVForm(CSVModelForm):
 
 
 class InventoryItemBulkCreateForm(
-    form_from_model(InventoryItem, ['manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'tags']),
+    form_from_model(InventoryItem, ['label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'tags']),
     DeviceBulkAddComponentForm
 ):
     tags = DynamicModelMultipleChoiceField(
@@ -3452,68 +3453,27 @@ class InventoryItemBulkCreateForm(
     )
 
 
-class InventoryItemBulkEditForm(BootstrapMixin, BulkEditForm):
+class InventoryItemBulkEditForm(
+    form_from_model(InventoryItem, ['label', 'manufacturer', 'part_id', 'description']),
+    BootstrapMixin,
+    AddRemoveTagsForm,
+    BulkEditForm
+):
     pk = forms.ModelMultipleChoiceField(
         queryset=InventoryItem.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
-    device = DynamicModelChoiceField(
-        queryset=Device.objects.all(),
-        required=False
-    )
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
         required=False
     )
-    part_id = forms.CharField(
-        max_length=50,
-        required=False,
-        label='Part ID'
-    )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
 
     class Meta:
-        nullable_fields = [
-            'manufacturer', 'part_id', 'description',
-        ]
+        nullable_fields = ('label', 'manufacturer', 'part_id', 'description')
 
 
-class InventoryItemFilterForm(BootstrapMixin, forms.Form):
+class InventoryItemFilterForm(DeviceComponentFilterForm):
     model = InventoryItem
-    q = forms.CharField(
-        required=False,
-        label='Search'
-    )
-    region = DynamicModelMultipleChoiceField(
-        queryset=Region.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-            filter_for={
-                'site': 'region'
-            }
-        )
-    )
-    site = DynamicModelMultipleChoiceField(
-        queryset=Site.objects.all(),
-        to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-            filter_for={
-                'device_id': 'site'
-            }
-        )
-    )
-    device_id = DynamicModelMultipleChoiceField(
-        queryset=Device.objects.all(),
-        required=False,
-        label='Device'
-    )
     manufacturer = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
         to_field_name='slug',
@@ -3522,6 +3482,12 @@ class InventoryItemFilterForm(BootstrapMixin, forms.Form):
             value_field="slug",
         )
     )
+    serial = forms.CharField(
+        required=False
+    )
+    asset_tag = forms.CharField(
+        required=False
+    )
     discovered = forms.NullBooleanField(
         required=False,
         widget=StaticSelect2(
diff --git a/netbox/dcim/migrations/0107_component_labels.py b/netbox/dcim/migrations/0107_component_labels.py
index 8e5ab8156..c89bfc0b6 100644
--- a/netbox/dcim/migrations/0107_component_labels.py
+++ b/netbox/dcim/migrations/0107_component_labels.py
@@ -1,5 +1,3 @@
-# Generated by Django 3.0.7 on 2020-06-04 20:37
-
 from django.db import migrations, models
 
 
@@ -10,16 +8,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AddField(
-            model_name='interface',
-            name='label',
-            field=models.CharField(blank=True, max_length=64),
-        ),
-        migrations.AddField(
-            model_name='interfacetemplate',
-            name='label',
-            field=models.CharField(blank=True, max_length=64),
-        ),
         migrations.AddField(
             model_name='consoleport',
             name='label',
@@ -40,6 +28,41 @@ class Migration(migrations.Migration):
             name='label',
             field=models.CharField(blank=True, max_length=64),
         ),
+        migrations.AddField(
+            model_name='devicebay',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='devicebaytemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='frontport',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='frontporttemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='interface',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='interfacetemplate',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
+        migrations.AddField(
+            model_name='inventoryitem',
+            name='label',
+            field=models.CharField(blank=True, max_length=64),
+        ),
         migrations.AddField(
             model_name='poweroutlet',
             name='label',
@@ -61,12 +84,12 @@ class Migration(migrations.Migration):
             field=models.CharField(blank=True, max_length=64),
         ),
         migrations.AddField(
-            model_name='devicebay',
+            model_name='rearport',
             name='label',
             field=models.CharField(blank=True, max_length=64),
         ),
         migrations.AddField(
-            model_name='devicebaytemplate',
+            model_name='rearporttemplate',
             name='label',
             field=models.CharField(blank=True, max_length=64),
         ),
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 1c2be0e5d..626363da1 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -27,6 +27,11 @@ __all__ = (
 
 
 class ComponentTemplateModel(models.Model):
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="Physical label"
+    )
     description = models.CharField(
         max_length=200,
         blank=True
@@ -81,11 +86,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -121,11 +121,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -161,11 +156,6 @@ class PowerPortTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -215,11 +205,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -283,11 +268,6 @@ class InterfaceTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=InterfaceTypeChoices
@@ -348,9 +328,6 @@ class FrontPortTemplate(ComponentTemplateModel):
             ('rear_port', 'rear_port_position'),
         )
 
-    def __str__(self):
-        return self.name
-
     def clean(self):
 
         # Validate rear port assignment
@@ -411,9 +388,6 @@ class RearPortTemplate(ComponentTemplateModel):
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
 
-    def __str__(self):
-        return self.name
-
     def instantiate(self, device):
         return RearPort(
             device=device,
@@ -440,11 +414,6 @@ class DeviceBayTemplate(ComponentTemplateModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
 
     class Meta:
         ordering = ('device_type', '_name')
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index aecf57544..aea34e73e 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -36,6 +36,11 @@ __all__ = (
 
 
 class ComponentModel(models.Model):
+    label = models.CharField(
+        max_length=64,
+        blank=True,
+        help_text="Physical label"
+    )
     description = models.CharField(
         max_length=200,
         blank=True
@@ -241,11 +246,6 @@ class ConsolePort(CableTermination, ComponentModel):
     name = models.CharField(
         max_length=50
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     _name = NaturalOrderingField(
         target_field='name',
         max_length=100,
@@ -270,7 +270,7 @@ class ConsolePort(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'description']
 
     class Meta:
         ordering = ('device', '_name')
@@ -283,6 +283,7 @@ class ConsolePort(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.type,
             self.description,
         )
@@ -310,11 +311,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -327,7 +323,7 @@ class ConsoleServerPort(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'description']
 
     class Meta:
         ordering = ('device', '_name')
@@ -340,6 +336,7 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.type,
             self.description,
         )
@@ -367,11 +364,6 @@ class PowerPort(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -410,7 +402,7 @@ class PowerPort(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'maximum_draw', 'allocated_draw', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description']
 
     class Meta:
         ordering = ('device', '_name')
@@ -423,6 +415,7 @@ class PowerPort(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.get_type_display(),
             self.maximum_draw,
             self.allocated_draw,
@@ -532,11 +525,6 @@ class PowerOutlet(CableTermination, ComponentModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -562,7 +550,7 @@ class PowerOutlet(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'power_port', 'feed_leg', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description']
 
     class Meta:
         ordering = ('device', '_name')
@@ -575,6 +563,7 @@ class PowerOutlet(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.get_type_display(),
             self.power_port.name if self.power_port else None,
             self.get_feed_leg_display(),
@@ -640,11 +629,6 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         null=True,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     _connected_interface = models.OneToOneField(
         to='self',
         on_delete=models.SET_NULL,
@@ -703,7 +687,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
     tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
-        'device', 'name', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode',
+        'device', 'name', 'label', 'lag', 'type', 'enabled', 'mac_address', 'mtu', 'mgmt_only', 'description', 'mode',
     ]
 
     class Meta:
@@ -717,6 +701,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         return (
             self.device.identifier if self.device else None,
             self.name,
+            self.label,
             self.lag.name if self.lag else None,
             self.get_type_display(),
             self.enabled,
@@ -877,7 +862,7 @@ class FrontPort(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'rear_port', 'rear_port_position', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description']
 
     class Meta:
         ordering = ('device', '_name')
@@ -886,9 +871,6 @@ class FrontPort(CableTermination, ComponentModel):
             ('rear_port', 'rear_port_position'),
         )
 
-    def __str__(self):
-        return self.name
-
     def get_absolute_url(self):
         return reverse('dcim:frontport', kwargs={'pk': self.pk})
 
@@ -896,6 +878,7 @@ class FrontPort(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.get_type_display(),
             self.rear_port.name,
             self.rear_port_position,
@@ -947,15 +930,12 @@ class RearPort(CableTermination, ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'type', 'positions', 'description']
+    csv_headers = ['device', 'name', 'label', 'type', 'positions', 'description']
 
     class Meta:
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        return self.name
-
     def get_absolute_url(self):
         return reverse('dcim:rearport', kwargs={'pk': self.pk})
 
@@ -963,6 +943,7 @@ class RearPort(CableTermination, ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.get_type_display(),
             self.positions,
             self.description,
@@ -992,11 +973,6 @@ class DeviceBay(ComponentModel):
         max_length=100,
         blank=True
     )
-    label = models.CharField(
-        max_length=64,
-        blank=True,
-        help_text="Physical label"
-    )
     installed_device = models.OneToOneField(
         to='dcim.Device',
         on_delete=models.SET_NULL,
@@ -1006,17 +982,12 @@ class DeviceBay(ComponentModel):
     )
     tags = TaggableManager(through=TaggedItem)
 
-    csv_headers = ['device', 'name', 'installed_device', 'description']
+    csv_headers = ['device', 'name', 'label', 'installed_device', 'description']
 
     class Meta:
         ordering = ('device', '_name')
         unique_together = ('device', 'name')
 
-    def __str__(self):
-        if self.label:
-            return '{} - {} ({})'.format(self.device.name, self.name, self.label)
-        return '{} - {}'.format(self.device.name, self.name)
-
     def get_absolute_url(self):
         return reverse('dcim:devicebay', kwargs={'pk': self.pk})
 
@@ -1024,6 +995,7 @@ class DeviceBay(ComponentModel):
         return (
             self.device.identifier,
             self.name,
+            self.label,
             self.installed_device.identifier if self.installed_device else None,
             self.description,
         )
@@ -1116,16 +1088,13 @@ class InventoryItem(ComponentModel):
     tags = TaggableManager(through=TaggedItem)
 
     csv_headers = [
-        'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description',
+        'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description',
     ]
 
     class Meta:
         ordering = ('device__id', 'parent__id', '_name')
         unique_together = ('device', 'parent', 'name')
 
-    def __str__(self):
-        return self.name
-
     def get_absolute_url(self):
         return reverse('dcim:inventoryitem', kwargs={'pk': self.pk})
 
@@ -1133,6 +1102,7 @@ class InventoryItem(ComponentModel):
         return (
             self.device.name or '{{{}}}'.format(self.device.pk),
             self.name,
+            self.label,
             self.manufacturer.name if self.manufacturer else None,
             self.part_id,
             self.serial,
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index f258df221..587749277 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -784,9 +784,10 @@ class InventoryItemTable(DeviceComponentTable):
     class Meta(DeviceComponentTable.Meta):
         model = InventoryItem
         fields = (
-            'pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'discovered'
+            'pk', 'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description',
+            'discovered',
         )
-        default_columns = ('pk', 'device', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag')
+        default_columns = ('pk', 'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag')
 
 
 #

From c5362f59319c315c783b97231a01453f4714d7d0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 11:43:03 -0400
Subject: [PATCH 286/505] Fix permissions evaluation for nonstandard tests

---
 netbox/circuits/tests/test_api.py       | 2 ++
 netbox/dcim/tests/test_api.py           | 4 ++++
 netbox/dcim/tests/test_views.py         | 2 ++
 netbox/secrets/tests/test_views.py      | 2 ++
 netbox/virtualization/tests/test_api.py | 4 +++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index f887db29e..05a0febc7 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
 
 from circuits.choices import *
@@ -45,6 +46,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
         )
         Provider.objects.bulk_create(providers)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_get_provider_graphs(self):
         """
         Test retrieval of Graphs assigned to Providers.
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 451d9d9a9..17ac672d9 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
 from rest_framework import status
 
@@ -131,6 +132,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_get_site_graphs(self):
         """
         Test retrieval of Graphs assigned to Sites.
@@ -900,6 +902,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_get_device_graphs(self):
         """
         Test retrieval of Graphs assigned to Devices.
@@ -1156,6 +1159,7 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase
             },
         ]
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_get_interface_graphs(self):
         """
         Test retrieval of Graphs assigned to Devices.
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 799d186b2..e1baadcc1 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -4,6 +4,7 @@ import pytz
 import yaml
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
 from netaddr import EUI
 
@@ -376,6 +377,7 @@ class DeviceTypeTestCase(
             'is_full_depth': False,
         }
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_import_objects(self):
         """
         Custom import test for YAML-based imports (versus CSV)
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index 577ba4ef4..d88c02e15 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -1,5 +1,6 @@
 import base64
 
+from django.test import override_settings
 from django.urls import reverse
 
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
@@ -96,6 +97,7 @@ class SecretTestCase(
         self.session_key = SessionKey(userkey=userkey)
         self.session_key.save(master_key)
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
     def test_import_objects(self):
         self.add_permissions('secrets.add_secret')
 
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index e108100a9..4d79602f5 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
 from rest_framework import status
 
@@ -244,7 +245,8 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
-    def test_get_interface_graphs(self):
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+    def test_get_vminterface_graphs(self):
         """
         Test retrieval of Graphs assigned to VM interfaces.
         """

From d03d302eef3819db64cad8ae74dc5255647045f6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 12:08:19 -0400
Subject: [PATCH 287/505] Closes #4817: Standardize device/VM component name
 field to 64 characters

---
 docs/release-notes/version-2.9.md             |  1 +
 .../0112_standardize_component_name.py        | 68 ++++++++++++++
 .../dcim/models/device_component_templates.py | 67 ++------------
 netbox/dcim/models/device_components.py       | 89 +++----------------
 netbox/virtualization/models.py               | 11 +++
 5 files changed, 102 insertions(+), 134 deletions(-)
 create mode 100644 netbox/dcim/migrations/0112_standardize_component_name.py

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index c0d51afc2..c13d45f95 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -19,6 +19,7 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * [#4793](https://github.com/netbox-community/netbox/issues/4793) - Add `description` field to device component templates
 * [#4795](https://github.com/netbox-community/netbox/issues/4795) - Add bulk disconnect capability for console and power ports
 * [#4807](https://github.com/netbox-community/netbox/issues/4807) - Add bulk edit ability for device bay templates
+* [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
 
 ### Configuration Changes
 
diff --git a/netbox/dcim/migrations/0112_standardize_component_name.py b/netbox/dcim/migrations/0112_standardize_component_name.py
new file mode 100644
index 000000000..1e12b1bf2
--- /dev/null
+++ b/netbox/dcim/migrations/0112_standardize_component_name.py
@@ -0,0 +1,68 @@
+# Generated by Django 3.0.6 on 2020-07-02 16:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0111_component_template_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='consoleport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='devicebay',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='devicebaytemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='inventoryitem',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlet',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlettemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='powerporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+    ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 626363da1..a7b76fdde 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -27,6 +27,14 @@ __all__ = (
 
 
 class ComponentTemplateModel(models.Model):
+    name = models.CharField(
+        max_length=64
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        max_length=100,
+        blank=True
+    )
     label = models.CharField(
         max_length=64,
         blank=True,
@@ -78,14 +86,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='consoleport_templates'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -113,14 +113,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='consoleserverport_templates'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -148,14 +140,6 @@ class PowerPortTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='powerport_templates'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -197,14 +181,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='poweroutlet_templates'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -259,9 +235,6 @@ class InterfaceTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='interface_templates'
     )
-    name = models.CharField(
-        max_length=64
-    )
     _name = NaturalOrderingField(
         target_field='name',
         naturalize_function=naturalize_interface,
@@ -299,14 +272,6 @@ class FrontPortTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='frontport_templates'
     )
-    name = models.CharField(
-        max_length=64
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -367,14 +332,6 @@ class RearPortTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='rearport_templates'
     )
-    name = models.CharField(
-        max_length=64
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -406,14 +363,6 @@ class DeviceBayTemplate(ComponentTemplateModel):
         on_delete=models.CASCADE,
         related_name='device_bay_templates'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
 
     class Meta:
         ordering = ('device_type', '_name')
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index aea34e73e..6a2591916 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -36,6 +36,14 @@ __all__ = (
 
 
 class ComponentModel(models.Model):
+    name = models.CharField(
+        max_length=64
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        max_length=100,
+        blank=True
+    )
     label = models.CharField(
         max_length=64,
         blank=True,
@@ -243,14 +251,6 @@ class ConsolePort(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='consoleports'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -303,14 +303,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='consoleserverports'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -356,14 +348,6 @@ class PowerPort(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='powerports'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -517,14 +501,6 @@ class PowerOutlet(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='poweroutlets'
     )
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -584,15 +560,6 @@ class PowerOutlet(CableTermination, ComponentModel):
 #
 
 class BaseInterface(models.Model):
-    name = models.CharField(
-        max_length=64
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        naturalize_function=naturalize_interface,
-        max_length=100,
-        blank=True
-    )
     enabled = models.BooleanField(
         default=True
     )
@@ -629,6 +596,12 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         null=True,
         blank=True
     )
+    _name = NaturalOrderingField(
+        target_field='name',
+        naturalize_function=naturalize_interface,
+        max_length=100,
+        blank=True
+    )
     _connected_interface = models.OneToOneField(
         to='self',
         on_delete=models.SET_NULL,
@@ -839,14 +812,6 @@ class FrontPort(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='frontports'
     )
-    name = models.CharField(
-        max_length=64
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -912,14 +877,6 @@ class RearPort(CableTermination, ComponentModel):
         on_delete=models.CASCADE,
         related_name='rearports'
     )
-    name = models.CharField(
-        max_length=64
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -964,15 +921,6 @@ class DeviceBay(ComponentModel):
         on_delete=models.CASCADE,
         related_name='device_bays'
     )
-    name = models.CharField(
-        max_length=50,
-        verbose_name='Name'
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     installed_device = models.OneToOneField(
         to='dcim.Device',
         on_delete=models.SET_NULL,
@@ -1045,15 +993,6 @@ class InventoryItem(ComponentModel):
         blank=True,
         null=True
     )
-    name = models.CharField(
-        max_length=50,
-        verbose_name='Name'
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
     manufacturer = models.ForeignKey(
         to='dcim.Manufacturer',
         on_delete=models.PROTECT,
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 5d74f8468..258183bff 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -9,7 +9,9 @@ from dcim.choices import InterfaceModeChoices
 from dcim.models import BaseInterface, Device
 from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
+from utilities.fields import NaturalOrderingField
 from utilities.models import ChangeLoggedModel
+from utilities.ordering import naturalize_interface
 from utilities.query_functions import CollateAsChar
 from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
@@ -387,6 +389,15 @@ class VMInterface(BaseInterface):
         on_delete=models.CASCADE,
         related_name='interfaces'
     )
+    name = models.CharField(
+        max_length=64
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        naturalize_function=naturalize_interface,
+        max_length=100,
+        blank=True
+    )
     description = models.CharField(
         max_length=200,
         blank=True

From 1f9cdc71d4c15b18989d1d3081c06a8a9d916b6d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 13:07:32 -0400
Subject: [PATCH 288/505] Move device and device_type ForeignKeys to abstract
 component models

---
 netbox/dcim/filters.py                        |  20 +--
 netbox/dcim/forms.py                          |   2 +-
 .../0112_standardize_component_name.py        |  68 ----------
 .../migrations/0112_standardize_components.py | 120 ++++++++++++++++++
 netbox/dcim/models/__init__.py                |  52 ++++----
 .../dcim/models/device_component_templates.py |  47 +------
 netbox/dcim/models/device_components.py       |  56 ++------
 netbox/dcim/tests/test_views.py               |  16 +--
 netbox/templates/dcim/device.html             |   2 +-
 netbox/templates/dcim/devicetype.html         |  10 +-
 10 files changed, 186 insertions(+), 207 deletions(-)
 delete mode 100644 netbox/dcim/migrations/0112_standardize_component_name.py
 create mode 100644 netbox/dcim/migrations/0112_standardize_components.py

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 449a96dcc..fa0af7228 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -384,28 +384,28 @@ class DeviceTypeFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFil
         )
 
     def _console_ports(self, queryset, name, value):
-        return queryset.exclude(consoleport_templates__isnull=value)
+        return queryset.exclude(consoleporttemplates__isnull=value)
 
     def _console_server_ports(self, queryset, name, value):
-        return queryset.exclude(consoleserverport_templates__isnull=value)
+        return queryset.exclude(consoleserverporttemplates__isnull=value)
 
     def _power_ports(self, queryset, name, value):
-        return queryset.exclude(powerport_templates__isnull=value)
+        return queryset.exclude(powerporttemplates__isnull=value)
 
     def _power_outlets(self, queryset, name, value):
-        return queryset.exclude(poweroutlet_templates__isnull=value)
+        return queryset.exclude(poweroutlettemplates__isnull=value)
 
     def _interfaces(self, queryset, name, value):
-        return queryset.exclude(interface_templates__isnull=value)
+        return queryset.exclude(interfacetemplates__isnull=value)
 
     def _pass_through_ports(self, queryset, name, value):
         return queryset.exclude(
-            frontport_templates__isnull=value,
-            rearport_templates__isnull=value
+            frontporttemplates__isnull=value,
+            rearporttemplates__isnull=value
         )
 
     def _device_bays(self, queryset, name, value):
-        return queryset.exclude(device_bay_templates__isnull=value)
+        return queryset.exclude(devicebaytemplates__isnull=value)
 
 
 class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet):
@@ -656,7 +656,7 @@ class DeviceFilterSet(
         return queryset.filter(
             Q(name__icontains=value) |
             Q(serial__icontains=value.strip()) |
-            Q(inventory_items__serial__icontains=value.strip()) |
+            Q(inventoryitems__serial__icontains=value.strip()) |
             Q(asset_tag__icontains=value.strip()) |
             Q(comments__icontains=value)
         ).distinct()
@@ -698,7 +698,7 @@ class DeviceFilterSet(
         )
 
     def _device_bays(self, queryset, name, value):
-        return queryset.exclude(device_bays__isnull=value)
+        return queryset.exclude(devicebays__isnull=value)
 
 
 class DeviceComponentFilterSet(django_filters.FilterSet):
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 65cce8850..a35835732 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1392,7 +1392,7 @@ class FrontPortTemplateCreateForm(ComponentTemplateCreateForm):
         # Determine which rear port positions are occupied. These will be excluded from the list of available mappings.
         occupied_port_positions = [
             (front_port.rear_port_id, front_port.rear_port_position)
-            for front_port in device_type.frontport_templates.all()
+            for front_port in device_type.frontporttemplates.all()
         ]
 
         # Populate rear port choices
diff --git a/netbox/dcim/migrations/0112_standardize_component_name.py b/netbox/dcim/migrations/0112_standardize_component_name.py
deleted file mode 100644
index 1e12b1bf2..000000000
--- a/netbox/dcim/migrations/0112_standardize_component_name.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Generated by Django 3.0.6 on 2020-07-02 16:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0111_component_template_description'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='consoleport',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='consoleporttemplate',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='consoleserverport',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='consoleserverporttemplate',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='devicebay',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='devicebaytemplate',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='inventoryitem',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='poweroutlet',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='poweroutlettemplate',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='powerport',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-        migrations.AlterField(
-            model_name='powerporttemplate',
-            name='name',
-            field=models.CharField(max_length=64),
-        ),
-    ]
diff --git a/netbox/dcim/migrations/0112_standardize_components.py b/netbox/dcim/migrations/0112_standardize_components.py
new file mode 100644
index 000000000..1a3465e02
--- /dev/null
+++ b/netbox/dcim/migrations/0112_standardize_components.py
@@ -0,0 +1,120 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0111_component_template_description'),
+    ]
+
+    operations = [
+        # Set max_length=64 for all name fields
+        migrations.AlterField(
+            model_name='consoleport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='devicebay',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='devicebaytemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='inventoryitem',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlet',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlettemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='powerporttemplate',
+            name='name',
+            field=models.CharField(max_length=64),
+        ),
+
+        # Update related_name for necessary component and component template models
+        migrations.AlterField(
+            model_name='consoleporttemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleporttemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverporttemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consoleserverporttemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='devicebay',
+            name='device',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='devicebays', to='dcim.Device'),
+        ),
+        migrations.AlterField(
+            model_name='devicebaytemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='devicebaytemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='frontporttemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontporttemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='interfacetemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfacetemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='inventoryitem',
+            name='device',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='inventoryitems', to='dcim.Device'),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlettemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='poweroutlettemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='powerporttemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='powerporttemplates', to='dcim.DeviceType'),
+        ),
+        migrations.AlterField(
+            model_name='rearporttemplate',
+            name='device_type',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rearporttemplates', to='dcim.DeviceType'),
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 1aeedf1e5..db8fd8cf3 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -678,7 +678,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
                 'device_type__manufacturer',
                 'device_role'
             ).annotate(
-                devicebay_count=Count('device_bays')
+                devicebay_count=Count('devicebays')
             ).exclude(
                 pk=exclude
             ).filter(
@@ -1049,23 +1049,23 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         ))
 
         # Component templates
-        if self.consoleport_templates.exists():
+        if self.consoleporttemplates.exists():
             data['console-ports'] = [
                 {
                     'name': c.name,
                     'type': c.type,
                 }
-                for c in self.consoleport_templates.all()
+                for c in self.consoleporttemplates.all()
             ]
-        if self.consoleserverport_templates.exists():
+        if self.consoleserverporttemplates.exists():
             data['console-server-ports'] = [
                 {
                     'name': c.name,
                     'type': c.type,
                 }
-                for c in self.consoleserverport_templates.all()
+                for c in self.consoleserverporttemplates.all()
             ]
-        if self.powerport_templates.exists():
+        if self.powerporttemplates.exists():
             data['power-ports'] = [
                 {
                     'name': c.name,
@@ -1073,9 +1073,9 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
                     'maximum_draw': c.maximum_draw,
                     'allocated_draw': c.allocated_draw,
                 }
-                for c in self.powerport_templates.all()
+                for c in self.powerporttemplates.all()
             ]
-        if self.poweroutlet_templates.exists():
+        if self.poweroutlettemplates.exists():
             data['power-outlets'] = [
                 {
                     'name': c.name,
@@ -1083,18 +1083,18 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
                     'power_port': c.power_port.name if c.power_port else None,
                     'feed_leg': c.feed_leg,
                 }
-                for c in self.poweroutlet_templates.all()
+                for c in self.poweroutlettemplates.all()
             ]
-        if self.interface_templates.exists():
+        if self.interfacetemplates.exists():
             data['interfaces'] = [
                 {
                     'name': c.name,
                     'type': c.type,
                     'mgmt_only': c.mgmt_only,
                 }
-                for c in self.interface_templates.all()
+                for c in self.interfacetemplates.all()
             ]
-        if self.frontport_templates.exists():
+        if self.frontporttemplates.exists():
             data['front-ports'] = [
                 {
                     'name': c.name,
@@ -1102,23 +1102,23 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
                     'rear_port': c.rear_port.name,
                     'rear_port_position': c.rear_port_position,
                 }
-                for c in self.frontport_templates.all()
+                for c in self.frontporttemplates.all()
             ]
-        if self.rearport_templates.exists():
+        if self.rearporttemplates.exists():
             data['rear-ports'] = [
                 {
                     'name': c.name,
                     'type': c.type,
                     'positions': c.positions,
                 }
-                for c in self.rearport_templates.all()
+                for c in self.rearporttemplates.all()
             ]
-        if self.device_bay_templates.exists():
+        if self.devicebaytemplates.exists():
             data['device-bays'] = [
                 {
                     'name': c.name,
                 }
-                for c in self.device_bay_templates.all()
+                for c in self.devicebaytemplates.all()
             ]
 
         return yaml.dump(dict(data), sort_keys=False)
@@ -1159,7 +1159,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
 
         if (
                 self.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT
-        ) and self.device_bay_templates.count():
+        ) and self.devicebaytemplates.count():
             raise ValidationError({
                 'subdevice_role': "Must delete all device bay templates associated with this device before "
                                   "declassifying it as a parent device."
@@ -1634,28 +1634,28 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # If this is a new Device, instantiate all of the related components per the DeviceType definition
         if is_new:
             ConsolePort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleport_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.consoleporttemplates.unrestricted()]
             )
             ConsoleServerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleserverport_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.consoleserverporttemplates.unrestricted()]
             )
             PowerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.powerport_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.powerporttemplates.unrestricted()]
             )
             PowerOutlet.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.poweroutlet_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.poweroutlettemplates.unrestricted()]
             )
             Interface.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.interface_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.interfacetemplates.unrestricted()]
             )
             RearPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.rearport_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.rearporttemplates.unrestricted()]
             )
             FrontPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.frontport_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.frontporttemplates.unrestricted()]
             )
             DeviceBay.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.device_bay_templates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.devicebaytemplates.unrestricted()]
             )
 
         # Update Site and Rack assignment for any child Devices
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index a7b76fdde..7e96a8016 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -27,6 +27,11 @@ __all__ = (
 
 
 class ComponentTemplateModel(models.Model):
+    device_type = models.ForeignKey(
+        to='dcim.DeviceType',
+        on_delete=models.CASCADE,
+        related_name='%(class)ss'
+    )
     name = models.CharField(
         max_length=64
     )
@@ -81,11 +86,6 @@ class ConsolePortTemplate(ComponentTemplateModel):
     """
     A template for a ConsolePort to be created for a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='consoleport_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -108,11 +108,6 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
     """
     A template for a ConsoleServerPort to be created for a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='consoleserverport_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -135,11 +130,6 @@ class PowerPortTemplate(ComponentTemplateModel):
     """
     A template for a PowerPort to be created for a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='powerport_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -176,11 +166,6 @@ class PowerOutletTemplate(ComponentTemplateModel):
     """
     A template for a PowerOutlet to be created for a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='poweroutlet_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -230,11 +215,7 @@ class InterfaceTemplate(ComponentTemplateModel):
     """
     A template for a physical data interface on a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='interface_templates'
-    )
+    # Override ComponentTemplateModel._name to specify naturalize_interface function
     _name = NaturalOrderingField(
         target_field='name',
         naturalize_function=naturalize_interface,
@@ -267,11 +248,6 @@ class FrontPortTemplate(ComponentTemplateModel):
     """
     Template for a pass-through port on the front of a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='frontport_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -327,11 +303,6 @@ class RearPortTemplate(ComponentTemplateModel):
     """
     Template for a pass-through port on the rear of a new Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='rearport_templates'
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -358,12 +329,6 @@ class DeviceBayTemplate(ComponentTemplateModel):
     """
     A template for a DeviceBay to be created for a new parent Device.
     """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.CASCADE,
-        related_name='device_bay_templates'
-    )
-
     class Meta:
         ordering = ('device_type', '_name')
         unique_together = ('device_type', 'name')
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 6a2591916..1ebb0c4d5 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -36,6 +36,11 @@ __all__ = (
 
 
 class ComponentModel(models.Model):
+    device = models.ForeignKey(
+        to='dcim.Device',
+        on_delete=models.CASCADE,
+        related_name='%(class)ss'
+    )
     name = models.CharField(
         max_length=64
     )
@@ -246,11 +251,6 @@ class ConsolePort(CableTermination, ComponentModel):
     """
     A physical console port within a Device. ConsolePorts connect to ConsoleServerPorts.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='consoleports'
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -298,11 +298,6 @@ class ConsoleServerPort(CableTermination, ComponentModel):
     """
     A physical port within a Device (typically a designated console server) which provides access to ConsolePorts.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='consoleserverports'
-    )
     type = models.CharField(
         max_length=50,
         choices=ConsolePortTypeChoices,
@@ -343,11 +338,6 @@ class PowerPort(CableTermination, ComponentModel):
     """
     A physical power supply (intake) port within a Device. PowerPorts connect to PowerOutlets.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='powerports'
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerPortTypeChoices,
@@ -496,11 +486,6 @@ class PowerOutlet(CableTermination, ComponentModel):
     """
     A physical power outlet (output) within a Device which provides power to a PowerPort.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='poweroutlets'
-    )
     type = models.CharField(
         max_length=50,
         choices=PowerOutletTypeChoices,
@@ -560,6 +545,9 @@ class PowerOutlet(CableTermination, ComponentModel):
 #
 
 class BaseInterface(models.Model):
+    """
+    Abstract base class for fields shared by dcim.Interface and virtualization.VMInterface.
+    """
     enabled = models.BooleanField(
         default=True
     )
@@ -589,13 +577,7 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
     """
     A network interface within a Device. A physical Interface can connect to exactly one other Interface.
     """
-    device = models.ForeignKey(
-        to='Device',
-        on_delete=models.CASCADE,
-        related_name='interfaces',
-        null=True,
-        blank=True
-    )
+    # Override ComponentModel._name to specify naturalize_interface function
     _name = NaturalOrderingField(
         target_field='name',
         naturalize_function=naturalize_interface,
@@ -807,11 +789,6 @@ class FrontPort(CableTermination, ComponentModel):
     """
     A pass-through port on the front of a Device.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='frontports'
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -872,11 +849,6 @@ class RearPort(CableTermination, ComponentModel):
     """
     A pass-through port on the rear of a Device.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='rearports'
-    )
     type = models.CharField(
         max_length=50,
         choices=PortTypeChoices
@@ -916,11 +888,6 @@ class DeviceBay(ComponentModel):
     """
     An empty space within a Device which can house a child device
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='device_bays'
-    )
     installed_device = models.OneToOneField(
         to='dcim.Device',
         on_delete=models.SET_NULL,
@@ -981,11 +948,6 @@ class InventoryItem(ComponentModel):
     An InventoryItem represents a serialized piece of hardware within a Device, such as a line card or power supply.
     InventoryItems are used only for inventory purposes.
     """
-    device = models.ForeignKey(
-        to='dcim.Device',
-        on_delete=models.CASCADE,
-        related_name='inventory_items'
-    )
     parent = models.ForeignKey(
         to='self',
         on_delete=models.CASCADE,
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index e1baadcc1..ef7ff993f 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -481,45 +481,45 @@ device-bays:
         self.assertEqual(dt.comments, 'test comment')
 
         # Verify all of the components were created
-        self.assertEqual(dt.consoleport_templates.count(), 3)
+        self.assertEqual(dt.consoleporttemplates.count(), 3)
         cp1 = ConsolePortTemplate.objects.first()
         self.assertEqual(cp1.name, 'Console Port 1')
         self.assertEqual(cp1.type, ConsolePortTypeChoices.TYPE_DE9)
 
-        self.assertEqual(dt.consoleserverport_templates.count(), 3)
+        self.assertEqual(dt.consoleserverporttemplates.count(), 3)
         csp1 = ConsoleServerPortTemplate.objects.first()
         self.assertEqual(csp1.name, 'Console Server Port 1')
         self.assertEqual(csp1.type, ConsolePortTypeChoices.TYPE_RJ45)
 
-        self.assertEqual(dt.powerport_templates.count(), 3)
+        self.assertEqual(dt.powerporttemplates.count(), 3)
         pp1 = PowerPortTemplate.objects.first()
         self.assertEqual(pp1.name, 'Power Port 1')
         self.assertEqual(pp1.type, PowerPortTypeChoices.TYPE_IEC_C14)
 
-        self.assertEqual(dt.poweroutlet_templates.count(), 3)
+        self.assertEqual(dt.poweroutlettemplates.count(), 3)
         po1 = PowerOutletTemplate.objects.first()
         self.assertEqual(po1.name, 'Power Outlet 1')
         self.assertEqual(po1.type, PowerOutletTypeChoices.TYPE_IEC_C13)
         self.assertEqual(po1.power_port, pp1)
         self.assertEqual(po1.feed_leg, PowerOutletFeedLegChoices.FEED_LEG_A)
 
-        self.assertEqual(dt.interface_templates.count(), 3)
+        self.assertEqual(dt.interfacetemplates.count(), 3)
         iface1 = InterfaceTemplate.objects.first()
         self.assertEqual(iface1.name, 'Interface 1')
         self.assertEqual(iface1.type, InterfaceTypeChoices.TYPE_1GE_FIXED)
         self.assertTrue(iface1.mgmt_only)
 
-        self.assertEqual(dt.rearport_templates.count(), 3)
+        self.assertEqual(dt.rearporttemplates.count(), 3)
         rp1 = RearPortTemplate.objects.first()
         self.assertEqual(rp1.name, 'Rear Port 1')
 
-        self.assertEqual(dt.frontport_templates.count(), 3)
+        self.assertEqual(dt.frontporttemplates.count(), 3)
         fp1 = FrontPortTemplate.objects.first()
         self.assertEqual(fp1.name, 'Front Port 1')
         self.assertEqual(fp1.rear_port, rp1)
         self.assertEqual(fp1.rear_port_position, 1)
 
-        self.assertEqual(dt.device_bay_templates.count(), 3)
+        self.assertEqual(dt.devicebaytemplates.count(), 3)
         db1 = DeviceBayTemplate.objects.first()
         self.assertEqual(db1.name, 'Device Bay 1')
 
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 01f125db4..408d0d833 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -101,7 +101,7 @@
         </li>
         <li role="presentation"{% if active_tab == 'inventory' %} class="active"{% endif %}>
             <a href="{% url 'dcim:device_inventory' pk=device.pk %}">
-                Inventory <span class="badge">{{ device.inventory_items.count }}</span>
+                Inventory <span class="badge">{{ device.inventoryitems.count }}</span>
             </a>
         </li>
         {% if perms.dcim.napalm_read_device %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 7ca29a1f7..ad0e070e9 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -155,7 +155,7 @@
         {% plugin_right_page devicetype %}
     </div>
 </div>
-{% if devicetype.consoleport_templates.exists or devicetype.powerport_templates.exists %}
+{% if devicetype.consoleporttemplates.exists or devicetype.powerporttemplates.exists %}
     <div class="row">
         <div class="col-md-6">
             {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:consoleporttemplate_add' edit_url='dcim:consoleporttemplate_bulk_edit' delete_url='dcim:consoleporttemplate_bulk_delete' %}
@@ -177,28 +177,28 @@
         </div>
     </div>
 {% endif %}
-{% if devicetype.consoleserverport_templates.exists %}
+{% if devicetype.consoleserverporttemplates.exists %}
     <div class="row">
         <div class="col-md-12">
             {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:consoleserverporttemplate_add' edit_url='dcim:consoleserverporttemplate_bulk_edit' delete_url='dcim:consoleserverporttemplate_bulk_delete' %}
         </div>
     </div>
 {% endif %}
-{% if devicetype.poweroutlet_templates.exists %}
+{% if devicetype.poweroutlettemplates.exists %}
     <div class="row">
         <div class="col-md-12">
             {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:poweroutlettemplate_add' edit_url='dcim:poweroutlettemplate_bulk_edit' delete_url='dcim:poweroutlettemplate_bulk_delete' %}
         </div>
     </div>
 {% endif %}
-{% if devicetype.interface_templates.exists %}
+{% if devicetype.interfacetemplates.exists %}
     <div class="row">
         <div class="col-md-12">
             {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:interfacetemplate_add' edit_url='dcim:interfacetemplate_bulk_edit' delete_url='dcim:interfacetemplate_bulk_delete' %}
         </div>
     </div>
 {% endif %}
-{% if devicetype.frontport_templates.exists or devicetype.rearport_templates.exists %}
+{% if devicetype.frontporttemplates.exists or devicetype.rearporttemplates.exists %}
     <div class="row">
         <div class="col-md-6">
             {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' add_url='dcim:frontporttemplate_add' edit_url='dcim:frontporttemplate_bulk_edit' delete_url='dcim:frontporttemplate_bulk_delete' %}

From 6abb7e8f4dbaf2e7a14daa7fda302bb400431c19 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 13:12:37 -0400
Subject: [PATCH 289/505] #4721: Tweak migrations to ensure Interface.device
 cannot be null

---
 netbox/dcim/migrations/0109_interface_remove_vm.py   | 12 +++++++++---
 .../migrations/0016_replicate_interfaces.py          |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/migrations/0109_interface_remove_vm.py b/netbox/dcim/migrations/0109_interface_remove_vm.py
index 97a84a43e..6e1d727b0 100644
--- a/netbox/dcim/migrations/0109_interface_remove_vm.py
+++ b/netbox/dcim/migrations/0109_interface_remove_vm.py
@@ -1,6 +1,5 @@
-# Generated by Django 3.0.6 on 2020-06-22 16:03
-
-from django.db import migrations
+from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -15,4 +14,11 @@ class Migration(migrations.Migration):
             model_name='interface',
             name='virtual_machine',
         ),
+        # device is now a required field
+        migrations.AlterField(
+            model_name='interface',
+            name='device',
+            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='dcim.Device'),
+            preserve_default=False,
+        ),
     ]
diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index d6c0b0217..e141dff04 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -51,8 +51,8 @@ def replicate_interfaces(apps, schema_editor):
     # Verify that all interfaces have been replicated
     assert replicated_count == original_interfaces.count(), "Replicated interfaces count does not match original count!"
 
-    # Delete original VM interfaces
-    original_interfaces.delete()
+    # Delete all interfaces not assigned to a Device
+    Interface.objects.filter(device__isnull=True).delete()
 
 
 class Migration(migrations.Migration):

From eb2da300b0f78dfd909812fb52c2401356f9586a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 13:27:54 -0400
Subject: [PATCH 290/505] Fix form initialization for interface import

---
 netbox/dcim/forms.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index a35835732..dcc1f6418 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2978,13 +2978,12 @@ class InterfaceCSVForm(CSVModelForm):
         super().__init__(*args, **kwargs)
 
         # Limit LAG choices to interfaces belonging to this device (or VC master)
+        device = None
         if self.is_bound and 'device' in self.data:
             try:
                 device = self.fields['device'].to_python(self.data['device'])
             except forms.ValidationError:
-                device = None
-        else:
-            device = self.instance.device
+                pass
 
         if device:
             self.fields['lag'].queryset = Interface.objects.filter(

From 92c889ef9ec14a43616dd09bc09d89740d3808d7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 13:58:53 -0400
Subject: [PATCH 291/505] #4416: Provide bulk rename ability for device
 component templates

---
 netbox/dcim/urls.py                           |  8 +++++
 netbox/dcim/views.py                          | 32 +++++++++++++++++++
 netbox/templates/dcim/devicetype.html         | 16 +++++-----
 .../dcim/inc/devicetype_component_table.html  | 22 ++++++-------
 4 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 7af91f0ae..63ae5d2a4 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -98,6 +98,7 @@ urlpatterns = [
     # Console port templates
     path('console-port-templates/add/', views.ConsolePortTemplateCreateView.as_view(), name='consoleporttemplate_add'),
     path('console-port-templates/edit/', views.ConsolePortTemplateBulkEditView.as_view(), name='consoleporttemplate_bulk_edit'),
+    path('console-port-templates/rename/', views.ConsolePortTemplateBulkRenameView.as_view(), name='consoleporttemplate_bulk_rename'),
     path('console-port-templates/delete/', views.ConsolePortTemplateBulkDeleteView.as_view(), name='consoleporttemplate_bulk_delete'),
     path('console-port-templates/<int:pk>/edit/', views.ConsolePortTemplateEditView.as_view(), name='consoleporttemplate_edit'),
     path('console-port-templates/<int:pk>/delete/', views.ConsolePortTemplateDeleteView.as_view(), name='consoleporttemplate_delete'),
@@ -105,6 +106,7 @@ urlpatterns = [
     # Console server port templates
     path('console-server-port-templates/add/', views.ConsoleServerPortTemplateCreateView.as_view(), name='consoleserverporttemplate_add'),
     path('console-server-port-templates/edit/', views.ConsoleServerPortTemplateBulkEditView.as_view(), name='consoleserverporttemplate_bulk_edit'),
+    path('console-server-port-templates/rename/', views.ConsoleServerPortTemplateBulkRenameView.as_view(), name='consoleserverporttemplate_bulk_rename'),
     path('console-server-port-templates/delete/', views.ConsoleServerPortTemplateBulkDeleteView.as_view(), name='consoleserverporttemplate_bulk_delete'),
     path('console-server-port-templates/<int:pk>/edit/', views.ConsoleServerPortTemplateEditView.as_view(), name='consoleserverporttemplate_edit'),
     path('console-server-port-templates/<int:pk>/delete/', views.ConsoleServerPortTemplateDeleteView.as_view(), name='consoleserverporttemplate_delete'),
@@ -112,6 +114,7 @@ urlpatterns = [
     # Power port templates
     path('power-port-templates/add/', views.PowerPortTemplateCreateView.as_view(), name='powerporttemplate_add'),
     path('power-port-templates/edit/', views.PowerPortTemplateBulkEditView.as_view(), name='powerporttemplate_bulk_edit'),
+    path('power-port-templates/rename/', views.PowerPortTemplateBulkRenameView.as_view(), name='powerporttemplate_bulk_rename'),
     path('power-port-templates/delete/', views.PowerPortTemplateBulkDeleteView.as_view(), name='powerporttemplate_bulk_delete'),
     path('power-port-templates/<int:pk>/edit/', views.PowerPortTemplateEditView.as_view(), name='powerporttemplate_edit'),
     path('power-port-templates/<int:pk>/delete/', views.PowerPortTemplateDeleteView.as_view(), name='powerporttemplate_delete'),
@@ -119,6 +122,7 @@ urlpatterns = [
     # Power outlet templates
     path('power-outlet-templates/add/', views.PowerOutletTemplateCreateView.as_view(), name='poweroutlettemplate_add'),
     path('power-outlet-templates/edit/', views.PowerOutletTemplateBulkEditView.as_view(), name='poweroutlettemplate_bulk_edit'),
+    path('power-outlet-templates/rename/', views.PowerOutletTemplateBulkRenameView.as_view(), name='poweroutlettemplate_bulk_rename'),
     path('power-outlet-templates/delete/', views.PowerOutletTemplateBulkDeleteView.as_view(), name='poweroutlettemplate_bulk_delete'),
     path('power-outlet-templates/<int:pk>/edit/', views.PowerOutletTemplateEditView.as_view(), name='poweroutlettemplate_edit'),
     path('power-outlet-templates/<int:pk>/delete/', views.PowerOutletTemplateDeleteView.as_view(), name='poweroutlettemplate_delete'),
@@ -126,6 +130,7 @@ urlpatterns = [
     # Interface templates
     path('interface-templates/add/', views.InterfaceTemplateCreateView.as_view(), name='interfacetemplate_add'),
     path('interface-templates/edit/', views.InterfaceTemplateBulkEditView.as_view(), name='interfacetemplate_bulk_edit'),
+    path('interface-templates/rename/', views.InterfaceTemplateBulkRenameView.as_view(), name='interfacetemplate_bulk_rename'),
     path('interface-templates/delete/', views.InterfaceTemplateBulkDeleteView.as_view(), name='interfacetemplate_bulk_delete'),
     path('interface-templates/<int:pk>/edit/', views.InterfaceTemplateEditView.as_view(), name='interfacetemplate_edit'),
     path('interface-templates/<int:pk>/delete/', views.InterfaceTemplateDeleteView.as_view(), name='interfacetemplate_delete'),
@@ -133,6 +138,7 @@ urlpatterns = [
     # Front port templates
     path('front-port-templates/add/', views.FrontPortTemplateCreateView.as_view(), name='frontporttemplate_add'),
     path('front-port-templates/edit/', views.FrontPortTemplateBulkEditView.as_view(), name='frontporttemplate_bulk_edit'),
+    path('front-port-templates/rename/', views.FrontPortTemplateBulkRenameView.as_view(), name='frontporttemplate_bulk_rename'),
     path('front-port-templates/delete/', views.FrontPortTemplateBulkDeleteView.as_view(), name='frontporttemplate_bulk_delete'),
     path('front-port-templates/<int:pk>/edit/', views.FrontPortTemplateEditView.as_view(), name='frontporttemplate_edit'),
     path('front-port-templates/<int:pk>/delete/', views.FrontPortTemplateDeleteView.as_view(), name='frontporttemplate_delete'),
@@ -140,6 +146,7 @@ urlpatterns = [
     # Rear port templates
     path('rear-port-templates/add/', views.RearPortTemplateCreateView.as_view(), name='rearporttemplate_add'),
     path('rear-port-templates/edit/', views.RearPortTemplateBulkEditView.as_view(), name='rearporttemplate_bulk_edit'),
+    path('rear-port-templates/rename/', views.RearPortTemplateBulkRenameView.as_view(), name='rearporttemplate_bulk_rename'),
     path('rear-port-templates/delete/', views.RearPortTemplateBulkDeleteView.as_view(), name='rearporttemplate_bulk_delete'),
     path('rear-port-templates/<int:pk>/edit/', views.RearPortTemplateEditView.as_view(), name='rearporttemplate_edit'),
     path('rear-port-templates/<int:pk>/delete/', views.RearPortTemplateDeleteView.as_view(), name='rearporttemplate_delete'),
@@ -147,6 +154,7 @@ urlpatterns = [
     # Device bay templates
     path('device-bay-templates/add/', views.DeviceBayTemplateCreateView.as_view(), name='devicebaytemplate_add'),
     path('device-bay-templates/edit/', views.DeviceBayTemplateBulkEditView.as_view(), name='devicebaytemplate_bulk_edit'),
+    path('device-bay-templates/rename/', views.DeviceBayTemplateBulkRenameView.as_view(), name='devicebaytemplate_bulk_rename'),
     path('device-bay-templates/delete/', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicebaytemplate_bulk_delete'),
     path('device-bay-templates/<int:pk>/edit/', views.DeviceBayTemplateEditView.as_view(), name='devicebaytemplate_edit'),
     path('device-bay-templates/<int:pk>/delete/', views.DeviceBayTemplateDeleteView.as_view(), name='devicebaytemplate_delete'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0c373cb24..2376e5430 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -640,6 +640,10 @@ class ConsolePortTemplateBulkEditView(BulkEditView):
     form = forms.ConsolePortTemplateBulkEditForm
 
 
+class ConsolePortTemplateBulkRenameView(BulkRenameView):
+    queryset = ConsolePortTemplate.objects.all()
+
+
 class ConsolePortTemplateBulkDeleteView(BulkDeleteView):
     queryset = ConsolePortTemplate.objects.all()
     table = tables.ConsolePortTemplateTable
@@ -671,6 +675,10 @@ class ConsoleServerPortTemplateBulkEditView(BulkEditView):
     form = forms.ConsoleServerPortTemplateBulkEditForm
 
 
+class ConsoleServerPortTemplateBulkRenameView(BulkRenameView):
+    queryset = ConsoleServerPortTemplate.objects.all()
+
+
 class ConsoleServerPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = ConsoleServerPortTemplate.objects.all()
     table = tables.ConsoleServerPortTemplateTable
@@ -702,6 +710,10 @@ class PowerPortTemplateBulkEditView(BulkEditView):
     form = forms.PowerPortTemplateBulkEditForm
 
 
+class PowerPortTemplateBulkRenameView(BulkRenameView):
+    queryset = PowerPortTemplate.objects.all()
+
+
 class PowerPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = PowerPortTemplate.objects.all()
     table = tables.PowerPortTemplateTable
@@ -733,6 +745,10 @@ class PowerOutletTemplateBulkEditView(BulkEditView):
     form = forms.PowerOutletTemplateBulkEditForm
 
 
+class PowerOutletTemplateBulkRenameView(BulkRenameView):
+    queryset = PowerOutletTemplate.objects.all()
+
+
 class PowerOutletTemplateBulkDeleteView(BulkDeleteView):
     queryset = PowerOutletTemplate.objects.all()
     table = tables.PowerOutletTemplateTable
@@ -764,6 +780,10 @@ class InterfaceTemplateBulkEditView(BulkEditView):
     form = forms.InterfaceTemplateBulkEditForm
 
 
+class InterfaceTemplateBulkRenameView(BulkRenameView):
+    queryset = InterfaceTemplate.objects.all()
+
+
 class InterfaceTemplateBulkDeleteView(BulkDeleteView):
     queryset = InterfaceTemplate.objects.all()
     table = tables.InterfaceTemplateTable
@@ -795,6 +815,10 @@ class FrontPortTemplateBulkEditView(BulkEditView):
     form = forms.FrontPortTemplateBulkEditForm
 
 
+class FrontPortTemplateBulkRenameView(BulkRenameView):
+    queryset = FrontPortTemplate.objects.all()
+
+
 class FrontPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = FrontPortTemplate.objects.all()
     table = tables.FrontPortTemplateTable
@@ -826,6 +850,10 @@ class RearPortTemplateBulkEditView(BulkEditView):
     form = forms.RearPortTemplateBulkEditForm
 
 
+class RearPortTemplateBulkRenameView(BulkRenameView):
+    queryset = RearPortTemplate.objects.all()
+
+
 class RearPortTemplateBulkDeleteView(BulkDeleteView):
     queryset = RearPortTemplate.objects.all()
     table = tables.RearPortTemplateTable
@@ -857,6 +885,10 @@ class DeviceBayTemplateBulkEditView(BulkEditView):
     form = forms.DeviceBayTemplateBulkEditForm
 
 
+class DeviceBayTemplateBulkRenameView(BulkRenameView):
+    queryset = DeviceBayTemplate.objects.all()
+
+
 class DeviceBayTemplateBulkDeleteView(BulkDeleteView):
     queryset = DeviceBayTemplate.objects.all()
     table = tables.DeviceBayTemplateTable
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index ad0e070e9..03d314aa6 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -158,10 +158,10 @@
 {% if devicetype.consoleporttemplates.exists or devicetype.powerporttemplates.exists %}
     <div class="row">
         <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:consoleporttemplate_add' edit_url='dcim:consoleporttemplate_bulk_edit' delete_url='dcim:consoleporttemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' %}
         </div>
         <div class="col-md-6">
-             {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:powerporttemplate_add' edit_url='dcim:powerporttemplate_bulk_edit' delete_url='dcim:powerporttemplate_bulk_delete' %}
+             {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' %}
         </div>
     </div>
 {% endif %}
@@ -173,38 +173,38 @@
 {% if devicetype.is_parent_device or devicebay_table.rows %}
     <div class="row">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicebaytemplate_add' edit_url='dcim:devicebaytemplate_bulk_edit' delete_url='dcim:devicebaytemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' %}
         </div>
     </div>
 {% endif %}
 {% if devicetype.consoleserverporttemplates.exists %}
     <div class="row">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:consoleserverporttemplate_add' edit_url='dcim:consoleserverporttemplate_bulk_edit' delete_url='dcim:consoleserverporttemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' %}
         </div>
     </div>
 {% endif %}
 {% if devicetype.poweroutlettemplates.exists %}
     <div class="row">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:poweroutlettemplate_add' edit_url='dcim:poweroutlettemplate_bulk_edit' delete_url='dcim:poweroutlettemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' %}
         </div>
     </div>
 {% endif %}
 {% if devicetype.interfacetemplates.exists %}
     <div class="row">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:interfacetemplate_add' edit_url='dcim:interfacetemplate_bulk_edit' delete_url='dcim:interfacetemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' %}
         </div>
     </div>
 {% endif %}
 {% if devicetype.frontporttemplates.exists or devicetype.rearporttemplates.exists %}
     <div class="row">
         <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' add_url='dcim:frontporttemplate_add' edit_url='dcim:frontporttemplate_bulk_edit' delete_url='dcim:frontporttemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' %}
         </div>
         <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' add_url='dcim:rearporttemplate_add' edit_url='dcim:rearporttemplate_bulk_edit' delete_url='dcim:rearporttemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' %}
         </div>
     </div>
 {% endif %}
diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html
index 010749b93..135facc73 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/inc/devicetype_component_table.html
@@ -1,3 +1,4 @@
+{% load helpers %}
 {% if perms.dcim.change_devicetype %}
     <form method="post">
         {% csrf_token %}
@@ -8,19 +9,18 @@
             {% include 'responsive_table.html' %}
             <div class="panel-footer noprint">
                 {% if table.rows %}
-                    {% if edit_url %}
-                        <button type="submit" name="_edit" formaction="{% url edit_url %}?device_type={{ devicetype.pk }}&return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-warning">
-                            <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit Selected
-                        </button>
-                    {% endif %}
-                    {% if delete_url %}
-                        <button type="submit" name="_delete" formaction="{% url delete_url %}?device_type={{ devicetype.pk }}&return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-danger">
-                            <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete Selected
-                        </button>
-                    {% endif %}
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-warning">
+                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                    </button>
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-warning">
+                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                    </button>
+                    <button type="submit" name="_delete" formaction="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-danger">
+                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                    </button>
                 {% endif %}
                 <div class="pull-right">
-                    <a href="{% url add_url %}?device_type={{ devicetype.pk }}&return_url={{ devicetype.get_absolute_url }}" class="btn btn-primary btn-xs">
+                    <a href="{% url table.Meta.model|viewname:"add" %}?device_type={{ devicetype.pk }}&return_url={{ devicetype.get_absolute_url }}" class="btn btn-primary btn-xs">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                         Add {{ title }}
                     </a>

From a1e5a8b86a6f3cf83aa24b2cca10446976700dcb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 14:29:23 -0400
Subject: [PATCH 292/505] Introduce badge template tag

---
 netbox/templates/utilities/templatetags/badge.html |  1 +
 netbox/utilities/templatetags/helpers.py           | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 netbox/templates/utilities/templatetags/badge.html

diff --git a/netbox/templates/utilities/templatetags/badge.html b/netbox/templates/utilities/templatetags/badge.html
new file mode 100644
index 000000000..3b0ddd7d7
--- /dev/null
+++ b/netbox/templates/utilities/templatetags/badge.html
@@ -0,0 +1 @@
+{% if value or show_empty %}<span class="badge">{{ value }}</span>{% endif %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index e6a245a04..ab44658b4 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -242,3 +242,14 @@ def tag(tag, url_name=None):
         'tag': tag,
         'url_name': url_name,
     }
+
+
+@register.inclusion_tag('utilities/templatetags/badge.html')
+def badge(value, show_empty=False):
+    """
+    Display the specified number as a badge.
+    """
+    return {
+        'value': value,
+        'show_empty': show_empty,
+    }

From 7b33fac71df5e174bb7d5107b42bf0a1acc46b9d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 14:30:29 -0400
Subject: [PATCH 293/505] Display component templates under tabs

---
 netbox/templates/dcim/devicetype.html | 286 +++++++++++++-------------
 1 file changed, 147 insertions(+), 139 deletions(-)

diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 03d314aa6..b9db8db6f 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -63,149 +63,157 @@
 {% endblock %}
 
 {% block content %}
-<div class="row">
-    <div class="col-md-6">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Chassis</strong>
+    <div class="row">
+        <div class="col-md-6">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Chassis</strong>
+                </div>
+                <table class="table table-hover panel-body attr-table">
+                    <tr>
+                        <td>Manufacturer</td>
+                        <td><a href="{% url 'dcim:devicetype_list' %}?manufacturer={{ devicetype.manufacturer.slug }}">{{ devicetype.manufacturer }}</a></td>
+                    </tr>
+                    <tr>
+                        <td>Model Name</td>
+                        <td>
+                            {{ devicetype.model }}<br/>
+                            <small class="text-muted">{{ devicetype.slug }}</small>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Part Number</td>
+                        <td>{{ devicetype.part_number|placeholder }}</td>
+                    </tr>
+                    <tr>
+                        <td>Height (U)</td>
+                        <td>{{ devicetype.u_height }}</td>
+                    </tr>
+                    <tr>
+                        <td>Full Depth</td>
+                        <td>
+                            {% if devicetype.is_full_depth %}
+                                <i class="glyphicon glyphicon-ok text-success" title="Yes"></i>
+                            {% else %}
+                                <i class="glyphicon glyphicon-remove text-danger" title="No"></i>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Parent/Child</td>
+                        <td>
+                            {{ devicetype.get_subdevice_role_display|placeholder }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Front Image</td>
+                        <td>
+                            {% if devicetype.front_image %}
+                                <a href="{{ devicetype.front_image.url }}">
+                                    <img src="{{ devicetype.front_image.url }}" alt="{{ devicetype.front_image.name }}" class="img-responsive" />
+                                </a>
+                            {% else %}
+                                <span class="text-muted">&mdash;</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Rear Image</td>
+                        <td>
+                            {% if devicetype.rear_image %}
+                                <a href="{{ devicetype.rear_image.url }}">
+                                    <img src="{{ devicetype.rear_image.url }}" alt="{{ devicetype.rear_image.name }}" class="img-responsive" />
+                                </a>
+                            {% else %}
+                                <span class="text-muted">&mdash;</span>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Instances</td>
+                        <td><a href="{% url 'dcim:device_list' %}?device_type_id={{ devicetype.pk }}">{{ instance_count }}</a></td>
+                    </tr>
+                </table>
             </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Manufacturer</td>
-                    <td><a href="{% url 'dcim:devicetype_list' %}?manufacturer={{ devicetype.manufacturer.slug }}">{{ devicetype.manufacturer }}</a></td>
-                </tr>
-                <tr>
-                    <td>Model Name</td>
-                    <td>
-                        {{ devicetype.model }}<br/>
-                        <small class="text-muted">{{ devicetype.slug }}</small>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Part Number</td>
-                    <td>{{ devicetype.part_number|placeholder }}</td>
-                </tr>
-                <tr>
-                    <td>Height (U)</td>
-                    <td>{{ devicetype.u_height }}</td>
-                </tr>
-                <tr>
-                    <td>Full Depth</td>
-                    <td>
-                        {% if devicetype.is_full_depth %}
-                            <i class="glyphicon glyphicon-ok text-success" title="Yes"></i>
-                        {% else %}
-                            <i class="glyphicon glyphicon-remove text-danger" title="No"></i>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Parent/Child</td>
-                    <td>
-                        {{ devicetype.get_subdevice_role_display|placeholder }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Front Image</td>
-                    <td>
-                        {% if devicetype.front_image %}
-                            <a href="{{ devicetype.front_image.url }}">
-                                <img src="{{ devicetype.front_image.url }}" alt="{{ devicetype.front_image.name }}" class="img-responsive" />
-                            </a>
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Rear Image</td>
-                    <td>
-                        {% if devicetype.rear_image %}
-                            <a href="{{ devicetype.rear_image.url }}">
-                                <img src="{{ devicetype.rear_image.url }}" alt="{{ devicetype.rear_image.name }}" class="img-responsive" />
-                            </a>
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Instances</td>
-                    <td><a href="{% url 'dcim:device_list' %}?device_type_id={{ devicetype.pk }}">{{ instance_count }}</a></td>
-                </tr>
-            </table>
+            {% plugin_left_page devicetype %}
         </div>
-        {% plugin_left_page devicetype %}
-    </div>
-    <div class="col-md-6">
-        {% include 'inc/custom_fields_panel.html' with obj=devicetype %}
-        {% include 'extras/inc/tags_panel.html' with tags=devicetype.tags.all url='dcim:devicetype_list' %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
+        <div class="col-md-6">
+            {% include 'inc/custom_fields_panel.html' with obj=devicetype %}
+            {% include 'extras/inc/tags_panel.html' with tags=devicetype.tags.all url='dcim:devicetype_list' %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Comments</strong>
+                </div>
+                <div class="panel-body rendered-markdown">
+                    {% if devicetype.comments %}
+                        {{ devicetype.comments|render_markdown }}
+                    {% else %}
+                        <span class="text-muted">None</span>
+                    {% endif %}
+                </div>
             </div>
-            <div class="panel-body rendered-markdown">
-                {% if devicetype.comments %}
-                    {{ devicetype.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
+            {% plugin_right_page devicetype %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            {% plugin_full_width_page devicetype %}
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active">
+                    <a href="#interfaces" role="tab" data-toggle="tab">Interfaces {% badge interface_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#frontports" role="tab" data-toggle="tab">Front Ports {% badge front_port_table_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#rearports" role="tab" data-toggle="tab">Rear Ports {% badge rear_port_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#consoleports" role="tab" data-toggle="tab">Console Ports {% badge consoleport_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#consoleserverports" role="tab" data-toggle="tab">Console Server Ports {% badge consoleserverport_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#powerports" role="tab" data-toggle="tab">Power Ports {% badge powerport_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#poweroutlets" role="tab" data-toggle="tab">Power Outlets {% badge poweroutlet_table.rows|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#devicebays" role="tab" data-toggle="tab">Device Bays {% badge devicebay_table.rows|length %}</a>
+                </li>
+            </ul>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="interfaces">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="frontports">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="rearports">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="consoleports">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="consoleserverports">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="powerports">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="poweroutlets">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' %}
+                </div>
+                <div role="tabpanel" class="tab-pane" id="devicebays">
+                    {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' %}
+                </div>
             </div>
         </div>
-        {% plugin_right_page devicetype %}
     </div>
-</div>
-{% if devicetype.consoleporttemplates.exists or devicetype.powerporttemplates.exists %}
-    <div class="row">
-        <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' %}
-        </div>
-        <div class="col-md-6">
-             {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' %}
-        </div>
-    </div>
-{% endif %}
-<div class="row">
-    <div class="col-md-12">
-        {% plugin_full_width_page devicetype %}
-    </div>
-</div>
-{% if devicetype.is_parent_device or devicebay_table.rows %}
-    <div class="row">
-        <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' %}
-        </div>
-    </div>
-{% endif %}
-{% if devicetype.consoleserverporttemplates.exists %}
-    <div class="row">
-        <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' %}
-        </div>
-    </div>
-{% endif %}
-{% if devicetype.poweroutlettemplates.exists %}
-    <div class="row">
-        <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' %}
-        </div>
-    </div>
-{% endif %}
-{% if devicetype.interfacetemplates.exists %}
-    <div class="row">
-        <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' %}
-        </div>
-    </div>
-{% endif %}
-{% if devicetype.frontporttemplates.exists or devicetype.rearporttemplates.exists %}
-    <div class="row">
-        <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' %}
-        </div>
-        <div class="col-md-6">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' %}
-        </div>
-    </div>
-{% endif %}
 {% endblock %}

From e635dc1fb3211dbf742eb3b414566605e63dd22b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 15:10:56 -0400
Subject: [PATCH 294/505] Arrange device components within tabs

---
 netbox/dcim/views.py                          |  20 +-
 netbox/templates/dcim/device.html             | 895 ++++++++++--------
 netbox/templates/dcim/inc/consoleport.html    |   2 -
 .../dcim/inc/device_component_table.html      |  40 +
 4 files changed, 525 insertions(+), 432 deletions(-)
 create mode 100644 netbox/templates/dcim/inc/device_component_table.html

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 2376e5430..889b4d94e 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -984,7 +984,7 @@ class DeviceView(ObjectView):
             vc_members = []
 
         # Console ports
-        console_ports = ConsolePort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+        consoleports = ConsolePort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'connected_endpoint__device', 'cable',
         )
 
@@ -996,7 +996,7 @@ class DeviceView(ObjectView):
         )
 
         # Power ports
-        power_ports = PowerPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+        powerports = PowerPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             '_connected_poweroutlet__device', 'cable',
         )
 
@@ -1014,15 +1014,15 @@ class DeviceView(ObjectView):
         )
 
         # Front ports
-        front_ports = FrontPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+        frontports = FrontPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'rear_port', 'cable',
         )
 
         # Rear ports
-        rear_ports = RearPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related('cable')
+        rearports = RearPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related('cable')
 
         # Device bays
-        device_bays = DeviceBay.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
+        devicebays = DeviceBay.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'installed_device__device_type__manufacturer',
         )
 
@@ -1043,14 +1043,14 @@ class DeviceView(ObjectView):
 
         return render(request, 'dcim/device.html', {
             'device': device,
-            'console_ports': console_ports,
+            'consoleports': consoleports,
             'consoleserverports': consoleserverports,
-            'power_ports': power_ports,
+            'powerports': powerports,
             'poweroutlets': poweroutlets,
             'interfaces': interfaces,
-            'device_bays': device_bays,
-            'front_ports': front_ports,
-            'rear_ports': rear_ports,
+            'devicebays': devicebays,
+            'frontports': frontports,
+            'rearports': rearports,
             'services': services,
             'secrets': secrets,
             'vc_members': vc_members,
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 408d0d833..c1da53423 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -329,86 +329,6 @@
             {% plugin_left_page device %}
         </div>
         <div class="col-md-6">
-            {% if console_ports %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Console Ports</strong>
-                        </div>
-                        <table class="table table-hover panel-body component-list">
-                            {% for cp in console_ports %}
-                                {% include 'dcim/inc/consoleport.html' %}
-                            {% endfor %}
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if console_ports and perms.dcim.change_consoleport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:consoleport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if console_ports and perms.dcim.delete_consoleport %}
-                                <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if console_ports and perms.dcim.add_consoleport %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
-                                    </a>
-                                </div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if power_ports %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Power Ports</strong>
-                        </div>
-                        <table class="table table-hover panel-body component-list">
-                            {% for pp in power_ports %}
-                                {% include 'dcim/inc/powerport.html' %}
-                            {% endfor %}
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if power_ports and perms.dcim.change_powerport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:powerport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:powerport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if power_ports and perms.dcim.delete_powerport %}
-                                <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if power_ports and perms.dcim.add_powerport %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
-                                    </a>
-                                </div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% endif %}
             {% if power_ports and poweroutlets %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
@@ -554,355 +474,490 @@
     </div>
     <div class="row">
         <div class="col-md-12">
-            {% if device_bays or device.device_type.is_parent_device %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Device Bays</strong>
-                        </div>
-                        <table class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_devicebay or perms.dcim.delete_devicebay %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
-                                    <th>Status</th>
-                                    <th>Description</th>
-                                    <th colspan="2">Installed Device</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for devicebay in device_bays %}
-                                    {% include 'dcim/inc/devicebay.html' %}
-                                {% empty %}
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active">
+                    <a href="#interfaces" role="tab" data-toggle="tab">Interfaces {% badge interfaces|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#frontports" role="tab" data-toggle="tab">Front Ports {% badge frontports|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#rearports" role="tab" data-toggle="tab">Rear Ports {% badge rearports|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#consoleports" role="tab" data-toggle="tab">Console Ports {% badge consoleports|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#consoleserverports" role="tab" data-toggle="tab">Console Server Ports {% badge consoleserverports|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#powerports" role="tab" data-toggle="tab">Power Ports {% badge powerports|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#poweroutlets" role="tab" data-toggle="tab">Power Outlets {% badge poweroutlets|length %}</a>
+                </li>
+                <li role="presentation">
+                    <a href="#devicebays" role="tab" data-toggle="tab">Device Bays {% badge devicebays|length %}</a>
+                </li>
+            </ul>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="interfaces">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Interfaces</strong>
+                                <div class="pull-right noprint">
+                                    <button class="btn btn-default btn-xs toggle-ips" selected="selected">
+                                        <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
+                                    </button>
+                                </div>
+                                <div class="col-md-2 pull-right noprint">
+                                    <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
+                                </div>
+                            </div>
+                            <table id="interfaces_table" class="table table-hover table-headings panel-body component-list">
+                                <thead>
                                     <tr>
-                                        <td colspan="5" class="text-center text-muted">&mdash; No device bays defined &mdash;</td>
+                                        {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>LAG</th>
+                                        <th>Description</th>
+                                        <th>MTU</th>
+                                        <th>Mode</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
                                     </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if device_bays and perms.dcim.change_devicebay %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                            {% endif %}
-                            {% if device_bays and perms.dcim.delete_devicebay %}
-                                <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete selected
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_devicebay %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add device bays
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
-                         </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if interfaces %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Interfaces</strong>
-                            <div class="pull-right noprint">
-                                <button class="btn btn-default btn-xs toggle-ips" selected="selected">
-                                    <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
-                                </button>
+                                </thead>
+                                <tbody>
+                                    {% for iface in interfaces %}
+                                        {% include 'dcim/inc/interface.html' %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if interfaces and perms.dcim.change_interface %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                {% endif %}
+                                {% if interfaces and perms.dcim.change_interface %}
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if interfaces and perms.dcim.delete_interface %}
+                                    <button type="submit" name="_delete" formaction="{% url 'dcim:interface_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_interface %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:interface_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
+                             </div>
+                        </div>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="frontports">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Front Ports</strong>
                             </div>
-                            <div class="col-md-2 pull-right noprint">
-                                <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
+                            <table class="table table-hover table-headings panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Type</th>
+                                        <th>Rear Port</th>
+                                        <th>Position</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for frontport in frontports %}
+                                        {% include 'dcim/inc/frontport.html' %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if frontports and perms.dcim.change_frontport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:frontport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:frontport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:frontport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if frontports and perms.dcim.delete_frontport %}
+                                    <button type="submit" formaction="{% url 'dcim:frontport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_frontport %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:frontport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add front ports
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
                             </div>
                         </div>
-                        <table id="interfaces_table" class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
-                                    <th>LAG</th>
-                                    <th>Description</th>
-                                    <th>MTU</th>
-                                    <th>Mode</th>
-                                    <th>Cable</th>
-                                    <th colspan="2">Connection</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for iface in interfaces %}
-                                    {% include 'dcim/inc/interface.html' %}
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if interfaces and perms.dcim.change_interface %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:interface_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                            {% endif %}
-                            {% if interfaces and perms.dcim.change_interface %}
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:interface_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if interfaces and perms.dcim.delete_interface %}
-                                <button type="submit" name="_delete" formaction="{% url 'dcim:interface_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_interface %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:interface_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add interfaces
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
-                         </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if consoleserverports %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Console Server Ports</strong>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="rearports">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Rear Ports</strong>
+                            </div>
+                            <table class="table table-hover table-headings panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Type</th>
+                                        <th>Positions</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for rearport in rearports %}
+                                        {% include 'dcim/inc/rearport.html' %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if rearports and perms.dcim.change_rearport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:rearport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:rearport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:rearport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if rearports and perms.dcim.delete_rearport %}
+                                    <button type="submit" formaction="{% url 'dcim:rearport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_rearport %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:rearport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add rear ports
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
+                            </div>
                         </div>
-                        <table class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="consoleports">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Console Ports</strong>
+                            </div>
+                            <table class="table table-hover panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Type</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                {% for cp in consoleports %}
+                                    {% include 'dcim/inc/consoleport.html' %}
+                                {% endfor %}
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if consoleports and perms.dcim.change_consoleport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:consoleport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if consoleports and perms.dcim.delete_consoleport %}
+                                    <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if consoleports and perms.dcim.add_consoleport %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
+                                        </a>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="consoleserverports">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Console Server Ports</strong>
+                            </div>
+                            <table class="table table-hover table-headings panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Type</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for csp in consoleserverports %}
+                                        {% include 'dcim/inc/consoleserverport.html' %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if consoleserverports and perms.dcim.change_consoleport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:consoleserverport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if consoleserverports and perms.dcim.delete_consoleserverport %}
+                                    <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_consoleserverport %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:consoleserverport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console server ports
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="powerports">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Power Ports</strong>
+                            </div>
+                            <table class="table table-hover panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Type</th>
+                                        <th>Draw</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="2">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                {% for pp in powerports %}
+                                    {% include 'dcim/inc/powerport.html' %}
+                                {% endfor %}
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if powerports and perms.dcim.change_powerport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:powerport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:powerport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if powerports and perms.dcim.delete_powerport %}
+                                    <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if powerports and perms.dcim.add_powerport %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port
+                                        </a>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="poweroutlets">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Power Outlets</strong>
+                            </div>
+                            <table class="table table-hover table-headings panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
                                     <th>Type</th>
-                                    <th>Description</th>
-                                    <th>Cable</th>
-                                    <th colspan="2">Connection</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for csp in consoleserverports %}
-                                    {% include 'dcim/inc/consoleserverport.html' %}
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if consoleserverports and perms.dcim.change_consoleport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:consoleserverport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleserverport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if consoleserverports and perms.dcim.delete_consoleserverport %}
-                                <button type="submit" formaction="{% url 'dcim:consoleserverport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_consoleserverport %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:consoleserverport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console server ports
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
+                                        <th>Input/Leg</th>
+                                        <th>Description</th>
+                                        <th>Cable</th>
+                                        <th colspan="3">Connection</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for po in poweroutlets %}
+                                        {% include 'dcim/inc/poweroutlet.html' %}
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if poweroutlets and perms.dcim.change_powerport %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                    <button type="submit" name="_edit" formaction="{% url 'dcim:poweroutlet_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                                    </button>
+                                    <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                                    </button>
+                                {% endif %}
+                                {% if poweroutlets and perms.dcim.delete_poweroutlet %}
+                                    <button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_poweroutlet %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:poweroutlet_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power outlets
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
+                            </div>
                         </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if poweroutlets %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Power Outlets</strong>
+                    </form>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="devicebays">
+                    <form method="post">
+                        {% csrf_token %}
+                        <div class="panel panel-default">
+                            <div class="panel-heading">
+                                <strong>Device Bays</strong>
+                            </div>
+                            <table class="table table-hover table-headings panel-body component-list">
+                                <thead>
+                                    <tr>
+                                        {% if perms.dcim.change_devicebay or perms.dcim.delete_devicebay %}
+                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
+                                        {% endif %}
+                                        <th>Name</th>
+                                        <th>Status</th>
+                                        <th>Description</th>
+                                        <th colspan="2">Installed Device</th>
+                                        <th></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {% for devicebay in devicebays %}
+                                        {% include 'dcim/inc/devicebay.html' %}
+                                    {% empty %}
+                                        <tr>
+                                            <td colspan="5" class="text-center text-muted">&mdash; No device bays defined &mdash;</td>
+                                        </tr>
+                                    {% endfor %}
+                                </tbody>
+                            </table>
+                            <div class="panel-footer noprint">
+                                {% if devicebays and perms.dcim.change_devicebay %}
+                                    <button type="submit" name="_rename" formaction="{% url 'dcim:devicebay_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                        <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                                    </button>
+                                {% endif %}
+                                {% if devicebays and perms.dcim.delete_devicebay %}
+                                    <button type="submit" formaction="{% url 'dcim:devicebay_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                        <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete selected
+                                    </button>
+                                {% endif %}
+                                {% if perms.dcim.add_devicebay %}
+                                    <div class="pull-right">
+                                        <a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add device bays
+                                        </a>
+                                    </div>
+                                    <div class="clearfix"></div>
+                                {% endif %}
+                             </div>
                         </div>
-                        <table class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
-                                <th>Type</th>
-                                    <th>Input/Leg</th>
-                                    <th>Description</th>
-                                    <th>Cable</th>
-                                    <th colspan="3">Connection</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for po in poweroutlets %}
-                                    {% include 'dcim/inc/poweroutlet.html' %}
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if poweroutlets and perms.dcim.change_powerport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:poweroutlet_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:poweroutlet_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if poweroutlets and perms.dcim.delete_poweroutlet %}
-                                <button type="submit" formaction="{% url 'dcim:poweroutlet_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_poweroutlet %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:poweroutlet_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power outlets
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if front_ports %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Front Ports</strong>
-                        </div>
-                        <table class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_frontport or perms.dcim.delete_frontport %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
-                                    <th>Type</th>
-                                    <th>Rear Port</th>
-                                    <th>Position</th>
-                                    <th>Description</th>
-                                    <th>Cable</th>
-                                    <th colspan="2">Connection</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for frontport in front_ports %}
-                                    {% include 'dcim/inc/frontport.html' %}
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if front_ports and perms.dcim.change_frontport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:frontport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:frontport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:frontport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if front_ports and perms.dcim.delete_frontport %}
-                                <button type="submit" formaction="{% url 'dcim:frontport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_frontport %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:frontport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add front ports
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% endif %}
-            {% if rear_ports %}
-                <form method="post">
-                    {% csrf_token %}
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <strong>Rear Ports</strong>
-                        </div>
-                        <table class="table table-hover table-headings panel-body component-list">
-                            <thead>
-                                <tr>
-                                    {% if perms.dcim.change_rearport or perms.dcim.delete_rearport %}
-                                        <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                    {% endif %}
-                                    <th>Name</th>
-                                    <th>Type</th>
-                                    <th>Positions</th>
-                                    <th>Description</th>
-                                    <th>Cable</th>
-                                    <th colspan="2">Connection</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for rearport in rear_ports %}
-                                    {% include 'dcim/inc/rearport.html' %}
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        <div class="panel-footer noprint">
-                            {% if rear_ports and perms.dcim.change_rearport %}
-                                <button type="submit" name="_rename" formaction="{% url 'dcim:rearport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
-                                </button>
-                                <button type="submit" name="_edit" formaction="{% url 'dcim:rearport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
-                                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
-                                </button>
-                                <button type="submit" name="_disconnect" formaction="{% url 'dcim:rearport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
-                                </button>
-                            {% endif %}
-                            {% if rear_ports and perms.dcim.delete_rearport %}
-                                <button type="submit" formaction="{% url 'dcim:rearport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
-                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
-                                </button>
-                            {% endif %}
-                            {% if perms.dcim.add_rearport %}
-                                <div class="pull-right">
-                                    <a href="{% url 'dcim:rearport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add rear ports
-                                    </a>
-                                </div>
-                                <div class="clearfix"></div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% endif %}
+                    </form>
+                </div>
+            </div>
         </div>
     </div>
 {% include 'inc/modal.html' with name='graphs' title='Graphs' %}
diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html
index 61b4fe045..dc2111b8a 100644
--- a/netbox/templates/dcim/inc/consoleport.html
+++ b/netbox/templates/dcim/inc/consoleport.html
@@ -18,8 +18,6 @@
         {% if cp.type %}{{ cp.get_type_display }}{% else %}&mdash;{% endif %}
     </td>
 
-    <td></td>
-
     {# Description #}
     <td>
         {{ cp.description }}
diff --git a/netbox/templates/dcim/inc/device_component_table.html b/netbox/templates/dcim/inc/device_component_table.html
new file mode 100644
index 000000000..a0bb8f82b
--- /dev/null
+++ b/netbox/templates/dcim/inc/device_component_table.html
@@ -0,0 +1,40 @@
+{% load helpers %}
+{% load perms %}
+<form method="post">
+    {% csrf_token %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>{{ title }}</strong>
+        </div>
+        <table class="table table-hover panel-body component-list">
+            {% for obj in components %}
+                {% include component_template %}
+            {% endfor %}
+        </table>
+        <div class="panel-footer noprint">
+            {% if components and perms.dcim.change_consoleport %}
+                <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
+                </button>
+                <button type="submit" name="_edit" formaction="{% url 'dcim:consoleport_bulk_edit' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
+                    <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit
+                </button>
+                <button type="submit" name="_disconnect" formaction="{% url 'dcim:consoleport_bulk_disconnect' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                    <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
+                </button>
+            {% endif %}
+            {% if components and perms.dcim.delete_consoleport %}
+                <button type="submit" name="_delete" formaction="{% url 'dcim:consoleport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
+                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
+                </button>
+            {% endif %}
+            {% if components and perms.dcim.add_consoleport %}
+                <div class="pull-right">
+                    <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
+                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+</form>

From 1ed152cd49874cc9896c8c10cf9b3f2280a06693 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 16:25:13 -0400
Subject: [PATCH 295/505] Fix unrestricted queries for Tags

---
 netbox/templates/dcim/device.html           | 2 +-
 netbox/templates/dcim/inc/interface.html    | 2 +-
 netbox/templates/extras/inc/tags_panel.html | 2 +-
 netbox/utilities/utils.py                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index c1da53423..6bdf26071 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -101,7 +101,7 @@
         </li>
         <li role="presentation"{% if active_tab == 'inventory' %} class="active"{% endif %}>
             <a href="{% url 'dcim:device_inventory' pk=device.pk %}">
-                Inventory <span class="badge">{{ device.inventoryitems.count }}</span>
+                Inventory <span class="badge">{{ device.inventoryitems.unrestricted.count }}</span>
             </a>
         </li>
         {% if perms.dcim.napalm_read_device %}
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 75869db52..b8d090231 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -31,7 +31,7 @@
         {% if iface.description %}
             {{ iface.description }}<br/>
         {% endif %}
-        {% for tag in iface.tags.all %}
+        {% for tag in iface.tags.all.unrestricted %}
             {% tag tag %}
         {% empty %}
             {% if not iface.description %}&mdash;{% endif %}
diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
index 2024d4ab7..d03932354 100644
--- a/netbox/templates/extras/inc/tags_panel.html
+++ b/netbox/templates/extras/inc/tags_panel.html
@@ -4,7 +4,7 @@
         <strong>Tags</strong>
     </div>
     <div class="panel-body">
-        {% for tag in tags.all %}
+        {% for tag in tags.all.unrestricted %}
             {% tag tag url %}
         {% empty %}
             <span class="text-muted">No tags assigned</span>
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 4c07f5520..d1b4abb44 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -215,7 +215,7 @@ def prepare_cloned_fields(instance):
 
     # Copy tags
     if is_taggable(instance):
-        params['tags'] = ','.join([t.name for t in instance.tags.all()])
+        params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
 
     # Concatenate parameters into a URL query string
     param_string = '&'.join(

From f4c14d48546ff1f4dc3309b027ec82a7699e62b7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 2 Jul 2020 16:47:28 -0400
Subject: [PATCH 296/505] Replace get_component_template_actions() with
 ButtonsColumn

---
 netbox/dcim/tables.py      | 71 +++++++++++++-------------------------
 netbox/utilities/tables.py | 22 ++++++++----
 2 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 587749277..442c0cf47 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -110,21 +110,6 @@ POWERPANEL_POWERFEED_COUNT = """
 """
 
 
-def get_component_template_actions(model_name):
-    return """
-        {{% if perms.dcim.change_{model_name} %}}
-            <a href="{{% url 'dcim:{model_name}_edit' pk=record.pk %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-warning">
-                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-            </a>
-        {{% endif %}}
-        {{% if perms.dcim.delete_{model_name} %}}
-            <a href="{{% url 'dcim:{model_name}_delete' pk=record.pk %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-danger">
-                <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-            </a>
-        {{% endif %}}
-    """.format(model_name=model_name).strip()
-
-
 #
 # Regions
 #
@@ -401,10 +386,9 @@ class ComponentTemplateTable(BaseTable):
 
 
 class ConsolePortTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('consoleporttemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=ConsolePortTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -414,10 +398,9 @@ class ConsolePortTemplateTable(ComponentTemplateTable):
 
 
 class ConsoleServerPortTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('consoleserverporttemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=ConsoleServerPortTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -427,10 +410,9 @@ class ConsoleServerPortTemplateTable(ComponentTemplateTable):
 
 
 class PowerPortTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('powerporttemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=PowerPortTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -440,10 +422,9 @@ class PowerPortTemplateTable(ComponentTemplateTable):
 
 
 class PowerOutletTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('poweroutlettemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=PowerOutletTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -456,10 +437,9 @@ class InterfaceTemplateTable(ComponentTemplateTable):
     mgmt_only = BooleanColumn(
         verbose_name='Management Only'
     )
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('interfacetemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=InterfaceTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -472,10 +452,9 @@ class FrontPortTemplateTable(ComponentTemplateTable):
     rear_port_position = tables.Column(
         verbose_name='Position'
     )
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('frontporttemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=FrontPortTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -485,10 +464,9 @@ class FrontPortTemplateTable(ComponentTemplateTable):
 
 
 class RearPortTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('rearporttemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=RearPortTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
@@ -498,10 +476,9 @@ class RearPortTemplateTable(ComponentTemplateTable):
 
 
 class DeviceBayTemplateTable(ComponentTemplateTable):
-    actions = tables.TemplateColumn(
-        template_code=get_component_template_actions('devicebaytemplate'),
-        attrs={'td': {'class': 'text-right noprint'}},
-        verbose_name=''
+    actions = ButtonsColumn(
+        model=DeviceBayTemplate,
+        buttons=('edit', 'delete')
     )
 
     class Meta(BaseTable.Meta):
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index ec3d5dff5..a4f15a836 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -130,25 +130,28 @@ class ButtonsColumn(tables.TemplateColumn):
     :param model: Model class to use for calculating URL view names
     :param prepend_content: Additional template content to render in the column (optional)
     """
+    buttons = ('changelog', 'edit', 'delete')
     attrs = {'td': {'class': 'text-right text-nowrap noprint'}}
     # Note that braces are escaped to allow for string formatting prior to template rendering
     template_code = """
-    <a href="{{% url '{app_label}:{model_name}_changelog' {pk_field}=record.{pk_field} %}}" class="btn btn-default btn-xs" title="Change log">
-        <i class="fa fa-history"></i>
-    </a>
-    {{% if perms.{app_label}.change_{model_name} %}}
+    {{% if "changelog" in buttons %}}
+        <a href="{{% url '{app_label}:{model_name}_changelog' {pk_field}=record.{pk_field} %}}" class="btn btn-default btn-xs" title="Change log">
+            <i class="fa fa-history"></i>
+        </a>
+    {{% endif %}}
+    {{% if "edit" in buttons and perms.{app_label}.change_{model_name} %}}
         <a href="{{% url '{app_label}:{model_name}_edit' {pk_field}=record.{pk_field} %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-warning" title="Edit">
             <i class="fa fa-pencil"></i>
         </a>
     {{% endif %}}
-    {{% if perms.{app_label}.delete_{model_name} %}}
+    {{% if "delete" in buttons and perms.{app_label}.delete_{model_name} %}}
         <a href="{{% url '{app_label}:{model_name}_delete' {pk_field}=record.{pk_field} %}}?return_url={{{{ request.path }}}}" class="btn btn-xs btn-danger" title="Delete">
             <i class="fa fa-trash"></i>
         </a>
     {{% endif %}}
     """
 
-    def __init__(self, model, *args, pk_field='pk', prepend_template=None, **kwargs):
+    def __init__(self, model, *args, pk_field='pk', buttons=None, prepend_template=None, **kwargs):
         if prepend_template:
             prepend_template = prepend_template.replace('{', '{{')
             prepend_template = prepend_template.replace('}', '}}')
@@ -157,11 +160,16 @@ class ButtonsColumn(tables.TemplateColumn):
         template_code = self.template_code.format(
             app_label=model._meta.app_label,
             model_name=model._meta.model_name,
-            pk_field=pk_field
+            pk_field=pk_field,
+            buttons=buttons
         )
 
         super().__init__(template_code=template_code, *args, **kwargs)
 
+        self.extra_context.update({
+            'buttons': buttons or self.buttons,
+        })
+
     def header(self):
         return ''
 

From f092c107b541838b550b85777cf4781f82cb16fb Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Fri, 3 Jul 2020 11:55:04 -0400
Subject: [PATCH 297/505] PR review updates

---
 netbox/extras/api/serializers.py              |  12 +--
 netbox/extras/api/views.py                    |   2 +-
 netbox/extras/choices.py                      |   8 +-
 netbox/extras/migrations/0043_report_model.py |  22 ++++
 .../{0043_jobresult.py => 0044_jobresult.py}  |  15 +--
 netbox/extras/models/models.py                |  13 +++
 netbox/extras/reports.py                      |  12 ++-
 netbox/extras/scripts.py                      |   6 +-
 netbox/extras/tables.py                       |   4 +-
 netbox/extras/tests/test_api.py               |  33 +++++-
 netbox/extras/urls.py                         |   8 +-
 netbox/extras/views.py                        | 101 ++++++++++--------
 netbox/templates/extras/report_list.html      |   2 +-
 .../{report.html => report_result.html}       |  44 +++-----
 netbox/templates/extras/script_result.html    |  10 +-
 netbox/templates/home.html                    |   2 +-
 netbox/utilities/utils.py                     |   7 +-
 17 files changed, 178 insertions(+), 123 deletions(-)
 create mode 100644 netbox/extras/migrations/0043_report_model.py
 rename netbox/extras/migrations/{0043_jobresult.py => 0044_jobresult.py} (84%)
 rename netbox/templates/extras/{report.html => report_result.html} (74%)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 636e813bd..1befd082f 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -258,11 +258,7 @@ class JobResultSerializer(serializers.ModelSerializer):
 #
 
 class ReportSerializer(serializers.Serializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='extras-api:report-detail',
-        lookup_field='full_name',
-        lookup_url_kwarg='pk'
-    )
+    id = serializers.CharField(read_only=True, source="full_name")
     module = serializers.CharField(max_length=255)
     name = serializers.CharField(max_length=255)
     description = serializers.CharField(max_length=255, required=False)
@@ -279,12 +275,8 @@ class ReportDetailSerializer(ReportSerializer):
 #
 
 class ScriptSerializer(serializers.Serializer):
-    url = serializers.HyperlinkedIdentityField(
-        view_name='extras-api:script-detail',
-        lookup_field='full_name',
-        lookup_url_kwarg='pk'
-    )
     id = serializers.CharField(read_only=True, source="full_name")
+    module = serializers.CharField(max_length=255)
     name = serializers.CharField(read_only=True)
     description = serializers.CharField(read_only=True)
     vars = serializers.SerializerMethodField(read_only=True)
diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 5700efe55..679c4e96d 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -14,7 +14,7 @@ from extras.choices import JobResultStatusChoices
 from extras.models import (
     ConfigContext, CustomFieldChoice, ExportTemplate, Graph, ImageAttachment, ObjectChange, JobResult, Tag,
 )
-from extras.reports import get_report, get_reports
+from extras.reports import get_report, get_reports, run_report
 from extras.scripts import get_script, get_scripts, run_script
 from utilities.api import IsAuthenticatedOrLoginNotRequired, ModelViewSet
 from utilities.utils import copy_safe_request
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index 8650b1e22..7ff8aab95 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -129,25 +129,23 @@ class JobResultStatusChoices(ChoiceSet):
     STATUS_PENDING = 'pending'
     STATUS_RUNNING = 'running'
     STATUS_COMPLETED = 'completed'
+    STATUS_ERRORED = 'errored'
     STATUS_FAILED = 'failed'
 
     CHOICES = (
         (STATUS_PENDING, 'Pending'),
         (STATUS_RUNNING, 'Running'),
         (STATUS_COMPLETED, 'Completed'),
+        (STATUS_ERRORED, 'Errored'),
         (STATUS_FAILED, 'Failed'),
     )
 
     TERMINAL_STATE_CHOICES = (
         STATUS_COMPLETED,
+        STATUS_ERRORED,
         STATUS_FAILED,
     )
 
-    NON_TERMINAL_STATE_CHOICES = (
-        STATUS_PENDING,
-        STATUS_RUNNING,
-    )
-
 
 #
 # Webhooks
diff --git a/netbox/extras/migrations/0043_report_model.py b/netbox/extras/migrations/0043_report_model.py
new file mode 100644
index 000000000..d0d55c3f7
--- /dev/null
+++ b/netbox/extras/migrations/0043_report_model.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.0.7 on 2020-06-23 02:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0042_customfield_manager'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+            ],
+            options={
+                'managed': False,
+            },
+        )
+    ]
diff --git a/netbox/extras/migrations/0043_jobresult.py b/netbox/extras/migrations/0044_jobresult.py
similarity index 84%
rename from netbox/extras/migrations/0043_jobresult.py
rename to netbox/extras/migrations/0044_jobresult.py
index f5ad3b1f5..f52451b8e 100644
--- a/netbox/extras/migrations/0043_jobresult.py
+++ b/netbox/extras/migrations/0044_jobresult.py
@@ -13,15 +13,11 @@ def convert_job_results(apps, schema_editor):
     """
     Convert ReportResult objects to JobResult objects
     """
-    from django.contrib.contenttypes.management import create_contenttypes
     from extras.choices import JobResultStatusChoices
 
     ReportResult = apps.get_model('extras', 'ReportResult')
     JobResult = apps.get_model('extras', 'JobResult')
     ContentType = apps.get_model('contenttypes', 'ContentType')
-    app_config = apps.get_app_config('extras')
-    app_config.models_module = app_config.models_module or True
-    create_contenttypes(app_config)
     report_content_type = ContentType.objects.get(app_label='extras', model='report')
 
     job_results = []
@@ -50,19 +46,10 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('extras', '0042_customfield_manager'),
+        ('extras', '0043_report_model'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Report',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-            ],
-            options={
-                'managed': False,
-            },
-        ),
         migrations.CreateModel(
             name='JobResult',
             fields=[
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 285563b9f..316f3b247 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -12,6 +12,7 @@ from django.db import models
 from django.http import HttpResponse
 from django.template import Template, Context
 from django.urls import reverse
+from django.utils import timezone
 from rest_framework.utils.encoders import JSONEncoder
 
 from utilities.querysets import RestrictedQuerySet
@@ -650,6 +651,18 @@ class JobResult(models.Model):
 
         return f"{int(minutes)} minutes, {seconds:.2f} seconds"
 
+    def set_status(self, status):
+        """
+        Helper method to change the status of the job result and save. If the target status is terminal, the
+        completion time is also set.
+        """
+        self.status = status
+        if status in JobResultStatusChoices.TERMINAL_STATE_CHOICES:
+            self.completed = timezone.now()
+
+        self.save()
+
+
     @classmethod
     def enqueue_job(cls, func, name, obj_type, user, *args, **kwargs):
         """
diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index 10a560771..db6e8d373 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -14,6 +14,9 @@ from .constants import *
 from .models import JobResult
 
 
+logger = logging.getLogger(__name__)
+
+
 def is_report(obj):
     """
     Returns True if the given object is a Report.
@@ -71,13 +74,18 @@ def run_report(job_result, *args, **kwargs):
     """
     module_name, report_name = job_result.name.split('.', 1)
     report = get_report(module_name, report_name)
-    report.run(job_result)
+
+    try:
+        report.run(job_result)
+    except Exception:
+        job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
+        logging.error(f"Error during execution of report {job_result.name}")
 
     # Delete any previous terminal state results
     JobResult.objects.filter(
         obj_type=job_result.obj_type,
         name=job_result.name,
-        status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
     ).exclude(
         pk=job_result.pk
     ).delete()
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 895475a09..ccb4fdc82 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -399,10 +399,6 @@ def run_script(data, request, commit=True, *args, **kwargs):
     A wrapper for calling Script.run(). This performs error handling and provides a hook for committing changes. It
     exists outside of the Script class to ensure it cannot be overridden by a script author.
     """
-    output = None
-    start_time = None
-    end_time = None
-
     job_result = kwargs.pop('job_result')
     module, script_name = job_result.name.split('.', 1)
 
@@ -463,7 +459,7 @@ def run_script(data, request, commit=True, *args, **kwargs):
     JobResult.objects.filter(
         obj_type=job_result.obj_type,
         name=job_result.name,
-        status=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+        status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
     ).exclude(
         pk=job_result.pk
     ).delete()
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 2754bf24b..578975ed3 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -1,8 +1,8 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
-from .models import ConfigContext, ObjectChange, JobResult, Tag, TaggedItem
+from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
+from .models import ConfigContext, ObjectChange, Tag, TaggedItem
 
 TAGGED_ITEM = """
 {% if value.get_absolute_url %}
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index de9d58446..cf615d914 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -8,9 +8,9 @@ from rest_framework import status
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Rack, RackGroup, RackRole, Site
 from extras.api.views import ScriptViewSet
 from extras.models import ConfigContext, Graph, ExportTemplate, Tag
+from extras.reports import Report
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from utilities.testing import APITestCase, APIViewTestCases
-from utilities.utils import copy_safe_request
 
 
 class AppTest(APITestCase):
@@ -208,6 +208,37 @@ class ConfigContextTest(APIViewTestCases.APIViewTestCase):
         self.assertEqual(rendered_context['bar'], 456)
 
 
+class ReportTest(APITestCase):
+
+    class TestReport(Report):
+        pass  # The report is not actually run, we are testing that the view enqueues the job
+
+    def get_test_report(self, *args):
+        return self.TestReport
+
+    def setUp(self):
+
+        super().setUp()
+
+        # Monkey-patch the API viewset's _get_script method to return our test script above
+        ReportViewSet._get_report = self.get_test_report
+
+    def test_get_report(self):
+
+        url = reverse('extras-api:report-detail', kwargs={'pk': None})
+        response = self.client.get(url, **self.header)
+
+        self.assertEqual(response.data['name'], self.TestReport.__name__)
+
+    def test_run_report(self):
+
+        url = reverse('extras-api:report-detail', kwargs={'pk': None})
+        response = self.client.post(url, {}, format='json', **self.header)
+        self.assertHttpStatus(response, status.HTTP_200_OK)
+
+        self.assertEqual(response.data['result']['status']['value'], 'pending')
+
+
 class ScriptTest(APITestCase):
 
     class TestScript(Script):
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index f199abfc9..6f8832487 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -36,12 +36,12 @@ urlpatterns = [
 
     # Reports
     path('reports/', views.ReportListView.as_view(), name='report_list'),
-    path('reports/<str:name>/', views.ReportView.as_view(), name='report'),
-    path('reports/<str:name>/run/', views.ReportRunView.as_view(), name='report_run'),
+    path('reports/<str:module>.<str:name>/', views.ReportView.as_view(), name='report'),
+    path('reports/results/<int:job_result_pk>/', views.ReportResultView.as_view(), name='report_result'),
 
     # Scripts
     path('scripts/', views.ScriptListView.as_view(), name='script_list'),
-    path('scripts/<str:module>/<str:name>/', views.ScriptView.as_view(), name='script'),
-    path('scripts/<str:module>/<str:name>/result/<int:job_result_pk>/', views.ScriptResultView.as_view(), name='script_result'),
+    path('scripts/<str:module>.<str:name>/', views.ScriptView.as_view(), name='script'),
+    path('scripts/results/<int:job_result_pk>/', views.ScriptResultView.as_view(), name='script_result'),
 
 ]
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 92453b090..dfaeba806 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -350,12 +350,10 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
 
 
 class GetReportMixin:
-    def get_report(self, name):
-        if '.' not in name:
-            raise Http404
-        # Retrieve the Report by "<module>.<report>"
-        module_name, report_name = name.split('.', 1)
-        report = get_report(module_name, report_name)
+    def _get_report(self, name, module=None):
+        if module is None:
+            module, name = name.split('.', 1)
+        report = get_report(module, name)
         if report is None:
             raise Http404
 
@@ -369,43 +367,29 @@ class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
     def get_required_permission(self):
         return 'extras.view_reportresult'
 
-    def get(self, request, name):
+    def get(self, request, module, name):
 
-        report = self.get_report(name)
+        report = self._get_report(name, module)
 
         report_content_type = ContentType.objects.get(app_label='extras', model='report')
-        latest_run_result = JobResult.objects.filter(
+        report.result = JobResult.objects.filter(
             obj_type=report_content_type,
             name=report.full_name,
             status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
         ).first()
-        pending_run_result = JobResult.objects.filter(
-            obj_type=report_content_type,
-            name=report.full_name,
-            status__in=JobResultStatusChoices.NON_TERMINAL_STATE_CHOICES
-        ).order_by(
-            'created'
-        ).first()
-
-        report.result = latest_run_result
-        report.pending_result = pending_run_result
 
         return render(request, 'extras/report.html', {
             'report': report,
             'run_form': ConfirmationForm(),
         })
 
+    def post(self, request, module, name):
 
-class ReportRunView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
-    """
-    Run a Report and record a new ReportResult.
-    """
-    def get_required_permission(self):
-        return 'extras.add_reportresult'
+        # Permissions check
+        if not request.user.has_perm('extras.run_report'):
+            return HttpResponseForbidden()
 
-    def post(self, request, name):
-
-        report = self.get_report(name)
+        report = self._get_report(name, module)
 
         form = ConfirmationForm(request.POST)
         if form.is_valid():
@@ -419,15 +403,42 @@ class ReportRunView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
                 request.user
             )
 
-        return redirect('extras:report', name=report.full_name)
+            return redirect('extras:report_result', job_result_pk=job_result.pk)
 
+        return render(request, 'extras/report.html', {
+            'report': report,
+            'run_form': form,
+        })
+
+
+class ReportResultView(ContentTypePermissionRequiredMixin, GetReportMixin, View):
+
+    def get_required_permission(self):
+        return 'extras.view_report'
+
+    def get(self, request, job_result_pk):
+        result = get_object_or_404(JobResult.objects.all(), pk=job_result_pk)
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        if result.obj_type != report_content_type:
+            raise Http404
+
+        report = self._get_report(result.name)
+
+        return render(request, 'extras/report_result.html', {
+            'report': report,
+            'result': result,
+            'class_name': report.name,
+            'run_form': ConfirmationForm(),
+        })
 
 #
 # Scripts
 #
 
 class GetScriptMixin:
-    def _get_script(self, module, name):
+    def _get_script(self, name, module=None):
+        if module is None:
+            module, name = name.split('.', 1)
         scripts = get_scripts()
         try:
             return scripts[module][name]()
@@ -453,7 +464,7 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
         return 'extras.view_script'
 
     def get(self, request, module, name):
-        script = self._get_script(module, name)
+        script = self._get_script(name, module)
         form = script.as_form(initial=request.GET)
 
         # Look for a pending JobResult (use the latest one by creation timestamp)
@@ -461,7 +472,8 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
         script.result = JobResult.objects.filter(
             obj_type=script_content_type,
             name=script.full_name,
-            status__in=JobResultStatusChoices.NON_TERMINAL_STATE_CHOICES
+        ).exclude(
+            status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
         ).first()
 
         return render(request, 'extras/script.html', {
@@ -476,10 +488,8 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
         if not request.user.has_perm('extras.run_script'):
             return HttpResponseForbidden()
 
-        script = self._get_script(module, name)
+        script = self._get_script(name, module)
         form = script.as_form(request.POST, request.FILES)
-        output = None
-        execution_time = None
 
         if form.is_valid():
             commit = form.cleaned_data.pop('_commit')
@@ -495,7 +505,13 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
                 commit=commit
             )
 
-        return redirect('extras:script_result', module=module, name=name, job_result_pk=job_result.pk)
+            return redirect('extras:script_result', job_result_pk=job_result.pk)
+
+        return render(request, 'extras/script.html', {
+            'module': module,
+            'script': script,
+            'form': form,
+        })
 
 
 class ScriptResultView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
@@ -503,19 +519,16 @@ class ScriptResultView(ContentTypePermissionRequiredMixin, GetScriptMixin, View)
     def get_required_permission(self):
         return 'extras.view_script'
 
-    def get(self, request, module, name, job_result_pk):
-        script = self._get_script(module, name)
-        form = script.as_form(initial=request.GET)
-
-        # Look for a pending JobResult (use the latest one by creation timestamp)
-        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+    def get(self, request, job_result_pk):
         result = get_object_or_404(JobResult.objects.all(), pk=job_result_pk)
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
         if result.obj_type != script_content_type:
             raise Http404
 
+        script = self._get_script(result.name)
+
         return render(request, 'extras/script_result.html', {
-            'module': module,
             'script': script,
             'result': result,
-            'class_name': name
+            'class_name': script.__class__.__name__
         })
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 4cf52243a..f507cf2b1 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -21,7 +21,7 @@
                             {% for report in module_reports %}
                                 <tr>
                                     <td>
-                                        <a href="{% url 'extras:report' name=report.full_name %}" name="report.{{ report.name }}"><strong>{{ report.name }}</strong></a>
+                                        <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}" name="report.{{ report.name }}"><strong>{{ report.name }}</strong></a>
                                     </td>
                                     <td>
                                         {% include 'extras/inc/job_label.html' with result=report.result %}
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report_result.html
similarity index 74%
rename from netbox/templates/extras/report.html
rename to netbox/templates/extras/report_result.html
index 18ea21b99..2053c86df 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report_result.html
@@ -16,36 +16,35 @@
     </div>
     {% if perms.extras.add_reportresult %}
         <div class="pull-right noprint">
-            <form action="{% url 'extras:report_run' name=report.full_name %}" method="post">
+            <form action="{% url 'extras:report' module=report.module name=report.name %}" method="post">
                 {% csrf_token %}
                 {{ run_form }}
                 <button type="submit" name="_run" class="btn btn-primary"><i class="fa fa-play"></i> Run Report</button>
             </form>
         </div>
     {% endif %}
-    <h1>{{ report.name }}{% include 'extras/inc/job_label.html' with result=report.result %}</h1>
+    <h1>{{ report.name }}</h1>
     <div class="row">
         <div class="col-md-12">
             {% if report.description %}
                 <p class="lead">{{ report.description }}</p>
             {% endif %}
-            {% if report.result %}
-                <p>Last run: <strong>{{ report.result.created }}</strong> {% if report.result.completed %} Duration: <strong>{{ report.result.duration }}</strong>{% endif %}</p>
-            {% endif %}
-            {% if report.pending_result %}
-                <p>
-                    Pending run: <strong>{{ report.pending_result.created }}</strong>
-                    <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=report.pending_result %}</span>
+            <p>
+                Run: <strong>{{ result.created }}</strong>
+                {% if result.completed %}
+                    Duration: <strong>{{ result.duration }}</strong>
+                {% else %}
                     <img id="pending-result-loader" src="{% static 'img/ajax-loader.gif' %}" />
-                </p>
-            {% endif %}
-            {% if report.result %}
+                {% endif %}
+                <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
+            </p>
+            {% if result.completed %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <strong>Report Methods</strong>
                     </div>
                     <table class="table table-hover panel-body">
-                        {% for method, data in report.result.data.items %}
+                        {% for method, data in result.data.items %}
                             <tr>
                                 <td><code><a href="#{{ method }}">{{ method }}</a></code></td>
                                 <td class="text-right report-stats">
@@ -72,7 +71,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            {% for method, data in report.result.data.items %}
+                            {% for method, data in result.data.items %}
                                 <tr>
                                     <th colspan="4" style="font-family: monospace">
                                         <a name="{{ method }}"></a>{{ method }}
@@ -99,11 +98,7 @@
                     </table>
                 </div>
             {% else %}
-                <div class="well">No results are available for this report. Please run the report first.</div>
-            {% endif %}
-        </div>
-        <div class="col-md-3">
-            {% if report.result %}
+                <div class="well">Pending results</div>
             {% endif %}
         </div>
     </div>
@@ -111,19 +106,14 @@
 
 {% block javascript %}
 <script type="text/javascript">
-{% if report.pending_result %}
-var pending_result_id = {{ report.pending_result.pk }};
+{% if not result.completed %}
+var pending_result_id = {{ result.pk }};
 {% else %}
 var pending_result_id = null;
 {% endif %}
 
 function jobTerminatedAction(){
-    $('#pending-result-loader').hide();
-    var refreshButton = document.createElement('button');
-    refreshButton.className = 'btn btn-xs btn-primary';
-    refreshButton.onclick = refreshWindow;
-    refreshButton.innerHTML = '<i class="fa fa-refresh"></i> Refresh';
-    $('#pending-result-loader').parents('p').append(refreshButton)
+    refreshWindow();
 }
 
 </script>
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 64e242a56..e34c5a18d 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -11,7 +11,7 @@
         <div class="col-md-12">
             <ol class="breadcrumb">
                 <li><a href="{% url 'extras:script_list' %}">Scripts</a></li>
-                <li><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
+                <li><a href="{% url 'extras:script_list' %}#module.{{ script.module }}">{{ script.module|bettertitle }}</a></li>
                 <li><a href="{% url 'extras:script' module=script.module name=class_name %}">{{ script }}</a></li>
                 <li>{{ result.created }}</li>
             </ol>
@@ -36,9 +36,9 @@
             {% if result.completed %}
                 Duration: <strong>{{ result.duration }}</strong>
             {% else %}
-                <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
                 <img id="pending-result-loader" src="{% static 'img/ajax-loader.gif' %}" />
             {% endif %}
+            <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
         </p>
         <div role="tabpanel" class="tab-pane active" id="log">
             {% if result.completed %}
@@ -76,6 +76,12 @@
                         </div>
                     </div>
                 </div>
+            {% else %}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="well">Pending results</div>
+                    </div>
+                </div>
             {% endif %}
         </div>
         <div role="tabpanel" class="tab-pane" id="output">
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index f4acda3a3..85332ae1b 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -280,7 +280,7 @@
                 <table class="table table-hover panel-body">
                     {% for result in report_results %}
                         <tr>
-                            <td><a href="{% url 'extras:report' name=result.name %}">{{ result.name }}</a></td>
+                            <td><a href="{% url 'extras:report_result' job_result_pk=result.pk %}">{{ result.name }}</a></td>
                             <td class="text-right"><span title="{{ result.created }}">{% include 'extras/inc/job_label.html' %}</span></td>
                         </tr>
                     {% endfor %}
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 1c8f9f12c..cb3db2465 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -270,9 +270,8 @@ class NetBoxFakeRequest:
     A fake request object which is explicitly defined at the module level so it is able to be pickled. It simply
     takes what is passed to it as kwargs on init and sets them as instance variables.
     """
-    def __init__(self, *args, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
+    def __init__(self, _dict):
+        self.__dict__ = _dict
 
 
 def copy_safe_request(request):
@@ -285,7 +284,7 @@ def copy_safe_request(request):
         for k in HTTP_REQUEST_META_SAFE_COPY
         if k in request.META and isinstance(request.META[k], str)
     }
-    return NetBoxFakeRequest(**{
+    return NetBoxFakeRequest({
         'META': meta,
         'POST': request.POST,
         'GET': request.GET,

From 41f92ef8e65ea0f975bb0b80195fb64b59fcd82b Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 6 Jul 2020 01:58:28 -0400
Subject: [PATCH 298/505] review updates

---
 netbox/extras/choices.py                   | 37 ++++++++++++++++++++++
 netbox/extras/constants.py                 | 14 --------
 netbox/extras/reports.py                   | 22 ++++++-------
 netbox/extras/scripts.py                   | 26 +++++++--------
 netbox/extras/templatetags/log_levels.py   | 29 +++--------------
 netbox/extras/views.py                     | 16 +++++++++-
 netbox/project-static/js/job_result.js     |  6 ++--
 netbox/templates/extras/inc/job_label.html |  4 ++-
 netbox/templates/extras/report_result.html |  6 ++--
 netbox/templates/extras/script_list.html   | 37 ++++++++++++++++++++--
 netbox/templates/extras/script_result.html |  8 ++++-
 11 files changed, 130 insertions(+), 75 deletions(-)

diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index 7ff8aab95..fe5c74fa5 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -120,6 +120,43 @@ class TemplateLanguageChoices(ChoiceSet):
     }
 
 
+#
+# Log Levels for Reports and Scripts
+#
+
+class LogLevelChoices(ChoiceSet):
+
+    LOG_DEFAULT = 'default'
+    LOG_SUCCESS = 'sucess'
+    LOG_INFO = 'info'
+    LOG_WARNING = 'warning'
+    LOG_FAILURE = 'failure'
+
+    CHOICES = (
+        (LOG_DEFAULT, 'Default'),
+        (LOG_SUCCESS, 'Success'),
+        (LOG_INFO, 'Info'),
+        (LOG_WARNING, 'Warning'),
+        (LOG_FAILURE, 'Failure'),
+    )
+
+    CLASS_MAP = (
+        (LOG_DEFAULT, 'default'),
+        (LOG_SUCCESS, 'success'),
+        (LOG_INFO, 'info'),
+        (LOG_WARNING, 'warning'),
+        (LOG_FAILURE, 'danger'),
+    )
+
+    LEGACY_MAP = (
+        (LOG_DEFAULT, 0),
+        (LOG_SUCCESS, 10),
+        (LOG_INFO, 20),
+        (LOG_WARNING, 30),
+        (LOG_FAILURE, 40),
+    )
+
+
 #
 # Job results
 #
diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py
index 55f3c73c7..a506d5867 100644
--- a/netbox/extras/constants.py
+++ b/netbox/extras/constants.py
@@ -1,17 +1,3 @@
-# Report logging levels
-LOG_DEFAULT = 0
-LOG_SUCCESS = 10
-LOG_INFO = 20
-LOG_WARNING = 30
-LOG_FAILURE = 40
-LOG_LEVEL_CODES = {
-    LOG_DEFAULT: 'default',
-    LOG_SUCCESS: 'success',
-    LOG_INFO: 'info',
-    LOG_WARNING: 'warning',
-    LOG_FAILURE: 'failure',
-}
-
 # Webhook content types
 HTTP_CONTENT_TYPE_JSON = 'application/json'
 
diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index db6e8d373..45496d396 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -9,8 +9,7 @@ from django.db.models import Q
 from django.utils import timezone
 from django_rq import job
 
-from .choices import JobResultStatusChoices
-from .constants import *
+from .choices import JobResultStatusChoices, LogLevelChoices
 from .models import JobResult
 
 
@@ -77,7 +76,8 @@ def run_report(job_result, *args, **kwargs):
 
     try:
         report.run(job_result)
-    except Exception:
+    except Exception as e:
+        print(e)
         job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
         logging.error(f"Error during execution of report {job_result.name}")
 
@@ -153,15 +153,15 @@ class Report(object):
     def full_name(self):
         return '.'.join([self.__module__, self.__class__.__name__])
 
-    def _log(self, obj, message, level=LOG_DEFAULT):
+    def _log(self, obj, message, level=LogLevelChoices.LOG_DEFAULT):
         """
         Log a message from a test method. Do not call this method directly; use one of the log_* wrappers below.
         """
-        if level not in LOG_LEVEL_CODES:
+        if level not in LogLevelChoices.as_dict():
             raise Exception("Unknown logging level: {}".format(level))
         self._results[self.active_test]['log'].append((
             timezone.now().isoformat(),
-            LOG_LEVEL_CODES.get(level),
+            level,
             str(obj) if obj else None,
             obj.get_absolute_url() if getattr(obj, 'get_absolute_url', None) else None,
             message,
@@ -171,7 +171,7 @@ class Report(object):
         """
         Log a message which is not associated with a particular object.
         """
-        self._log(None, message, level=LOG_DEFAULT)
+        self._log(None, message, level=LogLevelChoices.LOG_DEFAULT)
         self.logger.info(message)
 
     def log_success(self, obj, message=None):
@@ -179,7 +179,7 @@ class Report(object):
         Record a successful test against an object. Logging a message is optional.
         """
         if message:
-            self._log(obj, message, level=LOG_SUCCESS)
+            self._log(obj, message, level=LogLevelChoices.LOG_SUCCESS)
         self._results[self.active_test]['success'] += 1
         self.logger.info(f"Success | {obj}: {message}")
 
@@ -187,7 +187,7 @@ class Report(object):
         """
         Log an informational message.
         """
-        self._log(obj, message, level=LOG_INFO)
+        self._log(obj, message, level=LogLevelChoices.LOG_INFO)
         self._results[self.active_test]['info'] += 1
         self.logger.info(f"Info | {obj}: {message}")
 
@@ -195,7 +195,7 @@ class Report(object):
         """
         Log a warning.
         """
-        self._log(obj, message, level=LOG_WARNING)
+        self._log(obj, message, level=LogLevelChoices.LOG_WARNING)
         self._results[self.active_test]['warning'] += 1
         self.logger.info(f"Warning | {obj}: {message}")
 
@@ -203,7 +203,7 @@ class Report(object):
         """
         Log a failure. Calling this method will automatically mark the report as failed.
         """
-        self._log(obj, message, level=LOG_FAILURE)
+        self._log(obj, message, level=LogLevelChoices.LOG_FAILURE)
         self._results[self.active_test]['failure'] += 1
         self.logger.info(f"Failure | {obj}: {message}")
         self.failed = True
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index ccb4fdc82..018963bd8 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -19,11 +19,10 @@ from mptt.forms import TreeNodeChoiceField, TreeNodeMultipleChoiceField
 from mptt.models import MPTTModel
 
 from extras.api.serializers import ScriptOutputSerializer
-from extras.choices import JobResultStatusChoices
+from extras.choices import JobResultStatusChoices, LogLevelChoices
 from extras.models import JobResult
 from ipam.formfields import IPAddressFormField, IPNetworkFormField
 from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator
-from .constants import LOG_DEFAULT, LOG_FAILURE, LOG_INFO, LOG_SUCCESS, LOG_WARNING
 from utilities.exceptions import AbortTransaction
 from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
 from .forms import ScriptForm
@@ -324,23 +323,23 @@ class BaseScript:
 
     def log_debug(self, message):
         self.logger.log(logging.DEBUG, message)
-        self.log.append((LOG_DEFAULT, message))
+        self.log.append((LogLevelChoices.LOG_DEFAULT, message))
 
     def log_success(self, message):
         self.logger.log(logging.INFO, message)  # No syslog equivalent for SUCCESS
-        self.log.append((LOG_SUCCESS, message))
+        self.log.append((LogLevelChoices.LOG_SUCCESS, message))
 
     def log_info(self, message):
         self.logger.log(logging.INFO, message)
-        self.log.append((LOG_INFO, message))
+        self.log.append((LogLevelChoices.LOG_INFO, message))
 
     def log_warning(self, message):
         self.logger.log(logging.WARNING, message)
-        self.log.append((LOG_WARNING, message))
+        self.log.append((LogLevelChoices.LOG_WARNING, message))
 
     def log_failure(self, message):
         self.logger.log(logging.ERROR, message)
-        self.log.append((LOG_FAILURE, message))
+        self.log.append((LogLevelChoices.LOG_FAILURE, message))
 
     # Convenience functions
 
@@ -428,11 +427,15 @@ def run_script(data, request, commit=True, *args, **kwargs):
     try:
         with transaction.atomic():
             script.output = script.run(**kwargs)
-            job_result.status = JobResultStatusChoices.STATUS_COMPLETED
+            job_result.data = ScriptOutputSerializer(script).data
+            job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
+
             if not commit:
                 raise AbortTransaction()
+
     except AbortTransaction:
         pass
+
     except Exception as e:
         stacktrace = traceback.format_exc()
         script.log_failure(
@@ -440,7 +443,8 @@ def run_script(data, request, commit=True, *args, **kwargs):
         )
         logger.error(f"Exception raised during script execution: {e}")
         commit = False
-        job_result.status = JobResultStatusChoices.STATUS_FAILED
+        job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
+
     finally:
         if not commit:
             # Delete all pending changelog entries
@@ -449,10 +453,6 @@ def run_script(data, request, commit=True, *args, **kwargs):
                 "Database changes have been reverted automatically."
             )
 
-    job_result.data = ScriptOutputSerializer(script).data
-    job_result.completed = timezone.now()
-    job_result.save()
-
     logger.info(f"Script completed in {job_result.duration}")
 
     # Delete any previous terminal state results
diff --git a/netbox/extras/templatetags/log_levels.py b/netbox/extras/templatetags/log_levels.py
index 93dbe3897..c92ff8cdf 100644
--- a/netbox/extras/templatetags/log_levels.py
+++ b/netbox/extras/templatetags/log_levels.py
@@ -1,6 +1,6 @@
 from django import template
 
-from extras.constants import LOG_DEFAULT, LOG_FAILURE, LOG_INFO, LOG_SUCCESS, LOG_WARNING
+from extras.choices import LogLevelChoices
 
 
 register = template.Library()
@@ -11,28 +11,7 @@ def log_level(level):
     """
     Display a label indicating a syslog severity (e.g. info, warning, etc.).
     """
-    # TODO: we should convert this to a choices class
-    levels = {
-        'default': {
-            'name': 'Default',
-            'class': 'default'
-        },
-        'success': {
-            'name': 'Success',
-            'class': 'success',
-        },
-        'info': {
-            'name': 'Info',
-            'class': 'info'
-        },
-        'warning': {
-            'name': 'Warning',
-            'class': 'warning'
-        },
-        'failure': {
-            'name': 'Failure',
-            'class': 'danger'
-        }
+    return {
+        'name': LogLevelChoices.as_dict()[level],
+        'class': dict(LogLevelChoices.CLASS_MAP)[level]
     }
-
-    return levels[level]
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index dfaeba806..a7d89fb1f 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -453,8 +453,22 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
 
     def get(self, request):
 
+        scripts = get_scripts(use_names=True)
+        script_content_type = ContentType.objects.get(app_label='extras', model='script')
+        results = {
+            r.name: r
+            for r in JobResult.objects.filter(
+                obj_type=script_content_type,
+                status__in=JobResultStatusChoices.TERMINAL_STATE_CHOICES
+            ).defer('data')
+        }
+
+        for _scripts in scripts.values():
+            for script in _scripts.values():
+                script.result = results.get(script.full_name)
+
         return render(request, 'extras/script_list.html', {
-            'scripts': get_scripts(use_names=True),
+            'scripts': scripts,
         })
 
 
diff --git a/netbox/project-static/js/job_result.js b/netbox/project-static/js/job_result.js
index 8f3d360db..581e9d2bc 100644
--- a/netbox/project-static/js/job_result.js
+++ b/netbox/project-static/js/job_result.js
@@ -3,10 +3,8 @@ var timeout = 1000;
 
 function updatePendingStatusLabel(status){
     var labelClass;
-    if (status.value === 'failed'){
+    if (status.value === 'failed' || status.value === 'errored'){
         labelClass = 'danger';
-    } else if (status.value === 'pending'){
-        labelClass = 'default';
     } else if (status.value === 'running'){
         labelClass = 'warning';
     } else if (status.value === 'completed'){
@@ -33,7 +31,7 @@ $(document).ready(function(){
                 context: this,
                 success: function(data) {
                     updatePendingStatusLabel(data.status);
-                    if (data.status.value === 'completed' || data.status.value === 'failed'){
+                    if (data.status.value === 'completed' || data.status.value === 'failed' || data.status.value === 'errored'){
                         jobTerminatedAction()
                     } else {
                         setTimeout(checkPendingResult, timeout);
diff --git a/netbox/templates/extras/inc/job_label.html b/netbox/templates/extras/inc/job_label.html
index 7ae2b353f..cf31c7f75 100644
--- a/netbox/templates/extras/inc/job_label.html
+++ b/netbox/templates/extras/inc/job_label.html
@@ -1,11 +1,13 @@
 {% if result.status == 'failed' %}
     <label class="label label-danger">Failed</label>
+{% elif result.status == 'errored' %}
+    <label class="label label-danger">Errored</label>
 {% elif result.status == 'pending' %}
     <label class="label label-default">Pending</label>
 {% elif result.status == 'running' %}
     <label class="label label-warning">Running</label>
 {% elif result.status == 'completed' %}
-    <label class="label label-success">Passed</label>
+    <label class="label label-success">Completed</label>
 {% else %}
     <label class="label label-default">N/A</label>
 {% endif %}
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index 2053c86df..2433c381d 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -38,7 +38,7 @@
                 {% endif %}
                 <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
             </p>
-            {% if result.completed %}
+            {% if result.completed and result.status != 'errored' %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <strong>Report Methods</strong>
@@ -97,8 +97,10 @@
                         </tbody>
                     </table>
                 </div>
+            {% elif result.status == 'errored' %}
+                <div class="well">Error during report execution</div>
             {% else %}
-                <div class="well">Pending results</div>
+            <div class="well">Pending results</div>
             {% endif %}
         </div>
     </div>
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index a1b97cfc2..98803b6a6 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -4,15 +4,17 @@
 {% block content %}
     <h1>{% block title %}Scripts{% endblock %}</h1>
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-9">
             {% if scripts %}
                 {% for module, module_scripts in scripts.items %}
                     <h3><a name="module.{{ module }}"></a>{{ module|bettertitle }}</h3>
                     <table class="table table-hover table-headings reports">
                         <thead>
                             <tr>
-                                <th class="col-md-3">Name</th>
-                                <th class="col-md-9">Description</th>
+                                <th>Name</th>
+                                <th>Status</th>
+                                <th>Description</th>
+                                <th class="text-right">Last Run</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -21,7 +23,15 @@
                                     <td>
                                         <a href="{% url 'extras:script' module=script.module name=class_name %}" name="script.{{ class_name }}"><strong>{{ script }}</strong></a>
                                     </td>
+                                    <td>
+                                        {% include 'extras/inc/job_label.html' with result=script.result %}
+                                    </td>
                                     <td>{{ script.Meta.description }}</td>
+                                    {% if script.result %}
+                                        <td class="text-right">{{ script.result.created }}</td>
+                                    {% else %}
+                                        <td class="text-right text-muted">Never</td>
+                                    {% endif %}
                                 </tr>
                             {% endfor %}
                         </tbody>
@@ -34,5 +44,26 @@
                 </div>
             {% endif %}
         </div>
+        <div class="col-md-3">
+            {% if scripts %}
+                <div class="panel panel-default">
+                    {% for module, module_scripts in scripts.items %}
+                        <div class="panel-heading">
+                            <strong>{{ module|bettertitle }}</strong>
+                        </div>
+                        <ul class="list-group">
+                            {% for class_name, script in module_scripts.items %}
+                                <a href="#script.{{ class_name }}" class="list-group-item">
+                                    <i class="fa fa-list-alt"></i> {{ script.name }}
+                                    <div class="pull-right">
+                                        {% include 'extras/inc/job_label.html' with result=script.result %}
+                                    </div>
+                                </a>
+                            {% endfor %}
+                        </ul>
+                    {% endfor %}
+                </div>
+            {% endif %}
+        </div>
     </div>
 {% endblock %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index e34c5a18d..d225a4e10 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -41,7 +41,7 @@
             <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
         </p>
         <div role="tabpanel" class="tab-pane active" id="log">
-            {% if result.completed %}
+            {% if result.completed and result.status != 'errored' %}
                 <div class="row">
                     <div class="col-md-12">
                         <div class="panel panel-default">
@@ -76,6 +76,12 @@
                         </div>
                     </div>
                 </div>
+            {% elif result.stats == 'errored' %}
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="well">Error during script execution</div>
+                    </div>
+                </div>
             {% else %}
                 <div class="row">
                     <div class="col-md-12">

From 6547a2bc501353cde8a217c4267d3f6e246eca86 Mon Sep 17 00:00:00 2001
From: John Anderson <lampwins@gmail.com>
Date: Mon, 6 Jul 2020 02:10:52 -0400
Subject: [PATCH 299/505] merge conflict

---
 netbox/extras/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 578975ed3..9d49988e7 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -1,7 +1,7 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
-from utilities.tables import BaseTable, BooleanColumn, ColorColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange, Tag, TaggedItem
 
 TAGGED_ITEM = """

From 4ea411249032b606efaf9ed99f5e0656f6cf6eaa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 10:44:36 -0400
Subject: [PATCH 300/505] Fix up schema migration; PEP8 cleanup

---
 .../{0043_report_model.py => 0043_report.py}      |  0
 netbox/extras/migrations/0044_jobresult.py        | 15 +++++++--------
 netbox/extras/models/models.py                    |  1 -
 netbox/extras/views.py                            |  1 +
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename netbox/extras/migrations/{0043_report_model.py => 0043_report.py} (100%)

diff --git a/netbox/extras/migrations/0043_report_model.py b/netbox/extras/migrations/0043_report.py
similarity index 100%
rename from netbox/extras/migrations/0043_report_model.py
rename to netbox/extras/migrations/0043_report.py
diff --git a/netbox/extras/migrations/0044_jobresult.py b/netbox/extras/migrations/0044_jobresult.py
index f52451b8e..006d2878b 100644
--- a/netbox/extras/migrations/0044_jobresult.py
+++ b/netbox/extras/migrations/0044_jobresult.py
@@ -1,24 +1,23 @@
-# Generated by Django 3.0.7 on 2020-06-23 02:28
-
 import uuid
 
-from django.conf import settings
 import django.contrib.postgres.fields.jsonb
-from django.db import migrations, models
 import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
 import extras.utils
+from extras.choices import JobResultStatusChoices
 
 
 def convert_job_results(apps, schema_editor):
     """
     Convert ReportResult objects to JobResult objects
     """
-    from extras.choices import JobResultStatusChoices
-
+    Report = apps.get_model('extras', 'Report')
     ReportResult = apps.get_model('extras', 'ReportResult')
     JobResult = apps.get_model('extras', 'JobResult')
     ContentType = apps.get_model('contenttypes', 'ContentType')
-    report_content_type = ContentType.objects.get(app_label='extras', model='report')
+    report_content_type = ContentType.objects.get_for_model(Report)
 
     job_results = []
     for report_result in ReportResult.objects.all():
@@ -46,7 +45,7 @@ class Migration(migrations.Migration):
     dependencies = [
         ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('extras', '0043_report_model'),
+        ('extras', '0043_report'),
     ]
 
     operations = [
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 316f3b247..009fdc2d1 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -662,7 +662,6 @@ class JobResult(models.Model):
 
         self.save()
 
-
     @classmethod
     def enqueue_job(cls, func, name, obj_type, user, *args, **kwargs):
         """
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index a7d89fb1f..7b1699398 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -431,6 +431,7 @@ class ReportResultView(ContentTypePermissionRequiredMixin, GetReportMixin, View)
             'run_form': ConfirmationForm(),
         })
 
+
 #
 # Scripts
 #

From e02936a44a4f4e0fd2c9ec3074a6512f40f7789e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 11:15:20 -0400
Subject: [PATCH 301/505] Fix reports API test case

---
 netbox/extras/api/views.py      |  4 ++--
 netbox/extras/tests/test_api.py | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 679c4e96d..878bf009a 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -217,7 +217,7 @@ class ReportViewSet(ViewSet):
         """
 
         # Check that the user has permission to run reports.
-        if not request.user.has_perm('extras.add_reportresult'):
+        if not request.user.has_perm('extras.run_script'):
             raise PermissionDenied("This user does not have permission to run reports.")
 
         # Retrieve and run the Report. This will create a new JobResult.
@@ -231,7 +231,7 @@ class ReportViewSet(ViewSet):
         )
         report.result = job_result
 
-        serializer = serializers.ReportDetailSerializer(report)
+        serializer = serializers.ReportDetailSerializer(report, context={'request': request})
 
         return Response(serializer.data)
 
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index cf615d914..f6b7811cd 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -6,7 +6,7 @@ from django.utils import timezone
 from rest_framework import status
 
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Rack, RackGroup, RackRole, Site
-from extras.api.views import ScriptViewSet
+from extras.api.views import ReportViewSet, ScriptViewSet
 from extras.models import ConfigContext, Graph, ExportTemplate, Tag
 from extras.reports import Report
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
@@ -211,28 +211,29 @@ class ConfigContextTest(APIViewTestCases.APIViewTestCase):
 class ReportTest(APITestCase):
 
     class TestReport(Report):
-        pass  # The report is not actually run, we are testing that the view enqueues the job
+
+        def test_foo(self):
+            self.log_success(None, "Report completed")
 
     def get_test_report(self, *args):
-        return self.TestReport
+        return self.TestReport()
 
     def setUp(self):
-
         super().setUp()
 
         # Monkey-patch the API viewset's _get_script method to return our test script above
-        ReportViewSet._get_report = self.get_test_report
+        ReportViewSet._retrieve_report = self.get_test_report
 
     def test_get_report(self):
-
         url = reverse('extras-api:report-detail', kwargs={'pk': None})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(response.data['name'], self.TestReport.__name__)
 
     def test_run_report(self):
+        self.add_permissions('extras.run_script')
 
-        url = reverse('extras-api:report-detail', kwargs={'pk': None})
+        url = reverse('extras-api:report-run', kwargs={'pk': None})
         response = self.client.post(url, {}, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_200_OK)
 

From 1f905e72d9aedcf237d67f5401150c9e188ffbae Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 11:51:28 -0400
Subject: [PATCH 302/505] Fix stray reference to LOG_LEVEL_CODES

---
 netbox/extras/api/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 1befd082f..a466cb560 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -302,7 +302,7 @@ class ScriptLogMessageSerializer(serializers.Serializer):
     message = serializers.SerializerMethodField(read_only=True)
 
     def get_status(self, instance):
-        return LOG_LEVEL_CODES.get(instance[0])
+        return instance[0]
 
     def get_message(self, instance):
         return instance[1]

From 592ad18317a1a8efd4833f8659aaa646324af753 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 13:30:13 -0400
Subject: [PATCH 303/505] Provide a default view for Report instances

---
 netbox/extras/reports.py                   | 11 +++++--
 netbox/templates/extras/report.html        | 38 ++++++++++++++++++++++
 netbox/templates/extras/report_list.html   | 22 ++++++++-----
 netbox/templates/extras/report_result.html |  2 +-
 4 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 netbox/templates/extras/report.html

diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index 45496d396..439868dfd 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -146,12 +146,19 @@ class Report(object):
         return self.__module__
 
     @property
-    def name(self):
+    def class_name(self):
         return self.__class__.__name__
 
+    @property
+    def name(self):
+        """
+        Override this attribute to set a custom display name.
+        """
+        return self.class_name
+
     @property
     def full_name(self):
-        return '.'.join([self.__module__, self.__class__.__name__])
+        return f'{self.module}.{self.class_name}'
 
     def _log(self, obj, message, level=LogLevelChoices.LOG_DEFAULT):
         """
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
new file mode 100644
index 000000000..58bee4059
--- /dev/null
+++ b/netbox/templates/extras/report.html
@@ -0,0 +1,38 @@
+{% extends 'base.html' %}
+{% load helpers %}
+
+{% block title %}{{ report.name }}{% endblock %}
+
+{% block content %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                <li><a href="{% url 'extras:report_list' %}">Reports</a></li>
+                <li><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
+                <li>{{ report.name }}</li>
+            </ol>
+        </div>
+    </div>
+    {% if perms.extras.run_report %}
+        <div class="pull-right noprint">
+            <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
+                {% csrf_token %}
+                {{ run_form }}
+                <button type="submit" name="_run" class="btn btn-primary"><i class="fa fa-play"></i> Run Report</button>
+            </form>
+        </div>
+    {% endif %}
+    <h1>{{ report.name }}</h1>
+    <div class="row">
+        <div class="col-md-12">
+            {% if report.description %}
+                <p class="lead">{{ report.description }}</p>
+            {% endif %}
+            {% if report.result %}
+                <p>Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
+                    <strong>{{ report.result.created }}</strong>
+                </a></p>
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index f507cf2b1..7918366d9 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -6,7 +6,7 @@
     <div class="row">
         <div class="col-md-9">
             {% if reports %}
-            {% for module, module_reports in reports %}
+                {% for module, module_reports in reports %}
                     <h3><a name="module.{{ module }}"></a>{{ module|bettertitle }}</h3>
                     <table class="table table-hover table-headings reports">
                         <thead>
@@ -21,17 +21,21 @@
                             {% for report in module_reports %}
                                 <tr>
                                     <td>
-                                        <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}" name="report.{{ report.name }}"><strong>{{ report.name }}</strong></a>
+                                        <a href="{% url 'extras:report' module=report.module name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">
+                                            <strong>{{ report.name }}</strong>
+                                        </a>
                                     </td>
                                     <td>
                                         {% include 'extras/inc/job_label.html' with result=report.result %}
                                     </td>
-                                    <td>{{ report.description|default:"" }}</td>
-                                    {% if report.result %}
-                                        <td class="text-right">{{ report.result.created }}</td>
-                                    {% else %}
-                                        <td class="text-right text-muted">Never</td>
-                                    {% endif %}
+                                    <td>{{ report.description|placeholder }}</td>
+                                    <td class="text-right">
+                                        {% if report.result %}
+                                            <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">{{ report.result.created }}</a>
+                                        {% else %}
+                                            <span class="text-muted">Never</span>
+                                        {% endif %}
+                                    </td>
                                 </tr>
                                 {% for method, stats in report.result.data.items %}
                                     <tr>
@@ -66,7 +70,7 @@
                         </div>
                         <ul class="list-group">
                             {% for report in module_reports %}
-                                <a href="#report.{{ report.name }}" class="list-group-item">
+                                <a href="#{{ report.module }}.{{ report.class_name }}" class="list-group-item">
                                     <i class="fa fa-list-alt"></i> {{ report.name }}
                                     <div class="pull-right">
                                         {% include 'extras/inc/job_label.html' with result=report.result %}
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index 2433c381d..784e79aa3 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -14,7 +14,7 @@
             </ol>
         </div>
     </div>
-    {% if perms.extras.add_reportresult %}
+    {% if perms.extras.run_report %}
         <div class="pull-right noprint">
             <form action="{% url 'extras:report' module=report.module name=report.name %}" method="post">
                 {% csrf_token %}

From 9a075130f13cf5fe23ecfce0ab51831b00e62273 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 14:02:06 -0400
Subject: [PATCH 304/505] Changelog for #2006

---
 docs/release-notes/version-2.9.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index c13d45f95..b98a7e0a5 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -8,6 +8,10 @@
 
 NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of constraints. The permission will apply only to objects which match the specified constraints. For example, assigning permission to modify devices with the constraint `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
 
+#### Background Script & Report Execution ([#2006](https://github.com/netbox-community/netbox/issues/2006))
+
+When running a report or custom script, the task is now queued for background processing and a response is immediately returned to the user. This prevents long-running scripts from blocking the response, and avoids WSGI timeout errors. Once the task has completed, the page will automatically refresh to display its results. Both scripts and reports now store their output in the new JobResult model. (The ReportResult model has been removed.)
+
 ### Enhancements
 
 * [#2018](https://github.com/netbox-community/netbox/issues/2018) - Add `name` field to virtual chassis model
@@ -44,6 +48,8 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 * The serialized representation of a virtual machine interface now includes only relevant fields: `type`, `lag`, `mgmt_only`, `connected_endpoint_type`, `connected_endpoint`, and `cable` are no longer included.
 * dcim.VirtualChassis: Added a mandatory `name` field
 * An optional `description` field has been added to all device component templates
+* extras.Report: The `failed` field has been removed. The `completed` (boolean) and `status` (string) fields have been introduced to convey the status of a report's most recent execution. Additionally, the `result` field now conveys the nested representation of a JobResult.
+* extras.Script: Added `module` and `result` fields. The `result` field now conveys the nested representation of a JobResult.
 
 ### Other Changes
 

From 924f31934366bfdb33f3550bc2afac8bfce0009c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 16:41:08 -0400
Subject: [PATCH 305/505] Closes #4806: Add a url field to all API serializers

---
 docs/release-notes/version-2.9.md        |   2 +
 netbox/circuits/api/serializers.py       |  12 ++-
 netbox/dcim/api/serializers.py           | 125 ++++++++++++++---------
 netbox/extras/api/serializers.py         |  32 ++++--
 netbox/ipam/api/serializers.py           |  37 ++++---
 netbox/secrets/api/serializers.py        |   7 +-
 netbox/tenancy/api/serializers.py        |   6 +-
 netbox/virtualization/api/serializers.py |  21 ++--
 8 files changed, 158 insertions(+), 84 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index b98a7e0a5..ffae2f5de 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -22,6 +22,7 @@ When running a report or custom script, the task is now queued for background pr
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
 * [#4793](https://github.com/netbox-community/netbox/issues/4793) - Add `description` field to device component templates
 * [#4795](https://github.com/netbox-community/netbox/issues/4795) - Add bulk disconnect capability for console and power ports
+* [#4806](https://github.com/netbox-community/netbox/issues/4806) - Add a `url` field to all API serializers
 * [#4807](https://github.com/netbox-community/netbox/issues/4807) - Add bulk edit ability for device bay templates
 * [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
 
@@ -50,6 +51,7 @@ When running a report or custom script, the task is now queued for background pr
 * An optional `description` field has been added to all device component templates
 * extras.Report: The `failed` field has been removed. The `completed` (boolean) and `status` (string) fields have been introduced to convey the status of a report's most recent execution. Additionally, the `result` field now conveys the nested representation of a JobResult.
 * extras.Script: Added `module` and `result` fields. The `result` field now conveys the nested representation of a JobResult.
+* A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
 
 ### Other Changes
 
diff --git a/netbox/circuits/api/serializers.py b/netbox/circuits/api/serializers.py
index e8171e2fb..10ae5e5ee 100644
--- a/netbox/circuits/api/serializers.py
+++ b/netbox/circuits/api/serializers.py
@@ -16,12 +16,13 @@ from .nested_serializers import *
 #
 
 class ProviderSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:provider-detail')
     circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Provider
         fields = [
-            'id', 'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags',
+            'id', 'url', 'name', 'slug', 'asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments', 'tags',
             'custom_fields', 'created', 'last_updated', 'circuit_count',
         ]
 
@@ -31,11 +32,12 @@ class ProviderSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class CircuitTypeSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittype-detail')
     circuit_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = CircuitType
-        fields = ['id', 'name', 'slug', 'description', 'circuit_count']
+        fields = ['id', 'url', 'name', 'slug', 'description', 'circuit_count']
 
 
 class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
@@ -49,6 +51,7 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer):
 
 
 class CircuitSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuit-detail')
     provider = NestedProviderSerializer()
     status = ChoiceField(choices=CircuitStatusChoices, required=False)
     type = NestedCircuitTypeSerializer()
@@ -59,12 +62,13 @@ class CircuitSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Circuit
         fields = [
-            'id', 'cid', 'provider', 'type', 'status', 'tenant', 'install_date', 'commit_rate', 'description',
+            'id', 'url', 'cid', 'provider', 'type', 'status', 'tenant', 'install_date', 'commit_rate', 'description',
             'termination_a', 'termination_z', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
         ]
 
 
 class CircuitTerminationSerializer(ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='circuits-api:circuittermination-detail')
     circuit = NestedCircuitSerializer()
     site = NestedSiteSerializer()
     cable = NestedCableSerializer(read_only=True)
@@ -72,6 +76,6 @@ class CircuitTerminationSerializer(ConnectedEndpointSerializer):
     class Meta:
         model = CircuitTermination
         fields = [
-            'id', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
+            'id', 'url', 'circuit', 'term_side', 'site', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info',
             'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable',
         ]
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 3f1eff6a4..916f86487 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -60,15 +60,17 @@ class ConnectedEndpointSerializer(ValidatedModelSerializer):
 #
 
 class RegionSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
     parent = NestedRegionSerializer(required=False, allow_null=True)
     site_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Region
-        fields = ['id', 'name', 'slug', 'parent', 'description', 'site_count']
+        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'site_count']
 
 
 class SiteSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:site-detail')
     status = ChoiceField(choices=SiteStatusChoices, required=False)
     region = NestedRegionSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -83,7 +85,7 @@ class SiteSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Site
         fields = [
-            'id', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description',
+            'id', 'url', 'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description',
             'physical_address', 'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone',
             'contact_email', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'circuit_count',
             'device_count', 'prefix_count', 'rack_count', 'virtualmachine_count', 'vlan_count',
@@ -95,24 +97,27 @@ class SiteSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class RackGroupSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail')
     site = NestedSiteSerializer()
     parent = NestedRackGroupSerializer(required=False, allow_null=True)
     rack_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = RackGroup
-        fields = ['id', 'name', 'slug', 'site', 'parent', 'description', 'rack_count']
+        fields = ['id', 'url', 'name', 'slug', 'site', 'parent', 'description', 'rack_count']
 
 
 class RackRoleSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackrole-detail')
     rack_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = RackRole
-        fields = ['id', 'name', 'slug', 'color', 'description', 'rack_count']
+        fields = ['id', 'url', 'name', 'slug', 'color', 'description', 'rack_count']
 
 
 class RackSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rack-detail')
     site = NestedSiteSerializer()
     group = NestedRackGroupSerializer(required=False, allow_null=True, default=None)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -127,7 +132,7 @@ class RackSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Rack
         fields = [
-            'id', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial',
+            'id', 'url', 'name', 'facility_id', 'display_name', 'site', 'group', 'tenant', 'status', 'role', 'serial',
             'asset_tag', 'type', 'width', 'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit',
             'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', 'powerfeed_count',
         ]
@@ -161,13 +166,14 @@ class RackUnitSerializer(serializers.Serializer):
 
 
 class RackReservationSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackreservation-detail')
     rack = NestedRackSerializer()
     user = NestedUserSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
 
     class Meta:
         model = RackReservation
-        fields = ['id', 'rack', 'units', 'created', 'user', 'tenant', 'description', 'tags']
+        fields = ['id', 'url', 'rack', 'units', 'created', 'user', 'tenant', 'description', 'tags']
 
 
 class RackElevationDetailFilterSerializer(serializers.Serializer):
@@ -211,6 +217,7 @@ class RackElevationDetailFilterSerializer(serializers.Serializer):
 #
 
 class ManufacturerSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:manufacturer-detail')
     devicetype_count = serializers.IntegerField(read_only=True)
     inventoryitem_count = serializers.IntegerField(read_only=True)
     platform_count = serializers.IntegerField(read_only=True)
@@ -218,11 +225,12 @@ class ManufacturerSerializer(ValidatedModelSerializer):
     class Meta:
         model = Manufacturer
         fields = [
-            'id', 'name', 'slug', 'description', 'devicetype_count', 'inventoryitem_count', 'platform_count',
+            'id', 'url', 'name', 'slug', 'description', 'devicetype_count', 'inventoryitem_count', 'platform_count',
         ]
 
 
 class DeviceTypeSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicetype-detail')
     manufacturer = NestedManufacturerSerializer()
     subdevice_role = ChoiceField(choices=SubdeviceRoleChoices, allow_blank=True, required=False)
     device_count = serializers.IntegerField(read_only=True)
@@ -230,13 +238,14 @@ class DeviceTypeSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = DeviceType
         fields = [
-            'id', 'manufacturer', 'model', 'slug', 'display_name', 'part_number', 'u_height', 'is_full_depth',
+            'id', 'url', 'manufacturer', 'model', 'slug', 'display_name', 'part_number', 'u_height', 'is_full_depth',
             'subdevice_role', 'front_image', 'rear_image', 'comments', 'tags', 'custom_fields', 'created',
             'last_updated', 'device_count',
         ]
 
 
 class ConsolePortTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleporttemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -246,10 +255,11 @@ class ConsolePortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsolePortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'description']
 
 
 class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverporttemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -259,10 +269,11 @@ class ConsoleServerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ConsoleServerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'description']
 
 
 class PowerPortTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerporttemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(
         choices=PowerPortTypeChoices,
@@ -272,10 +283,11 @@ class PowerPortTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description']
 
 
 class PowerOutletTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlettemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(
         choices=PowerOutletTypeChoices,
@@ -293,43 +305,47 @@ class PowerOutletTemplateSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = PowerOutletTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description']
 
 
 class InterfaceTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interfacetemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=InterfaceTypeChoices)
 
     class Meta:
         model = InterfaceTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'mgmt_only', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'mgmt_only', 'description']
 
 
 class RearPortTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearporttemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=PortTypeChoices)
 
     class Meta:
         model = RearPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'positions', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'positions', 'description']
 
 
 class FrontPortTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontporttemplate-detail')
     device_type = NestedDeviceTypeSerializer()
     type = ChoiceField(choices=PortTypeChoices)
     rear_port = NestedRearPortTemplateSerializer()
 
     class Meta:
         model = FrontPortTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description']
 
 
 class DeviceBayTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebaytemplate-detail')
     device_type = NestedDeviceTypeSerializer()
 
     class Meta:
         model = DeviceBayTemplate
-        fields = ['id', 'device_type', 'name', 'label', 'description']
+        fields = ['id', 'url', 'device_type', 'name', 'label', 'description']
 
 
 #
@@ -337,17 +353,19 @@ class DeviceBayTemplateSerializer(ValidatedModelSerializer):
 #
 
 class DeviceRoleSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicerole-detail')
     device_count = serializers.IntegerField(read_only=True)
     virtualmachine_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = DeviceRole
         fields = [
-            'id', 'name', 'slug', 'color', 'vm_role', 'description', 'device_count', 'virtualmachine_count',
+            'id', 'url', 'name', 'slug', 'color', 'vm_role', 'description', 'device_count', 'virtualmachine_count',
         ]
 
 
 class PlatformSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:platform-detail')
     manufacturer = NestedManufacturerSerializer(required=False, allow_null=True)
     device_count = serializers.IntegerField(read_only=True)
     virtualmachine_count = serializers.IntegerField(read_only=True)
@@ -355,12 +373,13 @@ class PlatformSerializer(ValidatedModelSerializer):
     class Meta:
         model = Platform
         fields = [
-            'id', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'description', 'device_count',
+            'id', 'url', 'name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'description', 'device_count',
             'virtualmachine_count',
         ]
 
 
 class DeviceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:device-detail')
     device_type = NestedDeviceTypeSerializer()
     device_role = NestedDeviceRoleSerializer()
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -379,10 +398,10 @@ class DeviceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Device
         fields = [
-            'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
-            'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
-            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags',
-            'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial',
+            'asset_tag', 'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4',
+            'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data',
+            'tags', 'custom_fields', 'created', 'last_updated',
         ]
         validators = []
 
@@ -415,10 +434,10 @@ class DeviceWithConfigContextSerializer(DeviceSerializer):
 
     class Meta(DeviceSerializer.Meta):
         fields = [
-            'id', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial', 'asset_tag',
-            'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4', 'primary_ip6',
-            'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data', 'tags',
-            'custom_fields', 'config_context', 'created', 'last_updated',
+            'id', 'url', 'name', 'display_name', 'device_type', 'device_role', 'tenant', 'platform', 'serial',
+            'asset_tag', 'site', 'rack', 'position', 'face', 'parent_device', 'status', 'primary_ip', 'primary_ip4',
+            'primary_ip6', 'cluster', 'virtual_chassis', 'vc_position', 'vc_priority', 'comments', 'local_context_data',
+            'tags', 'custom_fields', 'config_context', 'created', 'last_updated',
         ]
 
     @swagger_serializer_method(serializer_or_field=serializers.DictField)
@@ -431,6 +450,7 @@ class DeviceNAPALMSerializer(serializers.Serializer):
 
 
 class ConsoleServerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleserverport-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -442,12 +462,13 @@ class ConsoleServerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSeria
     class Meta:
         model = ConsoleServerPort
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
-            'connection_status', 'cable', 'tags',
+            'id', 'url', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type',
+            'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
 
 class ConsolePortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:consoleport-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=ConsolePortTypeChoices,
@@ -459,12 +480,13 @@ class ConsolePortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer)
     class Meta:
         model = ConsolePort
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type', 'connected_endpoint',
-            'connection_status', 'cable', 'tags',
+            'id', 'url', 'device', 'name', 'label', 'type', 'description', 'connected_endpoint_type',
+            'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
 
 class PowerOutletSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:poweroutlet-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=PowerOutletTypeChoices,
@@ -486,12 +508,13 @@ class PowerOutletSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer)
     class Meta:
         model = PowerOutlet
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description', 'connected_endpoint_type',
-            'connected_endpoint', 'connection_status', 'cable', 'tags',
+            'id', 'url', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description',
+            'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
 
 class PowerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerport-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(
         choices=PowerPortTypeChoices,
@@ -503,12 +526,13 @@ class PowerPortSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = PowerPort
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
-            'connected_endpoint', 'connection_status', 'cable', 'tags',
+            'id', 'url', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description',
+            'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'tags',
         ]
 
 
 class InterfaceSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:interface-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=InterfaceTypeChoices)
     lag = NestedInterfaceSerializer(required=False, allow_null=True)
@@ -526,9 +550,9 @@ class InterfaceSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
     class Meta:
         model = Interface
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only', 'description',
-            'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode', 'untagged_vlan',
-            'tagged_vlans', 'tags', 'count_ipaddresses',
+            'id', 'url', 'device', 'name', 'label', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'mgmt_only',
+            'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status', 'cable', 'mode',
+            'untagged_vlan', 'tagged_vlans', 'tags', 'count_ipaddresses',
         ]
 
     # TODO: This validation should be handled by Interface.clean()
@@ -553,13 +577,14 @@ class InterfaceSerializer(TaggedObjectSerializer, ConnectedEndpointSerializer):
 
 
 class RearPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rearport-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=PortTypeChoices)
     cable = NestedCableSerializer(read_only=True)
 
     class Meta:
         model = RearPort
-        fields = ['id', 'device', 'name', 'label', 'type', 'positions', 'description', 'cable', 'tags']
+        fields = ['id', 'url', 'device', 'name', 'label', 'type', 'positions', 'description', 'cable', 'tags']
 
 
 class FrontPortRearPortSerializer(WritableNestedSerializer):
@@ -574,6 +599,7 @@ class FrontPortRearPortSerializer(WritableNestedSerializer):
 
 
 class FrontPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:frontport-detail')
     device = NestedDeviceSerializer()
     type = ChoiceField(choices=PortTypeChoices)
     rear_port = FrontPortRearPortSerializer()
@@ -582,17 +608,19 @@ class FrontPortSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = FrontPort
         fields = [
-            'id', 'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'cable', 'tags',
+            'id', 'url', 'device', 'name', 'label', 'type', 'rear_port', 'rear_port_position', 'description', 'cable',
+            'tags',
         ]
 
 
 class DeviceBaySerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:devicebay-detail')
     device = NestedDeviceSerializer()
     installed_device = NestedDeviceSerializer(required=False, allow_null=True)
 
     class Meta:
         model = DeviceBay
-        fields = ['id', 'device', 'name', 'label', 'description', 'installed_device', 'tags']
+        fields = ['id', 'url', 'device', 'name', 'label', 'description', 'installed_device', 'tags']
 
 
 #
@@ -600,6 +628,7 @@ class DeviceBaySerializer(TaggedObjectSerializer, ValidatedModelSerializer):
 #
 
 class InventoryItemSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:inventoryitem-detail')
     device = NestedDeviceSerializer()
     # Provide a default value to satisfy UniqueTogetherValidator
     parent = serializers.PrimaryKeyRelatedField(queryset=InventoryItem.objects.all(), allow_null=True, default=None)
@@ -608,7 +637,7 @@ class InventoryItemSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = InventoryItem
         fields = [
-            'id', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered',
+            'id', 'url', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered',
             'description', 'tags',
         ]
 
@@ -618,6 +647,7 @@ class InventoryItemSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
 #
 
 class CableSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail')
     termination_a_type = ContentTypeField(
         queryset=ContentType.objects.filter(CABLE_TERMINATION_MODELS)
     )
@@ -632,8 +662,8 @@ class CableSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = Cable
         fields = [
-            'id', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type', 'termination_b_id',
-            'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', 'tags',
+            'id', 'url', 'termination_a_type', 'termination_a_id', 'termination_a', 'termination_b_type',
+            'termination_b_id', 'termination_b', 'type', 'status', 'label', 'color', 'length', 'length_unit', 'tags',
         ]
 
     def _get_termination(self, obj, side):
@@ -697,12 +727,13 @@ class InterfaceConnectionSerializer(ValidatedModelSerializer):
 #
 
 class VirtualChassisSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:virtualchassis-detail')
     master = NestedDeviceSerializer(required=False)
     member_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = VirtualChassis
-        fields = ['id', 'name', 'domain', 'master', 'tags', 'member_count']
+        fields = ['id', 'url', 'name', 'domain', 'master', 'tags', 'member_count']
 
 
 #
@@ -710,6 +741,7 @@ class VirtualChassisSerializer(TaggedObjectSerializer, ValidatedModelSerializer)
 #
 
 class PowerPanelSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerpanel-detail')
     site = NestedSiteSerializer()
     rack_group = NestedRackGroupSerializer(
         required=False,
@@ -720,10 +752,11 @@ class PowerPanelSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
 
     class Meta:
         model = PowerPanel
-        fields = ['id', 'site', 'rack_group', 'name', 'tags', 'powerfeed_count']
+        fields = ['id', 'url', 'site', 'rack_group', 'name', 'tags', 'powerfeed_count']
 
 
 class PowerFeedSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='dcim-api:powerfeed-detail')
     power_panel = NestedPowerPanelSerializer()
     rack = NestedRackSerializer(
         required=False,
@@ -750,6 +783,6 @@ class PowerFeedSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = PowerFeed
         fields = [
-            'id', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
+            'id', 'url', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
             'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
         ]
diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index a466cb560..2f0235e80 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -9,7 +9,6 @@ from dcim.api.nested_serializers import (
 )
 from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site
 from extras.choices import *
-from extras.constants import *
 from extras.models import (
     ConfigContext, ExportTemplate, Graph, ImageAttachment, ObjectChange, JobResult, Tag,
 )
@@ -31,13 +30,14 @@ from .nested_serializers import *
 #
 
 class GraphSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:graph-detail')
     type = ContentTypeField(
         queryset=ContentType.objects.filter(FeatureQuery('graphs').get_query()),
     )
 
     class Meta:
         model = Graph
-        fields = ['id', 'type', 'weight', 'name', 'template_language', 'source', 'link']
+        fields = ['id', 'url', 'type', 'weight', 'name', 'template_language', 'source', 'link']
 
 
 class RenderedGraphSerializer(serializers.ModelSerializer):
@@ -67,6 +67,7 @@ class RenderedGraphSerializer(serializers.ModelSerializer):
 #
 
 class ExportTemplateSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:exporttemplate-detail')
     content_type = ContentTypeField(
         queryset=ContentType.objects.filter(FeatureQuery('export_templates').get_query()),
     )
@@ -78,7 +79,7 @@ class ExportTemplateSerializer(ValidatedModelSerializer):
     class Meta:
         model = ExportTemplate
         fields = [
-            'id', 'content_type', 'name', 'description', 'template_language', 'template_code', 'mime_type',
+            'id', 'url', 'content_type', 'name', 'description', 'template_language', 'template_code', 'mime_type',
             'file_extension',
         ]
 
@@ -88,11 +89,12 @@ class ExportTemplateSerializer(ValidatedModelSerializer):
 #
 
 class TagSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detail')
     tagged_items = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Tag
-        fields = ['id', 'name', 'slug', 'color', 'description', 'tagged_items']
+        fields = ['id', 'url', 'name', 'slug', 'color', 'description', 'tagged_items']
 
 
 class TaggedObjectSerializer(serializers.Serializer):
@@ -122,6 +124,7 @@ class TaggedObjectSerializer(serializers.Serializer):
 #
 
 class ImageAttachmentSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail')
     content_type = ContentTypeField(
         queryset=ContentType.objects.all()
     )
@@ -130,7 +133,8 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
     class Meta:
         model = ImageAttachment
         fields = [
-            'id', 'content_type', 'object_id', 'parent', 'name', 'image', 'image_height', 'image_width', 'created',
+            'id', 'url', 'content_type', 'object_id', 'parent', 'name', 'image', 'image_height', 'image_width',
+            'created',
         ]
 
     def validate(self, data):
@@ -169,6 +173,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
 #
 
 class ConfigContextSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:configcontext-detail')
     regions = SerializedPKRelatedField(
         queryset=Region.objects.all(),
         serializer=NestedRegionSerializer,
@@ -227,7 +232,7 @@ class ConfigContextSerializer(ValidatedModelSerializer):
     class Meta:
         model = ConfigContext
         fields = [
-            'id', 'name', 'weight', 'description', 'is_active', 'regions', 'sites', 'roles', 'platforms',
+            'id', 'url', 'name', 'weight', 'description', 'is_active', 'regions', 'sites', 'roles', 'platforms',
             'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'tags', 'data',
         ]
 
@@ -258,6 +263,11 @@ class JobResultSerializer(serializers.ModelSerializer):
 #
 
 class ReportSerializer(serializers.Serializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='extras-api:report-detail',
+        lookup_field='full_name',
+        lookup_url_kwarg='pk'
+    )
     id = serializers.CharField(read_only=True, source="full_name")
     module = serializers.CharField(max_length=255)
     name = serializers.CharField(max_length=255)
@@ -275,6 +285,11 @@ class ReportDetailSerializer(ReportSerializer):
 #
 
 class ScriptSerializer(serializers.Serializer):
+    url = serializers.HyperlinkedIdentityField(
+        view_name='extras-api:script-detail',
+        lookup_field='full_name',
+        lookup_url_kwarg='pk'
+    )
     id = serializers.CharField(read_only=True, source="full_name")
     module = serializers.CharField(max_length=255)
     name = serializers.CharField(read_only=True)
@@ -318,6 +333,7 @@ class ScriptOutputSerializer(serializers.Serializer):
 #
 
 class ObjectChangeSerializer(serializers.ModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:objectchange-detail')
     user = NestedUserSerializer(
         read_only=True
     )
@@ -335,8 +351,8 @@ class ObjectChangeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ObjectChange
         fields = [
-            'id', 'time', 'user', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id',
-            'changed_object', 'object_data',
+            'id', 'url', 'time', 'user', 'user_name', 'request_id', 'action', 'changed_object_type',
+            'changed_object_id', 'changed_object', 'object_data',
         ]
 
     @swagger_serializer_method(serializer_or_field=serializers.DictField)
diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py
index d7f70f113..a98681d34 100644
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -27,6 +27,7 @@ from .nested_serializers import *
 #
 
 class VRFSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vrf-detail')
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     ipaddress_count = serializers.IntegerField(read_only=True)
     prefix_count = serializers.IntegerField(read_only=True)
@@ -34,8 +35,8 @@ class VRFSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = VRF
         fields = [
-            'id', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'tags', 'display_name', 'custom_fields',
-            'created', 'last_updated', 'ipaddress_count', 'prefix_count',
+            'id', 'url', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'tags', 'display_name',
+            'custom_fields', 'created', 'last_updated', 'ipaddress_count', 'prefix_count',
         ]
 
 
@@ -44,21 +45,23 @@ class VRFSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class RIRSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:rir-detail')
     aggregate_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = RIR
-        fields = ['id', 'name', 'slug', 'is_private', 'description', 'aggregate_count']
+        fields = ['id', 'url', 'name', 'slug', 'is_private', 'description', 'aggregate_count']
 
 
 class AggregateSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:aggregate-detail')
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     rir = NestedRIRSerializer()
 
     class Meta:
         model = Aggregate
         fields = [
-            'id', 'family', 'prefix', 'rir', 'date_added', 'description', 'tags', 'custom_fields', 'created',
+            'id', 'url', 'family', 'prefix', 'rir', 'date_added', 'description', 'tags', 'custom_fields', 'created',
             'last_updated',
         ]
         read_only_fields = ['family']
@@ -69,21 +72,23 @@ class AggregateSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class RoleSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:role-detail')
     prefix_count = serializers.IntegerField(read_only=True)
     vlan_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Role
-        fields = ['id', 'name', 'slug', 'weight', 'description', 'prefix_count', 'vlan_count']
+        fields = ['id', 'url', 'name', 'slug', 'weight', 'description', 'prefix_count', 'vlan_count']
 
 
 class VLANGroupSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlangroup-detail')
     site = NestedSiteSerializer(required=False, allow_null=True)
     vlan_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = VLANGroup
-        fields = ['id', 'name', 'slug', 'site', 'description', 'vlan_count']
+        fields = ['id', 'url', 'name', 'slug', 'site', 'description', 'vlan_count']
         validators = []
 
     def validate(self, data):
@@ -101,6 +106,7 @@ class VLANGroupSerializer(ValidatedModelSerializer):
 
 
 class VLANSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:vlan-detail')
     site = NestedSiteSerializer(required=False, allow_null=True)
     group = NestedVLANGroupSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -111,8 +117,8 @@ class VLANSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = VLAN
         fields = [
-            'id', 'site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description', 'tags', 'display_name',
-            'custom_fields', 'created', 'last_updated', 'prefix_count',
+            'id', 'url', 'site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description', 'tags',
+            'display_name', 'custom_fields', 'created', 'last_updated', 'prefix_count',
         ]
         validators = []
 
@@ -135,6 +141,7 @@ class VLANSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class PrefixSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:prefix-detail')
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     site = NestedSiteSerializer(required=False, allow_null=True)
     vrf = NestedVRFSerializer(required=False, allow_null=True)
@@ -146,8 +153,8 @@ class PrefixSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Prefix
         fields = [
-            'id', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'description',
-            'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool',
+            'description', 'tags', 'custom_fields', 'created', 'last_updated',
         ]
         read_only_fields = ['family']
 
@@ -227,6 +234,7 @@ class IPAddressInterfaceSerializer(WritableNestedSerializer):
 
 
 class IPAddressSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail')
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)
     vrf = NestedVRFSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -243,9 +251,9 @@ class IPAddressSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = IPAddress
         fields = [
-            'id', 'family', 'address', 'vrf', 'tenant', 'status', 'role', 'assigned_object_type', 'assigned_object_id',
-            'assigned_object', 'nat_inside', 'nat_outside', 'dns_name', 'description', 'tags', 'custom_fields',
-            'created', 'last_updated',
+            'id', 'url', 'family', 'address', 'vrf', 'tenant', 'status', 'role', 'assigned_object_type',
+            'assigned_object_id', 'assigned_object', 'nat_inside', 'nat_outside', 'dns_name', 'description', 'tags',
+            'custom_fields', 'created', 'last_updated',
         ]
         read_only_fields = ['family']
 
@@ -283,6 +291,7 @@ class AvailableIPSerializer(serializers.Serializer):
 #
 
 class ServiceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='ipam-api:service-detail')
     device = NestedDeviceSerializer(required=False, allow_null=True)
     virtual_machine = NestedVirtualMachineSerializer(required=False, allow_null=True)
     protocol = ChoiceField(choices=ServiceProtocolChoices, required=False)
@@ -296,6 +305,6 @@ class ServiceSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Service
         fields = [
-            'id', 'device', 'virtual_machine', 'name', 'port', 'protocol', 'ipaddresses', 'description', 'tags',
+            'id', 'url', 'device', 'virtual_machine', 'name', 'port', 'protocol', 'ipaddresses', 'description', 'tags',
             'custom_fields', 'created', 'last_updated',
         ]
diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py
index 54132dd34..2862259d8 100644
--- a/netbox/secrets/api/serializers.py
+++ b/netbox/secrets/api/serializers.py
@@ -13,14 +13,16 @@ from .nested_serializers import *
 #
 
 class SecretRoleSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secretrole-detail')
     secret_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = SecretRole
-        fields = ['id', 'name', 'slug', 'description', 'secret_count']
+        fields = ['id', 'url', 'name', 'slug', 'description', 'secret_count']
 
 
 class SecretSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='secrets-api:secret-detail')
     device = NestedDeviceSerializer()
     role = NestedSecretRoleSerializer()
     plaintext = serializers.CharField()
@@ -28,7 +30,8 @@ class SecretSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Secret
         fields = [
-            'id', 'device', 'role', 'name', 'plaintext', 'hash', 'tags', 'custom_fields', 'created', 'last_updated',
+            'id', 'url', 'device', 'role', 'name', 'plaintext', 'hash', 'tags', 'custom_fields', 'created',
+            'last_updated',
         ]
         validators = []
 
diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py
index 4454ac776..4589878e6 100644
--- a/netbox/tenancy/api/serializers.py
+++ b/netbox/tenancy/api/serializers.py
@@ -12,15 +12,17 @@ from .nested_serializers import *
 #
 
 class TenantGroupSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail')
     parent = NestedTenantGroupSerializer(required=False, allow_null=True)
     tenant_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = TenantGroup
-        fields = ['id', 'name', 'slug', 'parent', 'description', 'tenant_count']
+        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'tenant_count']
 
 
 class TenantSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenant-detail')
     group = NestedTenantGroupSerializer(required=False)
     circuit_count = serializers.IntegerField(read_only=True)
     device_count = serializers.IntegerField(read_only=True)
@@ -36,7 +38,7 @@ class TenantSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Tenant
         fields = [
-            'id', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'custom_fields', 'created',
+            'id', 'url', 'name', 'slug', 'group', 'description', 'comments', 'tags', 'custom_fields', 'created',
             'last_updated', 'circuit_count', 'device_count', 'ipaddress_count', 'prefix_count', 'rack_count',
             'site_count', 'virtualmachine_count', 'vlan_count', 'vrf_count', 'cluster_count',
         ]
diff --git a/netbox/virtualization/api/serializers.py b/netbox/virtualization/api/serializers.py
index 5698791f8..711e1359e 100644
--- a/netbox/virtualization/api/serializers.py
+++ b/netbox/virtualization/api/serializers.py
@@ -19,22 +19,25 @@ from .nested_serializers import *
 #
 
 class ClusterTypeSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustertype-detail')
     cluster_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = ClusterType
-        fields = ['id', 'name', 'slug', 'description', 'cluster_count']
+        fields = ['id', 'url', 'name', 'slug', 'description', 'cluster_count']
 
 
 class ClusterGroupSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:clustergroup-detail')
     cluster_count = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = ClusterGroup
-        fields = ['id', 'name', 'slug', 'description', 'cluster_count']
+        fields = ['id', 'url', 'name', 'slug', 'description', 'cluster_count']
 
 
 class ClusterSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:cluster-detail')
     type = NestedClusterTypeSerializer()
     group = NestedClusterGroupSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
@@ -45,8 +48,8 @@ class ClusterSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     class Meta:
         model = Cluster
         fields = [
-            'id', 'name', 'type', 'group', 'tenant', 'site', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
-            'device_count', 'virtualmachine_count',
+            'id', 'url', 'name', 'type', 'group', 'tenant', 'site', 'comments', 'tags', 'custom_fields', 'created',
+            'last_updated', 'device_count', 'virtualmachine_count',
         ]
 
 
@@ -55,6 +58,7 @@ class ClusterSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
 #
 
 class VirtualMachineSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:virtualmachine-detail')
     status = ChoiceField(choices=VirtualMachineStatusChoices, required=False)
     site = NestedSiteSerializer(read_only=True)
     cluster = NestedClusterSerializer()
@@ -68,7 +72,7 @@ class VirtualMachineSerializer(TaggedObjectSerializer, CustomFieldModelSerialize
     class Meta:
         model = VirtualMachine
         fields = [
-            'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
+            'id', 'url', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
             'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields',
             'created', 'last_updated',
         ]
@@ -80,7 +84,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 
     class Meta(VirtualMachineSerializer.Meta):
         fields = [
-            'id', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
+            'id', 'url', 'name', 'status', 'site', 'cluster', 'role', 'tenant', 'platform', 'primary_ip', 'primary_ip4',
             'primary_ip6', 'vcpus', 'memory', 'disk', 'comments', 'local_context_data', 'tags', 'custom_fields',
             'config_context', 'created', 'last_updated',
         ]
@@ -95,6 +99,7 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer):
 #
 
 class VMInterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='virtualization-api:vminterface-detail')
     virtual_machine = NestedVirtualMachineSerializer()
     mode = ChoiceField(choices=InterfaceModeChoices, allow_blank=True, required=False)
     untagged_vlan = NestedVLANSerializer(required=False, allow_null=True)
@@ -108,6 +113,6 @@ class VMInterfaceSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = VMInterface
         fields = [
-            'id', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan',
-            'tagged_vlans', 'tags',
+            'id', 'url', 'virtual_machine', 'name', 'enabled', 'mtu', 'mac_address', 'description', 'mode',
+            'untagged_vlan', 'tagged_vlans', 'tags',
         ]

From 15f5719f444a012c4394909921e592ed5b4982b3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 16:51:23 -0400
Subject: [PATCH 306/505] Remove unused class IPAddressInterfaceSerializer

---
 netbox/ipam/api/serializers.py | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py
index a98681d34..6be0b8a42 100644
--- a/netbox/ipam/api/serializers.py
+++ b/netbox/ipam/api/serializers.py
@@ -210,29 +210,6 @@ class AvailablePrefixSerializer(serializers.Serializer):
 # IP addresses
 #
 
-class IPAddressInterfaceSerializer(WritableNestedSerializer):
-    """
-    Nested representation of an Interface which may belong to a Device *or* a VirtualMachine.
-    """
-    url = serializers.SerializerMethodField()  # We're imitating a HyperlinkedIdentityField here
-    device = NestedDeviceSerializer(read_only=True)
-    virtual_machine = NestedVirtualMachineSerializer(read_only=True)
-
-    class Meta:
-        model = Interface
-        fields = [
-            'id', 'url', 'device', 'virtual_machine', 'name',
-        ]
-
-    def get_url(self, obj):
-        """
-        Return a link to the Interface via either the DCIM API if the parent is a Device, or via the virtualization API
-        if the parent is a VirtualMachine.
-        """
-        url_name = 'dcim-api:interface-detail' if obj.device else 'virtualization-api:interface-detail'
-        return reverse(url_name, kwargs={'pk': obj.pk}, request=self.context['request'])
-
-
 class IPAddressSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='ipam-api:ipaddress-detail')
     family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True)

From a2d957ba0d0eaf962c88f879d254132decdd7cfe Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 12:18:14 -0400
Subject: [PATCH 307/505] Use stock manager as default for Tag model

---
 netbox/extras/api/views.py   |  2 +-
 netbox/extras/models/tags.py |  4 ++--
 netbox/extras/views.py       | 14 ++++++--------
 netbox/utilities/filters.py  |  2 +-
 netbox/utilities/forms.py    |  2 +-
 netbox/utilities/utils.py    |  2 +-
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 878bf009a..853ebc46a 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -110,7 +110,7 @@ class ExportTemplateViewSet(ModelViewSet):
 #
 
 class TagViewSet(ModelViewSet):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted_objects.annotate(
         tagged_items=Count('extras_taggeditem_items', distinct=True)
     )
     serializer_class = serializers.TagSerializer
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index 39ac86073..5ced4b962 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -1,5 +1,4 @@
 from django.db import models
-from django.urls import reverse
 from django.utils.text import slugify
 from taggit.models import TagBase, GenericTaggedItemBase
 
@@ -22,7 +21,8 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
-    objects = RestrictedQuerySet.as_manager()
+    objects = models.Manager()
+    restricted_objects = RestrictedQuerySet.as_manager()
 
     csv_headers = ['name', 'slug', 'color', 'description']
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 7b1699398..10e711064 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -2,12 +2,10 @@ import time
 
 from django import template
 from django.conf import settings
-from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, Prefetch, Q
 from django.http import Http404, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.safestring import mark_safe
 from django.views.generic import View
 from django_tables2 import RequestConfig
 
@@ -33,7 +31,7 @@ from .scripts import get_scripts, run_script
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted_objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -44,23 +42,23 @@ class TagListView(ObjectListView):
 
 
 class TagEditView(ObjectEditView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted_objects.all()
     model_form = forms.TagForm
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted_objects.all()
 
 
 class TagBulkImportView(BulkImportView):
-    queryset = Tag.objects.all()
+    queryset = Tag.restricted_objects.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
 
 
 class TagBulkEditView(BulkEditView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted_objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -70,7 +68,7 @@ class TagBulkEditView(BulkEditView):
 
 
 class TagBulkDeleteView(BulkDeleteView):
-    queryset = Tag.objects.annotate(
+    queryset = Tag.restricted_objects.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
         'name'
diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py
index b13c55f40..f628ca917 100644
--- a/netbox/utilities/filters.py
+++ b/netbox/utilities/filters.py
@@ -102,7 +102,7 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter):
         kwargs.setdefault('field_name', 'tags__slug')
         kwargs.setdefault('to_field_name', 'slug')
         kwargs.setdefault('conjoined', True)
-        kwargs.setdefault('queryset', Tag.objects.unrestricted())
+        kwargs.setdefault('queryset', Tag.objects.all())
 
         super().__init__(*args, **kwargs)
 
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 851efd24f..494ae2f29 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -596,7 +596,7 @@ class TagFilterField(forms.MultipleChoiceField):
 
     def __init__(self, model, *args, **kwargs):
         def get_choices():
-            tags = model.tags.all().unrestricted().annotate(
+            tags = model.tags.annotate(
                 count=Count('extras_taggeditem_items')
             ).order_by('name')
             return [
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index b9d32d7b0..cb3db2465 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -217,7 +217,7 @@ def prepare_cloned_fields(instance):
 
     # Copy tags
     if is_taggable(instance):
-        params['tags'] = ','.join([t.name for t in instance.tags.all().unrestricted()])
+        params['tags'] = ','.join([t.name for t in instance.tags.all()])
 
     # Concatenate parameters into a URL query string
     param_string = '&'.join(

From 2fbe138c71e7ddaf2a15c4307059a6e01fcf1b40 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 13:13:19 -0400
Subject: [PATCH 308/505] Refactor APITestCase to provide dynamic queryset
 specification

---
 netbox/utilities/testing/api.py   | 43 +++++++++++++++----------------
 netbox/utilities/testing/views.py | 25 +++++++++---------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index fdaef4b4b..6bd9770d4 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -7,7 +7,7 @@ from rest_framework.test import APIClient
 
 from users.models import ObjectPermission, Token
 from .utils import disable_warnings
-from .views import TestCase
+from .views import ModelTestCase
 
 
 __all__ = (
@@ -20,9 +20,8 @@ __all__ = (
 # REST API Tests
 #
 
-class APITestCase(TestCase):
+class APITestCase(ModelTestCase):
     client_class = APIClient
-    model = None
 
     def setUp(self):
         """
@@ -52,7 +51,7 @@ class APIViewTestCases:
             """
             GET a single object as an unauthenticated user.
             """
-            url = self._get_detail_url(self.model.objects.unrestricted().first())
+            url = self._get_detail_url(self._get_queryset().first())
             response = self.client.get(url, **self.header)
             self.assertHttpStatus(response, status.HTTP_200_OK)
 
@@ -61,7 +60,7 @@ class APIViewTestCases:
             """
             GET a single object as an authenticated user without the required permission.
             """
-            url = self._get_detail_url(self.model.objects.unrestricted().first())
+            url = self._get_detail_url(self._get_queryset().first())
 
             # Try GET without permission
             with disable_warnings('django.request'):
@@ -72,9 +71,9 @@ class APIViewTestCases:
             """
             GET a single object as an authenticated user with permission to view the object.
             """
-            self.assertGreaterEqual(self.model.objects.unrestricted().count(), 2,
+            self.assertGreaterEqual(self._get_queryset().count(), 2,
                                     f"Test requires the creation of at least two {self.model} instances")
-            instance1, instance2 = self.model.objects.unrestricted()[:2]
+            instance1, instance2 = self._get_queryset()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -104,7 +103,7 @@ class APIViewTestCases:
             url = self._get_list_url()
             response = self.client.get(url, **self.header)
 
-            self.assertEqual(len(response.data['results']), self.model.objects.unrestricted().count())
+            self.assertEqual(len(response.data['results']), self._get_queryset().count())
             self.assertHttpStatus(response, status.HTTP_200_OK)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
@@ -115,7 +114,7 @@ class APIViewTestCases:
             url = f'{self._get_list_url()}?brief=1'
             response = self.client.get(url, **self.header)
 
-            self.assertEqual(len(response.data['results']), self.model.objects.unrestricted().count())
+            self.assertEqual(len(response.data['results']), self._get_queryset().count())
             self.assertEqual(sorted(response.data['results'][0]), self.brief_fields)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
@@ -134,9 +133,9 @@ class APIViewTestCases:
             """
             GET a list of objects as an authenticated user with permission to view the objects.
             """
-            self.assertGreaterEqual(self.model.objects.unrestricted().count(), 3,
+            self.assertGreaterEqual(self._get_queryset().count(), 3,
                                     f"Test requires the creation of at least three {self.model} instances")
-            instance1, instance2 = self.model.objects.unrestricted()[:2]
+            instance1, instance2 = self._get_queryset()[:2]
 
             # Add object-level permission
             obj_perm = ObjectPermission(
@@ -178,12 +177,12 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            initial_count = self.model.objects.unrestricted().count()
+            initial_count = self._get_queryset().count()
             response = self.client.post(self._get_list_url(), self.create_data[0], format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
-            self.assertEqual(self.model.objects.unrestricted().count(), initial_count + 1)
+            self.assertEqual(self._get_queryset().count(), initial_count + 1)
             self.assertInstanceEqual(
-                self.model.objects.unrestricted().get(pk=response.data['id']),
+                self._get_queryset().get(pk=response.data['id']),
                 self.create_data[0],
                 api=True
             )
@@ -200,14 +199,14 @@ class APIViewTestCases:
             obj_perm.users.add(self.user)
             obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
 
-            initial_count = self.model.objects.unrestricted().count()
+            initial_count = self._get_queryset().count()
             response = self.client.post(self._get_list_url(), self.create_data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
             self.assertEqual(len(response.data), len(self.create_data))
-            self.assertEqual(self.model.objects.unrestricted().count(), initial_count + len(self.create_data))
+            self.assertEqual(self._get_queryset().count(), initial_count + len(self.create_data))
             for i, obj in enumerate(response.data):
                 self.assertInstanceEqual(
-                    self.model.objects.unrestricted().get(pk=obj['id']),
+                    self._get_queryset().get(pk=obj['id']),
                     self.create_data[i],
                     api=True
                 )
@@ -219,7 +218,7 @@ class APIViewTestCases:
             """
             PATCH a single object without permission.
             """
-            url = self._get_detail_url(self.model.objects.unrestricted().first())
+            url = self._get_detail_url(self._get_queryset().first())
             update_data = self.update_data or getattr(self, 'create_data')[0]
 
             # Try PATCH without permission
@@ -231,7 +230,7 @@ class APIViewTestCases:
             """
             PATCH a single object identified by its numeric ID.
             """
-            instance = self.model.objects.unrestricted().first()
+            instance = self._get_queryset().first()
             url = self._get_detail_url(instance)
             update_data = self.update_data or getattr(self, 'create_data')[0]
 
@@ -254,7 +253,7 @@ class APIViewTestCases:
             """
             DELETE a single object without permission.
             """
-            url = self._get_detail_url(self.model.objects.unrestricted().first())
+            url = self._get_detail_url(self._get_queryset().first())
 
             # Try DELETE without permission
             with disable_warnings('django.request'):
@@ -265,7 +264,7 @@ class APIViewTestCases:
             """
             DELETE a single object identified by its numeric ID.
             """
-            instance = self.model.objects.unrestricted().first()
+            instance = self._get_queryset().first()
             url = self._get_detail_url(instance)
 
             # Add object-level permission
@@ -278,7 +277,7 @@ class APIViewTestCases:
 
             response = self.client.delete(url, **self.header)
             self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
-            self.assertFalse(self.model.objects.unrestricted().filter(pk=instance.pk).exists())
+            self.assertFalse(self._get_queryset().filter(pk=instance.pk).exists())
 
     class APIViewTestCase(
         GetObjectViewTestCase,
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index b4ca52246..33d239c54 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -18,6 +18,7 @@ from .utils import disable_warnings, post_data
 
 __all__ = (
     'TestCase',
+    'ModelTestCase',
     'ModelViewTestCase',
     'ViewTestCases',
 )
@@ -149,22 +150,12 @@ class TestCase(_TestCase):
         return tags
 
 
-#
-# UI Tests
-#
-
-class ModelViewTestCase(TestCase):
+class ModelTestCase(TestCase):
     """
-    Base TestCase for model views. Subclass to test individual views.
+    Parent class for TestCases which deal with models.
     """
     model = None
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        if self.model is None:
-            raise Exception("Test case requires model to be defined")
-
     def _get_queryset(self):
         """
         Return a base queryset suitable for use in test methods. Call unrestricted() if RestrictedQuerySet is in use.
@@ -173,6 +164,16 @@ class ModelViewTestCase(TestCase):
             return self.model.objects.unrestricted()
         return self.model.objects.all()
 
+
+#
+# UI Tests
+#
+
+class ModelViewTestCase(ModelTestCase):
+    """
+    Base TestCase for model views. Subclass to test individual views.
+    """
+
     def _get_base_url(self):
         """
         Return the base format for a URL for the test's model. Override this to test for a model which belongs

From f6d05f3906f09aa192d3f7b40fe37b5bf76d2f22 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 13:54:49 -0400
Subject: [PATCH 309/505] Tweak ObjectChange queryset for cleanup

---
 netbox/extras/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index c8be8755f..51c281750 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -145,7 +145,7 @@ class ObjectChangeMiddleware(object):
         # one or more changes being logged.
         if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
             cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
-            purged_count, _ = ObjectChange.objects.filter(
+            purged_count, _ = ObjectChange.objects.unrestricted().filter(
                 time__lt=cutoff
             ).delete()
 

From 88033c08010868722d92a11f7d655ed633aae048 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 14:13:58 -0400
Subject: [PATCH 310/505] Fix queryset for get_peer_termination()

---
 netbox/circuits/models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 72d1c0974..5e2bd08c1 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -336,6 +336,9 @@ class CircuitTermination(CableTermination):
     def get_peer_termination(self):
         peer_side = 'Z' if self.term_side == 'A' else 'A'
         try:
-            return CircuitTermination.objects.prefetch_related('site').get(circuit=self.circuit, term_side=peer_side)
+            return CircuitTermination.objects.unrestricted().prefetch_related('site').get(
+                circuit=self.circuit,
+                term_side=peer_side
+            )
         except CircuitTermination.DoesNotExist:
             return None

From 25e13198643ae696a993593451e905e423ea3ef3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 14:26:14 -0400
Subject: [PATCH 311/505] Update filter tests to use unrestricted querysets

---
 netbox/circuits/tests/test_filters.py       |  28 +--
 netbox/dcim/tests/test_filters.py           | 220 ++++++++++----------
 netbox/extras/tests/test_filters.py         |  22 +-
 netbox/ipam/tests/test_filters.py           |  72 +++----
 netbox/secrets/tests/test_filters.py        |   8 +-
 netbox/tenancy/tests/test_filters.py        |   6 +-
 netbox/virtualization/tests/test_filters.py |  42 ++--
 7 files changed, 199 insertions(+), 199 deletions(-)

diff --git a/netbox/circuits/tests/test_filters.py b/netbox/circuits/tests/test_filters.py
index 9756c320b..55025c043 100644
--- a/netbox/circuits/tests/test_filters.py
+++ b/netbox/circuits/tests/test_filters.py
@@ -8,7 +8,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class ProviderTestCase(TestCase):
-    queryset = Provider.objects.all()
+    queryset = Provider.objects.unrestricted()
     filterset = ProviderFilterSet
 
     @classmethod
@@ -75,14 +75,14 @@ class ProviderTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
@@ -90,7 +90,7 @@ class ProviderTestCase(TestCase):
 
 
 class CircuitTypeTestCase(TestCase):
-    queryset = CircuitType.objects.all()
+    queryset = CircuitType.objects.unrestricted()
     filterset = CircuitTypeFilterSet
 
     @classmethod
@@ -116,7 +116,7 @@ class CircuitTypeTestCase(TestCase):
 
 
 class CircuitTestCase(TestCase):
-    queryset = Circuit.objects.all()
+    queryset = Circuit.objects.unrestricted()
     filterset = CircuitFilterSet
 
     @classmethod
@@ -199,14 +199,14 @@ class CircuitTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_provider(self):
-        provider = Provider.objects.first()
+        provider = Provider.objects.unrestricted().first()
         params = {'provider_id': [provider.pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'provider': [provider.slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_type(self):
-        circuit_type = CircuitType.objects.first()
+        circuit_type = CircuitType.objects.unrestricted().first()
         params = {'type_id': [circuit_type.pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'type': [circuit_type.slug]}
@@ -217,28 +217,28 @@ class CircuitTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -246,7 +246,7 @@ class CircuitTestCase(TestCase):
 
 
 class CircuitTerminationTestCase(TestCase):
-    queryset = CircuitTermination.objects.all()
+    queryset = CircuitTermination.objects.unrestricted()
     filterset = CircuitTerminationFilterSet
 
     @classmethod
@@ -303,12 +303,12 @@ class CircuitTerminationTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_circuit_id(self):
-        circuits = Circuit.objects.all()[:2]
+        circuits = Circuit.objects.unrestricted()[:2]
         params = {'circuit_id': [circuits[0].pk, circuits[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
diff --git a/netbox/dcim/tests/test_filters.py b/netbox/dcim/tests/test_filters.py
index d4504d586..2418273ba 100644
--- a/netbox/dcim/tests/test_filters.py
+++ b/netbox/dcim/tests/test_filters.py
@@ -16,7 +16,7 @@ from virtualization.models import Cluster, ClusterType
 
 
 class RegionTestCase(TestCase):
-    queryset = Region.objects.all()
+    queryset = Region.objects.unrestricted()
     filterset = RegionFilterSet
 
     @classmethod
@@ -66,7 +66,7 @@ class RegionTestCase(TestCase):
 
 
 class SiteTestCase(TestCase):
-    queryset = Site.objects.all()
+    queryset = Site.objects.unrestricted()
     filterset = SiteFilterSet
 
     @classmethod
@@ -147,21 +147,21 @@ class SiteTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -169,7 +169,7 @@ class SiteTestCase(TestCase):
 
 
 class RackGroupTestCase(TestCase):
-    queryset = RackGroup.objects.all()
+    queryset = RackGroup.objects.unrestricted()
     filterset = RackGroupFilterSet
 
     @classmethod
@@ -223,14 +223,14 @@ class RackGroupTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -245,7 +245,7 @@ class RackGroupTestCase(TestCase):
 
 
 class RackRoleTestCase(TestCase):
-    queryset = RackRole.objects.all()
+    queryset = RackRole.objects.unrestricted()
     filterset = RackRoleFilterSet
 
     @classmethod
@@ -276,7 +276,7 @@ class RackRoleTestCase(TestCase):
 
 
 class RackTestCase(TestCase):
-    queryset = Rack.objects.all()
+    queryset = Rack.objects.unrestricted()
     filterset = RackFilterSet
 
     @classmethod
@@ -384,21 +384,21 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = RackGroup.objects.all()[:2]
+        groups = RackGroup.objects.unrestricted()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
@@ -409,7 +409,7 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = RackRole.objects.all()[:2]
+        roles = RackRole.objects.unrestricted()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -422,14 +422,14 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -437,7 +437,7 @@ class RackTestCase(TestCase):
 
 
 class RackReservationTestCase(TestCase):
-    queryset = RackReservation.objects.all()
+    queryset = RackReservation.objects.unrestricted()
     filterset = RackReservationFilterSet
 
     @classmethod
@@ -499,14 +499,14 @@ class RackReservationTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = RackGroup.objects.all()[:2]
+        groups = RackGroup.objects.unrestricted()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
@@ -521,14 +521,14 @@ class RackReservationTestCase(TestCase):
         # self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -536,7 +536,7 @@ class RackReservationTestCase(TestCase):
 
 
 class ManufacturerTestCase(TestCase):
-    queryset = Manufacturer.objects.all()
+    queryset = Manufacturer.objects.unrestricted()
     filterset = ManufacturerFilterSet
 
     @classmethod
@@ -567,7 +567,7 @@ class ManufacturerTestCase(TestCase):
 
 
 class DeviceTypeTestCase(TestCase):
-    queryset = DeviceType.objects.all()
+    queryset = DeviceType.objects.unrestricted()
     filterset = DeviceTypeFilterSet
 
     @classmethod
@@ -653,7 +653,7 @@ class DeviceTypeTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.all()[:2]
+        manufacturers = Manufacturer.objects.unrestricted()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -703,7 +703,7 @@ class DeviceTypeTestCase(TestCase):
 
 
 class ConsolePortTemplateTestCase(TestCase):
-    queryset = ConsolePortTemplate.objects.all()
+    queryset = ConsolePortTemplate.objects.unrestricted()
     filterset = ConsolePortTemplateFilterSet
 
     @classmethod
@@ -733,13 +733,13 @@ class ConsolePortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class ConsoleServerPortTemplateTestCase(TestCase):
-    queryset = ConsoleServerPortTemplate.objects.all()
+    queryset = ConsoleServerPortTemplate.objects.unrestricted()
     filterset = ConsoleServerPortTemplateFilterSet
 
     @classmethod
@@ -769,13 +769,13 @@ class ConsoleServerPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class PowerPortTemplateTestCase(TestCase):
-    queryset = PowerPortTemplate.objects.all()
+    queryset = PowerPortTemplate.objects.unrestricted()
     filterset = PowerPortTemplateFilterSet
 
     @classmethod
@@ -805,7 +805,7 @@ class PowerPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -819,7 +819,7 @@ class PowerPortTemplateTestCase(TestCase):
 
 
 class PowerOutletTemplateTestCase(TestCase):
-    queryset = PowerOutletTemplate.objects.all()
+    queryset = PowerOutletTemplate.objects.unrestricted()
     filterset = PowerOutletTemplateFilterSet
 
     @classmethod
@@ -849,7 +849,7 @@ class PowerOutletTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -860,7 +860,7 @@ class PowerOutletTemplateTestCase(TestCase):
 
 
 class InterfaceTemplateTestCase(TestCase):
-    queryset = InterfaceTemplate.objects.all()
+    queryset = InterfaceTemplate.objects.unrestricted()
     filterset = InterfaceTemplateFilterSet
 
     @classmethod
@@ -890,7 +890,7 @@ class InterfaceTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -907,7 +907,7 @@ class InterfaceTemplateTestCase(TestCase):
 
 
 class FrontPortTemplateTestCase(TestCase):
-    queryset = FrontPortTemplate.objects.all()
+    queryset = FrontPortTemplate.objects.unrestricted()
     filterset = FrontPortTemplateFilterSet
 
     @classmethod
@@ -944,7 +944,7 @@ class FrontPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -955,7 +955,7 @@ class FrontPortTemplateTestCase(TestCase):
 
 
 class RearPortTemplateTestCase(TestCase):
-    queryset = RearPortTemplate.objects.all()
+    queryset = RearPortTemplate.objects.unrestricted()
     filterset = RearPortTemplateFilterSet
 
     @classmethod
@@ -985,7 +985,7 @@ class RearPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -1000,7 +1000,7 @@ class RearPortTemplateTestCase(TestCase):
 
 
 class DeviceBayTemplateTestCase(TestCase):
-    queryset = DeviceBayTemplate.objects.all()
+    queryset = DeviceBayTemplate.objects.unrestricted()
     filterset = DeviceBayTemplateFilterSet
 
     @classmethod
@@ -1030,13 +1030,13 @@ class DeviceBayTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class DeviceRoleTestCase(TestCase):
-    queryset = DeviceRole.objects.all()
+    queryset = DeviceRole.objects.unrestricted()
     filterset = DeviceRoleFilterSet
 
     @classmethod
@@ -1073,7 +1073,7 @@ class DeviceRoleTestCase(TestCase):
 
 
 class PlatformTestCase(TestCase):
-    queryset = Platform.objects.all()
+    queryset = Platform.objects.unrestricted()
     filterset = PlatformFilterSet
 
     @classmethod
@@ -1114,7 +1114,7 @@ class PlatformTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.all()[:2]
+        manufacturers = Manufacturer.objects.unrestricted()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -1122,7 +1122,7 @@ class PlatformTestCase(TestCase):
 
 
 class DeviceTestCase(TestCase):
-    queryset = Device.objects.all()
+    queryset = Device.objects.unrestricted()
     filterset = DeviceFilterSet
 
     @classmethod
@@ -1295,57 +1295,57 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.all()[:2]
+        manufacturers = Manufacturer.objects.unrestricted()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype(self):
-        device_types = DeviceType.objects.all()[:2]
+        device_types = DeviceType.objects.unrestricted()[:2]
         params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicerole(self):
-        device_roles = DeviceRole.objects.all()[:2]
+        device_roles = DeviceRole.objects.unrestricted()[:2]
         params = {'role_id': [device_roles[0].pk, device_roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [device_roles[0].slug, device_roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.all()[:2]
+        platforms = Platform.objects.unrestricted()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rackgroup(self):
-        rack_groups = RackGroup.objects.all()[:2]
+        rack_groups = RackGroup.objects.unrestricted()[:2]
         params = {'rack_group_id': [rack_groups[0].pk, rack_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack(self):
-        racks = Rack.objects.all()[:2]
+        racks = Rack.objects.unrestricted()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.all()[:2]
+        clusters = Cluster.objects.unrestricted()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -1380,7 +1380,7 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_virtual_chassis_id(self):
-        params = {'virtual_chassis_id': [VirtualChassis.objects.first().pk]}
+        params = {'virtual_chassis_id': [VirtualChassis.objects.unrestricted().first().pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_chassis_member(self):
@@ -1438,14 +1438,14 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -1453,7 +1453,7 @@ class DeviceTestCase(TestCase):
 
 
 class ConsolePortTestCase(TestCase):
-    queryset = ConsolePort.objects.all()
+    queryset = ConsolePort.objects.unrestricted()
     filterset = ConsolePortFilterSet
 
     @classmethod
@@ -1520,21 +1520,21 @@ class ConsolePortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1548,7 +1548,7 @@ class ConsolePortTestCase(TestCase):
 
 
 class ConsoleServerPortTestCase(TestCase):
-    queryset = ConsoleServerPort.objects.all()
+    queryset = ConsoleServerPort.objects.unrestricted()
     filterset = ConsoleServerPortFilterSet
 
     @classmethod
@@ -1615,21 +1615,21 @@ class ConsoleServerPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1643,7 +1643,7 @@ class ConsoleServerPortTestCase(TestCase):
 
 
 class PowerPortTestCase(TestCase):
-    queryset = PowerPort.objects.all()
+    queryset = PowerPort.objects.unrestricted()
     filterset = PowerPortFilterSet
 
     @classmethod
@@ -1718,21 +1718,21 @@ class PowerPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1746,7 +1746,7 @@ class PowerPortTestCase(TestCase):
 
 
 class PowerOutletTestCase(TestCase):
-    queryset = PowerOutlet.objects.all()
+    queryset = PowerOutlet.objects.unrestricted()
     filterset = PowerOutletFilterSet
 
     @classmethod
@@ -1818,21 +1818,21 @@ class PowerOutletTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1846,7 +1846,7 @@ class PowerOutletTestCase(TestCase):
 
 
 class InterfaceTestCase(TestCase):
-    queryset = Interface.objects.all()
+    queryset = Interface.objects.unrestricted()
     filterset = InterfaceFilterSet
 
     @classmethod
@@ -1930,21 +1930,21 @@ class InterfaceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1972,7 +1972,7 @@ class InterfaceTestCase(TestCase):
 
 
 class FrontPortTestCase(TestCase):
-    queryset = FrontPort.objects.all()
+    queryset = FrontPort.objects.unrestricted()
     filterset = FrontPortFilterSet
 
     @classmethod
@@ -2046,21 +2046,21 @@ class FrontPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2074,7 +2074,7 @@ class FrontPortTestCase(TestCase):
 
 
 class RearPortTestCase(TestCase):
-    queryset = RearPort.objects.all()
+    queryset = RearPort.objects.unrestricted()
     filterset = RearPortFilterSet
 
     @classmethod
@@ -2142,21 +2142,21 @@ class RearPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2170,7 +2170,7 @@ class RearPortTestCase(TestCase):
 
 
 class DeviceBayTestCase(TestCase):
-    queryset = DeviceBay.objects.all()
+    queryset = DeviceBay.objects.unrestricted()
     filterset = DeviceBayFilterSet
 
     @classmethod
@@ -2220,21 +2220,21 @@ class DeviceBayTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2242,7 +2242,7 @@ class DeviceBayTestCase(TestCase):
 
 
 class InventoryItemTestCase(TestCase):
-    queryset = InventoryItem.objects.all()
+    queryset = InventoryItem.objects.unrestricted()
     filterset = InventoryItemFilterSet
 
     @classmethod
@@ -2318,14 +2318,14 @@ class InventoryItemTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -2333,7 +2333,7 @@ class InventoryItemTestCase(TestCase):
 
     def test_device(self):
         # TODO: Allow multiple values
-        device = Device.objects.first()
+        device = Device.objects.unrestricted().first()
         params = {'device_id': device.pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': device.name}
@@ -2345,7 +2345,7 @@ class InventoryItemTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.all()[:2]
+        manufacturers = Manufacturer.objects.unrestricted()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -2359,7 +2359,7 @@ class InventoryItemTestCase(TestCase):
 
 
 class VirtualChassisTestCase(TestCase):
-    queryset = VirtualChassis.objects.all()
+    queryset = VirtualChassis.objects.unrestricted()
     filterset = VirtualChassisFilterSet
 
     @classmethod
@@ -2414,14 +2414,14 @@ class VirtualChassisTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -2429,7 +2429,7 @@ class VirtualChassisTestCase(TestCase):
 
 
 class CableTestCase(TestCase):
-    queryset = Cable.objects.all()
+    queryset = Cable.objects.unrestricted()
     filterset = CableFilterSet
 
     @classmethod
@@ -2524,28 +2524,28 @@ class CableTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_rack(self):
-        racks = Rack.objects.all()[:2]
+        racks = Rack.objects.unrestricted()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
         params = {'rack': [racks[0].name, racks[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
 
     def test_site(self):
-        site = Site.objects.all()[:2]
+        site = Site.objects.unrestricted()[:2]
         params = {'site_id': [site[0].pk, site[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
         params = {'site': [site[0].slug, site[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
 
     def test_tenant(self):
-        tenant = Tenant.objects.all()[:2]
+        tenant = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenant[0].pk, tenant[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenant[0].slug, tenant[1].slug]}
@@ -2553,7 +2553,7 @@ class CableTestCase(TestCase):
 
 
 class PowerPanelTestCase(TestCase):
-    queryset = PowerPanel.objects.all()
+    queryset = PowerPanel.objects.unrestricted()
     filterset = PowerPanelFilterSet
 
     @classmethod
@@ -2598,27 +2598,27 @@ class PowerPanelTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack_group(self):
-        rack_groups = RackGroup.objects.all()[:2]
+        rack_groups = RackGroup.objects.unrestricted()[:2]
         params = {'rack_group_id': [rack_groups[0].pk, rack_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class PowerFeedTestCase(TestCase):
-    queryset = PowerFeed.objects.all()
+    queryset = PowerFeed.objects.unrestricted()
     filterset = PowerFeedFilterSet
 
     @classmethod
@@ -2698,26 +2698,26 @@ class PowerFeedTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_power_panel_id(self):
-        power_panels = PowerPanel.objects.all()[:2]
+        power_panels = PowerPanel.objects.unrestricted()[:2]
         params = {'power_panel_id': [power_panels[0].pk, power_panels[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack_id(self):
-        racks = Rack.objects.all()[:2]
+        racks = Rack.objects.unrestricted()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
diff --git a/netbox/extras/tests/test_filters.py b/netbox/extras/tests/test_filters.py
index 72db138e2..aed12cd73 100644
--- a/netbox/extras/tests/test_filters.py
+++ b/netbox/extras/tests/test_filters.py
@@ -11,7 +11,7 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType
 
 
 class GraphTestCase(TestCase):
-    queryset = Graph.objects.all()
+    queryset = Graph.objects.unrestricted()
     filterset = GraphFilterSet
 
     @classmethod
@@ -46,7 +46,7 @@ class GraphTestCase(TestCase):
 
 
 class ExportTemplateTestCase(TestCase):
-    queryset = ExportTemplate.objects.all()
+    queryset = ExportTemplate.objects.unrestricted()
     filterset = ExportTemplateFilterSet
 
     @classmethod
@@ -79,7 +79,7 @@ class ExportTemplateTestCase(TestCase):
 
 
 class ConfigContextTestCase(TestCase):
-    queryset = ConfigContext.objects.all()
+    queryset = ConfigContext.objects.unrestricted()
     filterset = ConfigContextFilterSet
 
     @classmethod
@@ -176,54 +176,54 @@ class ConfigContextTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        device_roles = DeviceRole.objects.all()[:2]
+        device_roles = DeviceRole.objects.unrestricted()[:2]
         params = {'role_id': [device_roles[0].pk, device_roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [device_roles[0].slug, device_roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.all()[:2]
+        platforms = Platform.objects.unrestricted()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_group(self):
-        cluster_groups = ClusterGroup.objects.all()[:2]
+        cluster_groups = ClusterGroup.objects.unrestricted()[:2]
         params = {'cluster_group_id': [cluster_groups[0].pk, cluster_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_group': [cluster_groups[0].slug, cluster_groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.all()[:2]
+        clusters = Cluster.objects.unrestricted()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index 560313f0a..273fa2083 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -9,7 +9,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class VRFTestCase(TestCase):
-    queryset = VRF.objects.all()
+    queryset = VRF.objects.unrestricted()
     filterset = VRFFilterSet
 
     @classmethod
@@ -59,14 +59,14 @@ class VRFTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -74,7 +74,7 @@ class VRFTestCase(TestCase):
 
 
 class RIRTestCase(TestCase):
-    queryset = RIR.objects.all()
+    queryset = RIR.objects.unrestricted()
     filterset = RIRFilterSet
 
     @classmethod
@@ -114,7 +114,7 @@ class RIRTestCase(TestCase):
 
 
 class AggregateTestCase(TestCase):
-    queryset = Aggregate.objects.all()
+    queryset = Aggregate.objects.unrestricted()
     filterset = AggregateFilterSet
 
     @classmethod
@@ -155,7 +155,7 @@ class AggregateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_rir(self):
-        rirs = RIR.objects.all()[:2]
+        rirs = RIR.objects.unrestricted()[:2]
         params = {'rir_id': [rirs[0].pk, rirs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'rir': [rirs[0].slug, rirs[1].slug]}
@@ -163,7 +163,7 @@ class AggregateTestCase(TestCase):
 
 
 class RoleTestCase(TestCase):
-    queryset = Role.objects.all()
+    queryset = Role.objects.unrestricted()
     filterset = RoleFilterSet
 
     @classmethod
@@ -190,7 +190,7 @@ class RoleTestCase(TestCase):
 
 
 class PrefixTestCase(TestCase):
-    queryset = Prefix.objects.all()
+    queryset = Prefix.objects.unrestricted()
     filterset = PrefixFilterSet
 
     @classmethod
@@ -295,28 +295,28 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vrf(self):
-        vrfs = VRF.objects.all()[:2]
+        vrfs = VRF.objects.unrestricted()[:2]
         params = {'vrf_id': [vrfs[0].pk, vrfs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'vrf': [vrfs[0].rd, vrfs[1].rd]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vlan(self):
-        vlans = VLAN.objects.all()[:2]
+        vlans = VLAN.objects.unrestricted()[:2]
         params = {'vlan_id': [vlans[0].pk, vlans[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         # TODO: Test for multiple values
@@ -324,7 +324,7 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = Role.objects.all()[:2]
+        roles = Role.objects.unrestricted()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -335,14 +335,14 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -350,7 +350,7 @@ class PrefixTestCase(TestCase):
 
 
 class IPAddressTestCase(TestCase):
-    queryset = IPAddress.objects.all()
+    queryset = IPAddress.objects.unrestricted()
     filterset = IPAddressFilterSet
 
     @classmethod
@@ -466,35 +466,35 @@ class IPAddressTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vrf(self):
-        vrfs = VRF.objects.all()[:2]
+        vrfs = VRF.objects.unrestricted()[:2]
         params = {'vrf_id': [vrfs[0].pk, vrfs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'vrf': [vrfs[0].rd, vrfs[1].rd]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.all()[:2]
+        vms = VirtualMachine.objects.unrestricted()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_interface(self):
-        interfaces = Interface.objects.all()[:2]
+        interfaces = Interface.objects.unrestricted()[:2]
         params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'interface': ['Interface 1', 'Interface 2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_vminterface(self):
-        vminterfaces = VMInterface.objects.all()[:2]
+        vminterfaces = VMInterface.objects.unrestricted()[:2]
         params = {'vminterface_id': [vminterfaces[0].pk, vminterfaces[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'vminterface': ['Interface 1', 'Interface 2']}
@@ -515,14 +515,14 @@ class IPAddressTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -530,7 +530,7 @@ class IPAddressTestCase(TestCase):
 
 
 class VLANGroupTestCase(TestCase):
-    queryset = VLANGroup.objects.all()
+    queryset = VLANGroup.objects.unrestricted()
     filterset = VLANGroupFilterSet
 
     @classmethod
@@ -577,14 +577,14 @@ class VLANGroupTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -592,7 +592,7 @@ class VLANGroupTestCase(TestCase):
 
 
 class VLANTestCase(TestCase):
-    queryset = VLAN.objects.all()
+    queryset = VLAN.objects.unrestricted()
     filterset = VLANFilterSet
 
     @classmethod
@@ -666,28 +666,28 @@ class VLANTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_group(self):
-        groups = VLANGroup.objects.all()[:2]
+        groups = VLANGroup.objects.unrestricted()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_role(self):
-        roles = Role.objects.all()[:2]
+        roles = Role.objects.unrestricted()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -698,14 +698,14 @@ class VLANTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -713,7 +713,7 @@ class VLANTestCase(TestCase):
 
 
 class ServiceTestCase(TestCase):
-    queryset = Service.objects.all()
+    queryset = Service.objects.unrestricted()
     filterset = ServiceFilterSet
 
     @classmethod
@@ -768,14 +768,14 @@ class ServiceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.all()[:2]
+        vms = VirtualMachine.objects.unrestricted()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
diff --git a/netbox/secrets/tests/test_filters.py b/netbox/secrets/tests/test_filters.py
index b7ac73f1d..a32d22239 100644
--- a/netbox/secrets/tests/test_filters.py
+++ b/netbox/secrets/tests/test_filters.py
@@ -6,7 +6,7 @@ from secrets.models import Secret, SecretRole
 
 
 class SecretRoleTestCase(TestCase):
-    queryset = SecretRole.objects.all()
+    queryset = SecretRole.objects.unrestricted()
     filterset = SecretRoleFilterSet
 
     @classmethod
@@ -33,7 +33,7 @@ class SecretRoleTestCase(TestCase):
 
 
 class SecretTestCase(TestCase):
-    queryset = Secret.objects.all()
+    queryset = Secret.objects.unrestricted()
     filterset = SecretFilterSet
 
     @classmethod
@@ -76,14 +76,14 @@ class SecretTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = SecretRole.objects.all()[:2]
+        roles = SecretRole.objects.unrestricted()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.all()[:2]
+        devices = Device.objects.unrestricted()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
diff --git a/netbox/tenancy/tests/test_filters.py b/netbox/tenancy/tests/test_filters.py
index c78b25083..31540c27b 100644
--- a/netbox/tenancy/tests/test_filters.py
+++ b/netbox/tenancy/tests/test_filters.py
@@ -5,7 +5,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class TenantGroupTestCase(TestCase):
-    queryset = TenantGroup.objects.all()
+    queryset = TenantGroup.objects.unrestricted()
     filterset = TenantGroupFilterSet
 
     @classmethod
@@ -52,7 +52,7 @@ class TenantGroupTestCase(TestCase):
 
 
 class TenantTestCase(TestCase):
-    queryset = Tenant.objects.all()
+    queryset = Tenant.objects.unrestricted()
     filterset = TenantFilterSet
 
     @classmethod
@@ -86,7 +86,7 @@ class TenantTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        group = TenantGroup.objects.all()[:2]
+        group = TenantGroup.objects.unrestricted()[:2]
         params = {'group_id': [group[0].pk, group[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [group[0].slug, group[1].slug]}
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index ad452ec51..2204e20a2 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -8,7 +8,7 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac
 
 
 class ClusterTypeTestCase(TestCase):
-    queryset = ClusterType.objects.all()
+    queryset = ClusterType.objects.unrestricted()
     filterset = ClusterTypeFilterSet
 
     @classmethod
@@ -39,7 +39,7 @@ class ClusterTypeTestCase(TestCase):
 
 
 class ClusterGroupTestCase(TestCase):
-    queryset = ClusterGroup.objects.all()
+    queryset = ClusterGroup.objects.unrestricted()
     filterset = ClusterGroupFilterSet
 
     @classmethod
@@ -70,7 +70,7 @@ class ClusterGroupTestCase(TestCase):
 
 
 class ClusterTestCase(TestCase):
-    queryset = Cluster.objects.all()
+    queryset = Cluster.objects.unrestricted()
     filterset = ClusterFilterSet
 
     @classmethod
@@ -137,42 +137,42 @@ class ClusterTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = ClusterGroup.objects.all()[:2]
+        groups = ClusterGroup.objects.unrestricted()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_type(self):
-        types = ClusterType.objects.all()[:2]
+        types = ClusterType.objects.unrestricted()[:2]
         params = {'type_id': [types[0].pk, types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'type': [types[0].slug, types[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -180,7 +180,7 @@ class ClusterTestCase(TestCase):
 
 
 class VirtualMachineTestCase(TestCase):
-    queryset = VirtualMachine.objects.all()
+    queryset = VirtualMachine.objects.unrestricted()
     filterset = VirtualMachineFilterSet
 
     @classmethod
@@ -291,21 +291,21 @@ class VirtualMachineTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_group(self):
-        groups = ClusterGroup.objects.all()[:2]
+        groups = ClusterGroup.objects.unrestricted()[:2]
         params = {'cluster_group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_type(self):
-        types = ClusterType.objects.all()[:2]
+        types = ClusterType.objects.unrestricted()[:2]
         params = {'cluster_type_id': [types[0].pk, types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_type': [types[0].slug, types[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.all()[:2]
+        clusters = Cluster.objects.unrestricted()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         # TODO: 'cluster' should match on name
@@ -313,28 +313,28 @@ class VirtualMachineTestCase(TestCase):
         # self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.all()[:2]
+        regions = Region.objects.unrestricted()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.all()[:2]
+        sites = Site.objects.unrestricted()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = DeviceRole.objects.all()[:2]
+        roles = DeviceRole.objects.unrestricted()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.all()[:2]
+        platforms = Platform.objects.unrestricted()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
@@ -351,14 +351,14 @@ class VirtualMachineTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.all()[:2]
+        tenants = Tenant.objects.unrestricted()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.all()[:2]
+        tenant_groups = TenantGroup.objects.unrestricted()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -366,7 +366,7 @@ class VirtualMachineTestCase(TestCase):
 
 
 class VMInterfaceTestCase(TestCase):
-    queryset = VMInterface.objects.all()
+    queryset = VMInterface.objects.unrestricted()
     filterset = VMInterfaceFilterSet
 
     @classmethod
@@ -420,7 +420,7 @@ class VMInterfaceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.all()[:2]
+        vms = VirtualMachine.objects.unrestricted()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}

From 353d88f0a650ed220b7d35122dc92acc1bedee53 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 15:45:46 -0400
Subject: [PATCH 312/505] Use unrestricted querysets for prefetching related
 objects

---
 netbox/circuits/views.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index e2dc80816..55ff70327 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -1,7 +1,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.db import transaction
-from django.db.models import Count, OuterRef
+from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404, redirect, render
 from django_tables2 import RequestConfig
 
@@ -119,9 +119,9 @@ class CircuitTypeBulkDeleteView(BulkDeleteView):
 #
 
 class CircuitListView(ObjectListView):
-    _terminations = CircuitTermination.objects.filter(circuit=OuterRef('pk'))
     queryset = Circuit.objects.prefetch_related(
-        'provider', 'type', 'tenant', 'terminations__site'
+        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
+        'provider', 'type', 'tenant'
     ).annotate_sites()
     filterset = filters.CircuitFilterSet
     filterset_form = forms.CircuitFilterForm
@@ -174,14 +174,20 @@ class CircuitBulkImportView(BulkImportView):
 
 
 class CircuitBulkEditView(BulkEditView):
-    queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
+    queryset = Circuit.objects.prefetch_related(
+        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
+        'provider', 'type', 'tenant'
+    )
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
     form = forms.CircuitBulkEditForm
 
 
 class CircuitBulkDeleteView(BulkDeleteView):
-    queryset = Circuit.objects.prefetch_related('provider', 'type', 'tenant').prefetch_related('terminations__site')
+    queryset = Circuit.objects.prefetch_related(
+        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
+        'provider', 'type', 'tenant'
+    )
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
 

From 327a93136a603ee4de6c30f0f8d9964d317010ce Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 16:09:47 -0400
Subject: [PATCH 313/505] TreeManager should provide an unrestricted QuerySet
 for MPTT use

---
 netbox/utilities/mptt.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/utilities/mptt.py b/netbox/utilities/mptt.py
index 1bae2053d..25ce01a6c 100644
--- a/netbox/utilities/mptt.py
+++ b/netbox/utilities/mptt.py
@@ -16,4 +16,8 @@ class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
     """
     Extend django-mptt's TreeManager to incorporate RestrictedQuerySet().
     """
-    pass
+    def db_manager(self, using=None, hints=None):
+        manager = super().db_manager(using, hints)
+
+        # Return an unrestricted QuerySet for use by MPTT
+        return manager.unrestricted()

From 847fbfd71abd549d737945c4823e0db6aeda1583 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 16:46:57 -0400
Subject: [PATCH 314/505] Fix unrestricted querysets

---
 netbox/ipam/filters.py |  6 +++---
 netbox/ipam/models.py  | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index d6561ceb7..5b9042412 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -390,7 +390,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         return queryset.filter(address__net_mask_length=value)
 
     def filter_device(self, queryset, name, value):
-        devices = Device.objects.filter(**{'{}__in'.format(name): value})
+        devices = Device.objects.unrestricted().filter(**{'{}__in'.format(name): value})
         if not devices.exists():
             return queryset.none()
         interface_ids = []
@@ -401,12 +401,12 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         )
 
     def filter_virtual_machine(self, queryset, name, value):
-        virtual_machines = VirtualMachine.objects.filter(**{'{}__in'.format(name): value})
+        virtual_machines = VirtualMachine.objects.unrestricted().filter(**{'{}__in'.format(name): value})
         if not virtual_machines.exists():
             return queryset.none()
         interface_ids = []
         for vm in virtual_machines:
-            interface_ids.extend(vm.interfaces.values_list('id', flat=True))
+            interface_ids.extend(vm.interfaces.unrestricted().values_list('id', flat=True))
         return queryset.filter(
             vminterface__in=interface_ids
         )
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 5904178cf..536e7d928 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -471,7 +471,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         return self.STATUS_CLASS_MAP.get(self.status)
 
     def get_duplicates(self):
-        return Prefix.objects.filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
+        return Prefix.objects.unrestricted().filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
 
     def get_child_prefixes(self):
         """
@@ -479,9 +479,9 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         Prefixes belonging to any VRF.
         """
         if self.vrf is None and self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            return Prefix.objects.filter(prefix__net_contained=str(self.prefix))
+            return Prefix.objects.unrestricted().filter(prefix__net_contained=str(self.prefix))
         else:
-            return Prefix.objects.filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
+            return Prefix.objects.unrestricted().filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
 
     def get_child_ips(self):
         """
@@ -489,9 +489,9 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         child IPAddresses belonging to any VRF.
         """
         if self.vrf is None and self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            return IPAddress.objects.filter(address__net_host_contained=str(self.prefix))
+            return IPAddress.objects.unrestricted().filter(address__net_host_contained=str(self.prefix))
         else:
-            return IPAddress.objects.filter(address__net_host_contained=str(self.prefix), vrf=self.vrf)
+            return IPAddress.objects.unrestricted().filter(address__net_host_contained=str(self.prefix), vrf=self.vrf)
 
     def get_available_prefixes(self):
         """
@@ -695,7 +695,10 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         return reverse('ipam:ipaddress', args=[self.pk])
 
     def get_duplicates(self):
-        return IPAddress.objects.filter(vrf=self.vrf, address__net_host=str(self.address.ip)).exclude(pk=self.pk)
+        return IPAddress.objects.unrestricted().filter(
+            vrf=self.vrf,
+            address__net_host=str(self.address.ip)
+        ).exclude(pk=self.pk)
 
     def clean(self):
 
@@ -992,7 +995,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
 
     def get_members(self):
         # Return all interfaces assigned to this VLAN
-        return Interface.objects.filter(
+        return Interface.objects.unrestricted().filter(
             Q(untagged_vlan_id=self.pk) |
             Q(tagged_vlans=self.pk)
         ).distinct()

From 02a6e2190fe36d1fd12d678d239f8764a3d0c78a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 7 Jul 2020 17:09:41 -0400
Subject: [PATCH 315/505] Monkey-patch cacheops' _pre_save() receiver to tweak
 sender's QuerySet

---
 netbox/netbox/__init__.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/netbox/netbox/__init__.py b/netbox/netbox/__init__.py
index e69de29bb..034c9c80e 100644
--- a/netbox/netbox/__init__.py
+++ b/netbox/netbox/__init__.py
@@ -0,0 +1,17 @@
+from cacheops.query import ManagerMixin, no_invalidation, _old_objs
+
+
+# Monkey-patch cacheops' _pre_save() signal receiver. This is needed to mark the sending model's QuerySet as
+# unrestricted.
+def _pre_save(self, sender, instance, using, **kwargs):
+    if not (instance.pk is None or instance._state.adding or no_invalidation.active):
+        try:
+            qs = sender.objects.using(using)
+            if hasattr(qs, 'restrict'):
+                qs = qs.unrestricted()
+            _old_objs.__dict__[sender, instance.pk] = qs.get(pk=instance.pk)
+        except sender.DoesNotExist:
+            pass
+
+
+ManagerMixin._pre_save = _pre_save

From 85b284be541decb05d395184d4c5bfaf097bb473 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 09:31:10 -0400
Subject: [PATCH 316/505] Fix permissions evaluation for available IPs endpoint

---
 netbox/ipam/api/views.py      |  2 +-
 netbox/ipam/tests/test_api.py | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 2de99dcc1..83e185796 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -163,7 +163,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
         The advisory lock decorator uses a PostgreSQL advisory lock to prevent this API from being
         invoked in parallel, which results in a race condition where multiple insertions can occur.
         """
-        prefix = get_object_or_404(Prefix, pk=pk)
+        prefix = get_object_or_404(Prefix.objects.restrict(request.user), pk=pk)
 
         # Create the next available IP within the prefix
         if request.method == 'POST':
diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py
index d7b6b3a7b..213a61fa9 100644
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -276,7 +276,7 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         vrf = VRF.objects.create(name='Test VRF 1', rd='1234')
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/30'), vrf=vrf, is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
-        self.add_permissions('ipam.add_ipaddress')
+        self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress')
 
         # Create all four available IPs with individual requests
         for i in range(1, 5):
@@ -299,19 +299,14 @@ class PrefixTest(APIViewTestCases.APIViewTestCase):
         """
         prefix = Prefix.objects.create(prefix=IPNetwork('192.0.2.0/29'), is_pool=True)
         url = reverse('ipam-api:prefix-available-ips', kwargs={'pk': prefix.pk})
-        self.add_permissions('ipam.view_ipaddress', 'ipam.add_ipaddress')
+        self.add_permissions('ipam.view_prefix', 'ipam.add_ipaddress')
 
         # Try to create nine IPs (only eight are available)
-        data = [{'description': 'Test IP {}'.format(i)} for i in range(1, 10)]  # 9 IPs
+        data = [{'description': f'Test IP {i}'} for i in range(1, 10)]  # 9 IPs
         response = self.client.post(url, data, format='json', **self.header)
         self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
         self.assertIn('detail', response.data)
 
-        # Verify that no IPs were created (eight are still available)
-        response = self.client.get(url, **self.header)
-        self.assertHttpStatus(response, status.HTTP_200_OK)
-        self.assertEqual(len(response.data), 8)
-
         # Create all eight available IPs in a single request
         data = [{'description': 'Test IP {}'.format(i)} for i in range(1, 9)]  # 8 IPs
         response = self.client.post(url, data, format='json', **self.header)

From bf7bd68b6ab4dc57223a1c8ec7c6f5b21b247b46 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:07:53 -0400
Subject: [PATCH 317/505] Fix tag population for object cloning

---
 netbox/utilities/utils.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index c3f34daed..e26994edc 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -4,8 +4,6 @@ from collections import OrderedDict
 
 from django.core.serializers import serialize
 from django.db.models import Count, OuterRef, Subquery
-from django.http import QueryDict
-from django.http.request import HttpRequest
 from jinja2 import Environment
 
 from dcim.choices import CableLengthUnitChoices
@@ -220,7 +218,7 @@ def prepare_cloned_fields(instance):
     Compile an object's `clone_fields` list into a string of URL query parameters. Tags are automatically cloned where
     applicable.
     """
-    params = {}
+    params = []
     for field_name in getattr(instance, 'clone_fields', []):
         field = instance._meta.get_field(field_name)
         field_value = field.value_from_object(instance)
@@ -231,16 +229,15 @@ def prepare_cloned_fields(instance):
 
         # Omit empty values
         if field_value not in (None, ''):
-            params[field_name] = field_value
+            params.append((field_name, field_value))
 
     # Copy tags
     if is_taggable(instance):
-        params['tags'] = ','.join([t.name for t in instance.tags.all()])
+        for tag in instance.tags.all():
+            params.append(('tags', tag.pk))
 
     # Concatenate parameters into a URL query string
-    param_string = '&'.join(
-        ['{}={}'.format(k, v) for k, v in params.items()]
-    )
+    param_string = '&'.join([f'{k}={v}' for k, v in params])
 
     return param_string
 

From 6e50ed084d40083df6612470d1a3e8fa267b30f5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:10:40 -0400
Subject: [PATCH 318/505] Fix tags display

---
 netbox/templates/dcim/inc/interface.html    | 2 +-
 netbox/templates/extras/inc/tags_panel.html | 2 +-
 netbox/utilities/tables.py                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index b8d090231..75869db52 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -31,7 +31,7 @@
         {% if iface.description %}
             {{ iface.description }}<br/>
         {% endif %}
-        {% for tag in iface.tags.all.unrestricted %}
+        {% for tag in iface.tags.all %}
             {% tag tag %}
         {% empty %}
             {% if not iface.description %}&mdash;{% endif %}
diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/extras/inc/tags_panel.html
index d03932354..2024d4ab7 100644
--- a/netbox/templates/extras/inc/tags_panel.html
+++ b/netbox/templates/extras/inc/tags_panel.html
@@ -4,7 +4,7 @@
         <strong>Tags</strong>
     </div>
     <div class="panel-body">
-        {% for tag in tags.all.unrestricted %}
+        {% for tag in tags.all %}
             {% tag tag url %}
         {% empty %}
             <span class="text-muted">No tags assigned</span>
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index a4f15a836..0144ea2d1 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -202,7 +202,7 @@ class TagColumn(tables.TemplateColumn):
     Display a list of tags assigned to the object.
     """
     template_code = """
-    {% for tag in value.all.unrestricted %}
+    {% for tag in value.all %}
         {% include 'utilities/templatetags/tag.html' %}
     {% empty %}
         <span class="text-muted">&mdash;</span>

From fac0da224ab8ad4cb5e52907a7e4516d01bf212e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:34:57 -0400
Subject: [PATCH 319/505] Add name, enabled fields to ObjectPermission

---
 netbox/netbox/authentication.py                  |  6 +++---
 netbox/users/admin.py                            | 15 +++++++++++----
 netbox/users/api/nested_serializers.py           |  2 +-
 netbox/users/api/serializers.py                  |  2 +-
 netbox/users/migrations/0008_objectpermission.py |  2 ++
 netbox/users/models.py                           |  9 +++++++++
 netbox/users/tests/test_api.py                   |  2 +-
 7 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 7381ca685..6b58becf0 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -23,10 +23,10 @@ class ObjectPermissionBackend(ModelBackend):
         """
         Return all permissions granted to the user by an ObjectPermission.
         """
-        # Retrieve all assigned ObjectPermissions
+        # Retrieve all assigned and enabled ObjectPermissions
         object_permissions = ObjectPermission.objects.unrestricted().filter(
-            Q(users=user_obj) |
-            Q(groups__user=user_obj)
+            Q(users=user_obj) | Q(groups__user=user_obj),
+            enabled=True
         ).prefetch_related('object_types')
 
         # Create a dictionary mapping permissions to their constraints
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 25703966c..baa4dee76 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -172,15 +172,18 @@ class ObjectPermissionForm(forms.ModelForm):
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
     fieldsets = (
+        (None, {
+            'fields': ('name', 'enabled')
+        }),
+        ('Actions', {
+            'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
+        }),
         ('Objects', {
             'fields': ('object_types',)
         }),
         ('Assignment', {
             'fields': ('groups', 'users')
         }),
-        ('Actions', {
-            'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
-        }),
         ('Constraints', {
             'fields': ('constraints',)
         }),
@@ -188,7 +191,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     filter_horizontal = ('object_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
-        'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
+        'get_name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
     ]
     list_filter = [
         'groups', 'users'
@@ -197,6 +200,10 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     def get_queryset(self, request):
         return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
 
+    def get_name(self, obj):
+        return obj.name or f'Permission #{obj.pk}'
+    get_name.short_description = 'Name'
+
     def list_models(self, obj):
         return ', '.join([f"{ct}" for ct in obj.object_types.all()])
     list_models.short_description = 'Models'
diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
index f6e5cefbf..6e89f1da0 100644
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -36,7 +36,7 @@ class NestedObjectPermissionSerializer(WritableNestedSerializer):
 
     class Meta:
         model = ObjectPermission
-        fields = ['id', 'object_types', 'groups', 'users', 'actions']
+        fields = ['id', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
 
     def get_groups(self, obj):
         return [g.name for g in obj.groups.all()]
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index 052567e47..c83232431 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -26,4 +26,4 @@ class ObjectPermissionSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ObjectPermission
-        fields = ('id', 'object_types', 'groups', 'users', 'actions', 'constraints')
+        fields = ('id', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints')
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 3f16e1ee8..63e173ef8 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -18,6 +18,8 @@ class Migration(migrations.Migration):
             name='ObjectPermission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('name', models.CharField(blank=True, max_length=100)),
+                ('enabled', models.BooleanField(default=True)),
                 ('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
                 ('object_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index bce3bd704..f210cb4d0 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -235,6 +235,13 @@ class ObjectPermission(models.Model):
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
     identified by ORM query parameters.
     """
+    name = models.CharField(
+        max_length=100,
+        blank=True
+    )
+    enabled = models.BooleanField(
+        default=True
+    )
     object_types = models.ManyToManyField(
         to=ContentType,
         limit_choices_to={
@@ -270,6 +277,8 @@ class ObjectPermission(models.Model):
         verbose_name = "Permission"
 
     def __str__(self):
+        if self.name:
+            return self.name
         return '{}: {}'.format(
             ', '.join(self.object_types.values_list('model', flat=True)),
             ', '.join(self.actions)
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 166473710..a485fe9df 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -18,7 +18,7 @@ class AppTest(APITestCase):
 
 class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
     model = ObjectPermission
-    brief_fields = ['actions', 'groups', 'id', 'object_types', 'users']
+    brief_fields = ['actions', 'enabled', 'groups', 'id', 'name', 'object_types', 'users']
 
     @classmethod
     def setUpTestData(cls):

From 39248f9e2f36c79def3f6de1ed17ab23de26bc28 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:54:09 -0400
Subject: [PATCH 320/505] Enable bulk enabling/disabling of permissions

---
 netbox/users/admin.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index baa4dee76..bc3863ad5 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -171,6 +171,7 @@ class ObjectPermissionForm(forms.ModelForm):
 
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
+    actions = ('enable', 'disable')
     fieldsets = (
         (None, {
             'fields': ('name', 'enabled')
@@ -215,3 +216,15 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     def list_groups(self, obj):
         return ', '.join([g.name for g in obj.groups.all()])
     list_groups.short_description = 'Groups'
+
+    #
+    # Admin actions
+    #
+
+    def enable(self, request, queryset):
+        updated = queryset.update(enabled=True)
+        self.message_user(request, f"Enabled {updated} permissions")
+
+    def disable(self, request, queryset):
+        updated = queryset.update(enabled=False)
+        self.message_user(request, f"Disabled {updated} permissions")

From 4eddec4b1e0238ff1185ec929a19dffea6ef8342 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:57:50 -0400
Subject: [PATCH 321/505] #4806: Add url field to ObjectPermissionSerializer

---
 netbox/users/api/serializers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index c83232431..c91f9be4a 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
+from rest_framework import serializers
 
 from users.models import ObjectPermission
 from utilities.api import ContentTypeField, SerializedPKRelatedField, ValidatedModelSerializer
@@ -7,6 +8,7 @@ from .nested_serializers import *
 
 
 class ObjectPermissionSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
     object_types = ContentTypeField(
         queryset=ContentType.objects.all(),
         many=True
@@ -26,4 +28,4 @@ class ObjectPermissionSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ObjectPermission
-        fields = ('id', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints')
+        fields = ('id', 'url', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints')

From 4c2fdf3b1c4e5ad2876e2c96dea2abe0621790ee Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 13:59:57 -0400
Subject: [PATCH 322/505] Admin UI should use unrestricted queryset for
 ObjectPermissions

---
 netbox/users/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index bc3863ad5..f3e1f81ce 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -199,7 +199,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     ]
 
     def get_queryset(self, request):
-        return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
+        return super().get_queryset(request).unrestricted().prefetch_related('object_types', 'users', 'groups')
 
     def get_name(self, obj):
         return obj.name or f'Permission #{obj.pk}'

From 56c0b48302c3e176ea07b1ce02a301265c12be8b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 14:36:53 -0400
Subject: [PATCH 323/505] Enable filtering ObjectPermissions by enabled,
 action, and object type

---
 netbox/users/admin.py | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index f3e1f81ce..10fe4a74f 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -2,6 +2,7 @@ from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group, User
+from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, ValidationError
 
 from extras.admin import order_content_types
@@ -169,6 +170,39 @@ class ObjectPermissionForm(forms.ModelForm):
                     })
 
 
+class ActionListFilter(admin.SimpleListFilter):
+    title = 'action'
+    parameter_name = 'action'
+
+    def lookups(self, request, model_admin):
+        options = set()
+        for action_list in ObjectPermission.objects.unrestricted().values_list('actions', flat=True).distinct():
+            options.update(action_list)
+        return [
+            (action, action) for action in sorted(options)
+        ]
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(actions=[self.value()])
+
+
+class ObjectTypeListFilter(admin.SimpleListFilter):
+    title = 'object type'
+    parameter_name = 'object_type'
+
+    def lookups(self, request, model_admin):
+        object_types = ObjectPermission.objects.unrestricted().values_list('id', flat=True).distinct()
+        content_types = ContentType.objects.filter(pk__in=object_types).order_by('app_label', 'model')
+        return [
+            (ct.pk, ct) for ct in content_types
+        ]
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(object_types=self.value())
+
+
 @admin.register(ObjectPermission)
 class ObjectPermissionAdmin(admin.ModelAdmin):
     actions = ('enable', 'disable')
@@ -195,7 +229,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
         'get_name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
     ]
     list_filter = [
-        'groups', 'users'
+        'enabled', ActionListFilter, ObjectTypeListFilter, 'groups', 'users'
     ]
 
     def get_queryset(self, request):

From ccdbf820ba52fd7413db648b6eab0e0e706345b7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 16:07:07 -0400
Subject: [PATCH 324/505] Use monospaced font for ObjectPermission constraints

---
 netbox/users/admin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 10fe4a74f..aca0f1489 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -220,7 +220,8 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
             'fields': ('groups', 'users')
         }),
         ('Constraints', {
-            'fields': ('constraints',)
+            'fields': ('constraints',),
+            'classes': ('monospace',)
         }),
     )
     filter_horizontal = ('object_types', 'groups', 'users')

From 0a44ed135539a3f91457fa11bf00b70cfc7eb147 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 8 Jul 2020 17:51:25 -0400
Subject: [PATCH 325/505] Fix permissions evaluation for session-authenticated
 API requests

---
 netbox/netbox/api.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/netbox/netbox/api.py b/netbox/netbox/api.py
index a67a5d60a..28403f181 100644
--- a/netbox/netbox/api.py
+++ b/netbox/netbox/api.py
@@ -75,16 +75,15 @@ class TokenPermissions(DjangoObjectPermissions):
         super().__init__()
 
     def _verify_write_permission(self, request):
+
         # If token authentication is in use, verify that the token allows write operations (for unsafe methods).
-        if request.method in SAFE_METHODS:
-            return True
-        if isinstance(request.auth, Token) and request.auth.write_enabled:
+        if request.method in SAFE_METHODS or request.auth.write_enabled:
             return True
 
     def has_permission(self, request, view):
 
         # Enforce Token write ability
-        if not self._verify_write_permission(request):
+        if isinstance(request.auth, Token) and not self._verify_write_permission(request):
             return False
 
         return super().has_permission(request, view)
@@ -92,7 +91,7 @@ class TokenPermissions(DjangoObjectPermissions):
     def has_object_permission(self, request, view, obj):
 
         # Enforce Token write ability
-        if not self._verify_write_permission(request):
+        if isinstance(request.auth, Token) and not self._verify_write_permission(request):
             return False
 
         return super().has_object_permission(request, view, obj)

From b535608519c64ddb42adcc7d8c3dd9cee72fc785 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 09:13:58 -0400
Subject: [PATCH 326/505] Refactor imports

---
 netbox/utilities/api.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 067af9e5a..9a41edbe5 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -8,14 +8,13 @@ from django.core.exceptions import FieldError, MultipleObjectsReturned, ObjectDo
 from django.db import transaction
 from django.db.models import ManyToManyField, ProtectedError
 from django.urls import reverse
-from rest_framework.exceptions import APIException
+from rest_framework import serializers
+from rest_framework.exceptions import APIException, ValidationError
 from rest_framework.permissions import BasePermission
 from rest_framework.relations import PrimaryKeyRelatedField, RelatedField
 from rest_framework.response import Response
-from rest_framework.serializers import Field, ModelSerializer, ValidationError
 from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
-from netbox.api import TokenPermissions
 from .utils import dict_to_filter_params, dynamic_import
 
 
@@ -70,7 +69,7 @@ class IsAuthenticatedOrLoginNotRequired(BasePermission):
 # Fields
 #
 
-class ChoiceField(Field):
+class ChoiceField(serializers.Field):
     """
     Represent a ChoiceField as {'value': <DB value>, 'label': <string>}. Accepts a single value on write.
 
@@ -177,7 +176,7 @@ class ContentTypeField(RelatedField):
         return "{}.{}".format(obj.app_label, obj.model)
 
 
-class TimeZoneField(Field):
+class TimeZoneField(serializers.Field):
     """
     Represent a pytz time zone.
     """
@@ -212,7 +211,7 @@ class SerializedPKRelatedField(PrimaryKeyRelatedField):
 
 # TODO: We should probably take a fresh look at exactly what we're doing with this. There might be a more elegant
 # way to enforce model validation on the serializer.
-class ValidatedModelSerializer(ModelSerializer):
+class ValidatedModelSerializer(serializers.ModelSerializer):
     """
     Extends the built-in ModelSerializer to enforce calling clean() on the associated model during validation.
     """
@@ -241,7 +240,7 @@ class ValidatedModelSerializer(ModelSerializer):
         return data
 
 
-class WritableNestedSerializer(ModelSerializer):
+class WritableNestedSerializer(serializers.ModelSerializer):
     """
     Returns a nested representation of an object on read, but accepts only a primary key on write.
     """

From 15525392a27f8663feec7d08e7008907d3adf074 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 09:50:01 -0400
Subject: [PATCH 327/505] Closes #4837: Use dynamic form widget for
 relationships to MPTT objects

---
 docs/release-notes/version-2.9.md        |  2 ++
 netbox/dcim/api/nested_serializers.py    |  6 ++++--
 netbox/dcim/api/serializers.py           |  6 ++++--
 netbox/dcim/forms.py                     | 16 ++++++----------
 netbox/extras/forms.py                   |  8 +++-----
 netbox/extras/scripts.py                 | 12 ------------
 netbox/project-static/js/forms.js        |  4 ++++
 netbox/tenancy/api/nested_serializers.py |  3 ++-
 netbox/tenancy/api/serializers.py        |  3 ++-
 netbox/tenancy/forms.py                  |  5 +----
 10 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index ffae2f5de..21470aaa1 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -25,6 +25,7 @@ When running a report or custom script, the task is now queued for background pr
 * [#4806](https://github.com/netbox-community/netbox/issues/4806) - Add a `url` field to all API serializers
 * [#4807](https://github.com/netbox-community/netbox/issues/4807) - Add bulk edit ability for device bay templates
 * [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
+* [#4837](https://github.com/netbox-community/netbox/issues/4837) - Use dynamic form widget for relationships to MPTT objects (e.g. regions)
 
 ### Configuration Changes
 
@@ -52,6 +53,7 @@ When running a report or custom script, the task is now queued for background pr
 * extras.Report: The `failed` field has been removed. The `completed` (boolean) and `status` (string) fields have been introduced to convey the status of a report's most recent execution. Additionally, the `result` field now conveys the nested representation of a JobResult.
 * extras.Script: Added `module` and `result` fields. The `result` field now conveys the nested representation of a JobResult.
 * A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
+* A `_depth` field has been added to all objects which feature a self-recursive hierarchy (namely regions, rack groups, and tenant groups).
 
 ### Other Changes
 
diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py
index 5d9380c00..141aca013 100644
--- a/netbox/dcim/api/nested_serializers.py
+++ b/netbox/dcim/api/nested_serializers.py
@@ -47,10 +47,11 @@ __all__ = [
 class NestedRegionSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
     site_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = models.Region
-        fields = ['id', 'url', 'name', 'slug', 'site_count']
+        fields = ['id', 'url', 'name', 'slug', 'site_count', '_depth']
 
 
 class NestedSiteSerializer(WritableNestedSerializer):
@@ -68,10 +69,11 @@ class NestedSiteSerializer(WritableNestedSerializer):
 class NestedRackGroupSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='dcim-api:rackgroup-detail')
     rack_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = models.RackGroup
-        fields = ['id', 'url', 'name', 'slug', 'rack_count']
+        fields = ['id', 'url', 'name', 'slug', 'rack_count', '_depth']
 
 
 class NestedRackRoleSerializer(WritableNestedSerializer):
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index 916f86487..c97298b2b 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -63,10 +63,11 @@ class RegionSerializer(serializers.ModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='dcim-api:region-detail')
     parent = NestedRegionSerializer(required=False, allow_null=True)
     site_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = Region
-        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'site_count']
+        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'site_count', '_depth']
 
 
 class SiteSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
@@ -101,10 +102,11 @@ class RackGroupSerializer(ValidatedModelSerializer):
     site = NestedSiteSerializer()
     parent = NestedRackGroupSerializer(required=False, allow_null=True)
     rack_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = RackGroup
-        fields = ['id', 'url', 'name', 'slug', 'site', 'parent', 'description', 'rack_count']
+        fields = ['id', 'url', 'name', 'slug', 'site', 'parent', 'description', 'rack_count', '_depth']
 
 
 class RackRoleSerializer(ValidatedModelSerializer):
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index dcc1f6418..b0c6f15d9 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -6,7 +6,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.forms.array import SimpleArrayField
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.safestring import mark_safe
-from mptt.forms import TreeNodeChoiceField
 from netaddr import EUI
 from netaddr.core import AddrFormatError
 from timezone_field import TimeZoneFormField
@@ -179,10 +178,9 @@ class MACAddressField(forms.Field):
 #
 
 class RegionForm(BootstrapMixin, forms.ModelForm):
-    parent = TreeNodeChoiceField(
+    parent = DynamicModelChoiceField(
         queryset=Region.objects.all(),
-        required=False,
-        widget=StaticSelect2()
+        required=False
     )
     slug = SlugField()
 
@@ -219,10 +217,9 @@ class RegionFilterForm(BootstrapMixin, forms.Form):
 #
 
 class SiteForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
-    region = TreeNodeChoiceField(
+    region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
-        required=False,
-        widget=StaticSelect2()
+        required=False
     )
     slug = SlugField()
     comments = CommentField()
@@ -305,10 +302,9 @@ class SiteBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
         initial='',
         widget=StaticSelect2()
     )
-    region = TreeNodeChoiceField(
+    region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
-        required=False,
-        widget=StaticSelect2()
+        required=False
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index 4b2c1844c..b61a44f60 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -2,14 +2,13 @@ from django import forms
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.utils.safestring import mark_safe
-from mptt.forms import TreeNodeMultipleChoiceField
 
 from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
     add_blank_choice, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, ColorSelect,
     ContentTypeSelect, CSVModelForm, DateTimePicker, DynamicModelMultipleChoiceField, JSONField, SlugField,
-    StaticSelect2, StaticSelect2Multiple, BOOLEAN_WITH_BLANK_CHOICES,
+    StaticSelect2, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from virtualization.models import Cluster, ClusterGroup
 from .choices import *
@@ -211,10 +210,9 @@ class TagBulkEditForm(BootstrapMixin, BulkEditForm):
 #
 
 class ConfigContextForm(BootstrapMixin, forms.ModelForm):
-    regions = TreeNodeMultipleChoiceField(
+    regions = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
-        required=False,
-        widget=StaticSelect2Multiple()
+        required=False
     )
     sites = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 018963bd8..dd096c392 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -3,7 +3,6 @@ import json
 import logging
 import os
 import pkgutil
-import time
 import traceback
 from collections import OrderedDict
 
@@ -12,11 +11,8 @@ from django import forms
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import transaction
-from django.utils import timezone
 from django.utils.decorators import classproperty
 from django_rq import job
-from mptt.forms import TreeNodeChoiceField, TreeNodeMultipleChoiceField
-from mptt.models import MPTTModel
 
 from extras.api.serializers import ScriptOutputSerializer
 from extras.choices import JobResultStatusChoices, LogLevelChoices
@@ -182,10 +178,6 @@ class ObjectVar(ScriptVariable):
         # Queryset for field choices
         self.field_attrs['queryset'] = queryset
 
-        # Update form field for MPTT (nested) objects
-        if issubclass(queryset.model, MPTTModel):
-            self.form_field = TreeNodeChoiceField
-
 
 class MultiObjectVar(ScriptVariable):
     """
@@ -199,10 +191,6 @@ class MultiObjectVar(ScriptVariable):
         # Queryset for field choices
         self.field_attrs['queryset'] = queryset
 
-        # Update form field for MPTT (nested) objects
-        if issubclass(queryset.model, MPTTModel):
-            self.form_field = TreeNodeMultipleChoiceField
-
 
 class FileVar(ScriptVariable):
     """
diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index b97981f0e..26c8338c2 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -222,6 +222,10 @@ $(document).ready(function() {
 
                 results = results.reduce((results,record,idx) => {
                     record.text = record[element.getAttribute('display-field')] || record.name;
+                    if (record._depth) {
+                        // Annotate hierarchical depth for MPTT objects
+                        record.text = '--'.repeat(record._depth) + ' ' + record.text;
+                    }
                     record.id = record[element.getAttribute('value-field')] || record.id;
                     if(element.getAttribute('disabled-indicator') && record[element.getAttribute('disabled-indicator')]) {
                         // The disabled-indicator equated to true, so we disable this option
diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py
index 80780dba3..369d5eb1b 100644
--- a/netbox/tenancy/api/nested_serializers.py
+++ b/netbox/tenancy/api/nested_serializers.py
@@ -16,10 +16,11 @@ __all__ = [
 class NestedTenantGroupSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail')
     tenant_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = TenantGroup
-        fields = ['id', 'url', 'name', 'slug', 'tenant_count']
+        fields = ['id', 'url', 'name', 'slug', 'tenant_count', '_depth']
 
 
 class NestedTenantSerializer(WritableNestedSerializer):
diff --git a/netbox/tenancy/api/serializers.py b/netbox/tenancy/api/serializers.py
index 4589878e6..4467b050b 100644
--- a/netbox/tenancy/api/serializers.py
+++ b/netbox/tenancy/api/serializers.py
@@ -15,10 +15,11 @@ class TenantGroupSerializer(ValidatedModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:tenantgroup-detail')
     parent = NestedTenantGroupSerializer(required=False, allow_null=True)
     tenant_count = serializers.IntegerField(read_only=True)
+    _depth = serializers.IntegerField(source='level', read_only=True)
 
     class Meta:
         model = TenantGroup
-        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'tenant_count']
+        fields = ['id', 'url', 'name', 'slug', 'parent', 'description', 'tenant_count', '_depth']
 
 
 class TenantSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 5bd0657b6..04a3980a1 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -18,10 +18,7 @@ from .models import Tenant, TenantGroup
 class TenantGroupForm(BootstrapMixin, forms.ModelForm):
     parent = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
-        required=False,
-        widget=APISelect(
-            api_url="/api/tenancy/tenant-groups/"
-        )
+        required=False
     )
     slug = SlugField()
 

From 1692fbf5d889929a903cb4890bd567144ae4f2ee Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 12:06:13 -0400
Subject: [PATCH 328/505] #4837: Fix API tests

---
 netbox/dcim/tests/test_api.py    | 4 ++--
 netbox/tenancy/tests/test_api.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 17ac672d9..264102fbe 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -68,7 +68,7 @@ class Mixins:
 
 class RegionTest(APIViewTestCases.APIViewTestCase):
     model = Region
-    brief_fields = ['id', 'name', 'site_count', 'slug', 'url']
+    brief_fields = ['_depth', 'id', 'name', 'site_count', 'slug', 'url']
     create_data = [
         {
             'name': 'Region 4',
@@ -155,7 +155,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
 
 class RackGroupTest(APIViewTestCases.APIViewTestCase):
     model = RackGroup
-    brief_fields = ['id', 'name', 'rack_count', 'slug', 'url']
+    brief_fields = ['_depth', 'id', 'name', 'rack_count', 'slug', 'url']
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py
index b06a8213a..f04b2a7ce 100644
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -16,7 +16,7 @@ class AppTest(APITestCase):
 
 class TenantGroupTest(APIViewTestCases.APIViewTestCase):
     model = TenantGroup
-    brief_fields = ['id', 'name', 'slug', 'tenant_count', 'url']
+    brief_fields = ['_depth', 'id', 'name', 'slug', 'tenant_count', 'url']
 
     @classmethod
     def setUpTestData(cls):

From 26e81546ebcf2978b1c0001cbb71a8555760ceaa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 13:08:13 -0400
Subject: [PATCH 329/505] Fix REST API version calculation

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 0c0f4506d..86f1b333e 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -455,7 +455,7 @@ FILTERS_NULL_CHOICE_VALUE = 'null'
 # Django REST framework (API)
 #
 
-REST_FRAMEWORK_VERSION = VERSION[0:3]  # Use major.minor as API version
+REST_FRAMEWORK_VERSION = VERSION.rsplit('.', 1)[0]  # Use major.minor as API version
 REST_FRAMEWORK = {
     'ALLOWED_VERSIONS': [REST_FRAMEWORK_VERSION],
     'DEFAULT_AUTHENTICATION_CLASSES': (

From 4f00b5af4ab68b1ec78f8593a6e9109697f5c36c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 15:11:18 -0400
Subject: [PATCH 330/505] Miscellaneous RestrictedQuerySet cleanup

---
 netbox/dcim/models/__init__.py     |  2 +-
 netbox/dcim/tables.py              |  4 ++--
 netbox/ipam/api/views.py           |  2 +-
 netbox/ipam/forms.py               |  1 +
 netbox/ipam/models.py              |  4 ++--
 netbox/ipam/tables.py              |  6 +++---
 netbox/ipam/tests/test_ordering.py |  6 +++---
 netbox/ipam/views.py               | 10 ++++++++--
 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index db8fd8cf3..1bd1a83ed 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -1729,7 +1729,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         filter = Q(device=self)
         if self.virtual_chassis and self.virtual_chassis.master == self:
             filter |= Q(device__virtual_chassis=self.virtual_chassis, mgmt_only=False)
-        return Interface.objects.filter(filter)
+        return Interface.objects.unrestricted().filter(filter)
 
     def get_cables(self, pk_list=False):
         """
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 442c0cf47..028c658f7 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -495,13 +495,13 @@ class DeviceRoleTable(BaseTable):
     pk = ToggleColumn()
     device_count = tables.TemplateColumn(
         template_code=DEVICEROLE_DEVICE_COUNT,
-        accessor=Accessor('devices.count'),
+        accessor=Accessor('devices.unrestricted.count'),
         orderable=False,
         verbose_name='Devices'
     )
     vm_count = tables.TemplateColumn(
         template_code=DEVICEROLE_VM_COUNT,
-        accessor=Accessor('virtual_machines.count'),
+        accessor=Accessor('virtual_machines.unrestricted.count'),
         orderable=False,
         verbose_name='VMs'
     )
diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 83e185796..77ac36683 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -84,7 +84,7 @@ class PrefixViewSet(CustomFieldModelViewSet):
         The advisory lock decorator uses a PostgreSQL advisory lock to prevent this API from being
         invoked in parallel, which results in a race condition where multiple insertions can occur.
         """
-        prefix = get_object_or_404(Prefix, pk=pk)
+        prefix = get_object_or_404(self.queryset, pk=pk)
         available_prefixes = prefix.get_available_prefixes()
 
         if request.method == 'POST':
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 537a8367a..ade7fc994 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1,4 +1,5 @@
 from django import forms
+from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MaxValueValidator, MinValueValidator
 
 from dcim.models import Device, Interface, Rack, Region, Site
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 536e7d928..48884ba20 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -868,9 +868,9 @@ class VLANGroup(ChangeLoggedModel):
         """
         Return the first available VLAN ID (1-4094) in the group.
         """
-        vids = [vlan['vid'] for vlan in self.vlans.order_by('vid').values('vid')]
+        vlan_ids = VLAN.objects.unrestricted().filter(group=self).values_list('vid', flat=True)
         for i in range(1, 4095):
-            if i not in vids:
+            if i not in vlan_ids:
                 return i
         return None
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 72ac3eb45..83b5b92fa 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -103,7 +103,7 @@ VLAN_LINK = """
 """
 
 VLAN_PREFIXES = """
-{% for prefix in record.prefixes.all %}
+{% for prefix in record.prefixes.unrestricted %}
     <a href="{% url 'ipam:prefix' pk=prefix.pk %}">{{ prefix }}</a>{% if not forloop.last %}<br />{% endif %}
 {% empty %}
     &mdash;
@@ -283,13 +283,13 @@ class AggregateDetailTable(AggregateTable):
 class RoleTable(BaseTable):
     pk = ToggleColumn()
     prefix_count = tables.TemplateColumn(
-        accessor=Accessor('prefixes.count'),
+        accessor=Accessor('prefixes.unrestricted.count'),
         template_code=ROLE_PREFIX_COUNT,
         orderable=False,
         verbose_name='Prefixes'
     )
     vlan_count = tables.TemplateColumn(
-        accessor=Accessor('vlans.count'),
+        accessor=Accessor('vlans.unrestricted.count'),
         template_code=ROLE_VLAN_COUNT,
         orderable=False,
         verbose_name='VLANs'
diff --git a/netbox/ipam/tests/test_ordering.py b/netbox/ipam/tests/test_ordering.py
index 690501e53..9427c0cdf 100644
--- a/netbox/ipam/tests/test_ordering.py
+++ b/netbox/ipam/tests/test_ordering.py
@@ -86,7 +86,7 @@ class PrefixOrderingTestCase(OrderingTestBase):
         Prefix.objects.bulk_create(prefixes)
 
         # Test
-        self._compare(Prefix.objects.all(), prefixes)
+        self._compare(Prefix.objects.unrestricted(), prefixes)
 
     def test_prefix_complex_ordering(self):
         """
@@ -122,7 +122,7 @@ class PrefixOrderingTestCase(OrderingTestBase):
         Prefix.objects.bulk_create(prefixes)
 
         # Test
-        self._compare(Prefix.objects.all(), prefixes)
+        self._compare(Prefix.objects.unrestricted(), prefixes)
 
 
 class IPAddressOrderingTestCase(OrderingTestBase):
@@ -173,4 +173,4 @@ class IPAddressOrderingTestCase(OrderingTestBase):
         IPAddress.objects.bulk_create(addresses)
 
         # Test
-        self._compare(IPAddress.objects.all(), addresses)
+        self._compare(IPAddress.objects.unrestricted(), addresses)
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 5c0df3a16..b5abbe251 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -827,9 +827,15 @@ class ServiceEditView(ObjectEditView):
 
     def alter_obj(self, obj, request, url_args, url_kwargs):
         if 'device' in url_kwargs:
-            obj.device = get_object_or_404(Device, pk=url_kwargs['device'])
+            obj.device = get_object_or_404(
+                Device.objects.restrict(request.user),
+                pk=url_kwargs['device']
+            )
         elif 'virtualmachine' in url_kwargs:
-            obj.virtual_machine = get_object_or_404(VirtualMachine, pk=url_kwargs['virtualmachine'])
+            obj.virtual_machine = get_object_or_404(
+                VirtualMachine.objects.restrict(request.user),
+                pk=url_kwargs['virtualmachine']
+            )
         return obj
 
     def get_return_url(self, request, service):

From 8d7001fe565e4f1a3d14893b89e89cd3e8558346 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 16:49:48 -0400
Subject: [PATCH 331/505] Move abstract ChangeLoggedModel under extras

---
 netbox/circuits/models.py              |   3 +-
 netbox/dcim/models/__init__.py         |   3 +-
 netbox/extras/models/__init__.py       |   6 +-
 netbox/extras/models/change_logging.py | 155 +++++++++++++++++++++++++
 netbox/extras/models/models.py         | 119 +------------------
 netbox/extras/models/tags.py           |   2 +-
 netbox/ipam/models.py                  |   3 +-
 netbox/secrets/models.py               |   3 +-
 netbox/tenancy/models.py               |   3 +-
 netbox/utilities/models.py             |  41 -------
 netbox/virtualization/models.py        |   3 +-
 11 files changed, 169 insertions(+), 172 deletions(-)
 create mode 100644 netbox/extras/models/change_logging.py
 delete mode 100644 netbox/utilities/models.py

diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 5e2bd08c1..63491ca20 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -6,10 +6,9 @@ from taggit.managers import TaggableManager
 from dcim.constants import CONNECTION_STATUS_CHOICES
 from dcim.fields import ASNField
 from dcim.models import CableTermination
-from extras.models import CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.querysets import RestrictedQuerySet
-from utilities.models import ChangeLoggedModel
 from utilities.utils import serialize_object
 from .choices import *
 from .querysets import CircuitQuerySet
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 1bd1a83ed..9b1019990 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -21,12 +21,11 @@ from dcim.choices import *
 from dcim.constants import *
 from dcim.fields import ASNField
 from dcim.elevations import RackElevationSVG
-from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import ChangeLoggedModel, ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.choices import ColorChoices
 from utilities.fields import ColorField, NaturalOrderingField
 from utilities.querysets import RestrictedQuerySet
-from utilities.models import ChangeLoggedModel
 from utilities.mptt import TreeManager
 from utilities.utils import serialize_object, to_meters
 from utilities.validators import ExclusionValidator
diff --git a/netbox/extras/models/__init__.py b/netbox/extras/models/__init__.py
index 89dd54260..e52058157 100644
--- a/netbox/extras/models/__init__.py
+++ b/netbox/extras/models/__init__.py
@@ -1,11 +1,13 @@
+from .change_logging import ChangeLoggedModel, ObjectChange
 from .customfields import CustomField, CustomFieldChoice, CustomFieldModel, CustomFieldValue
 from .models import (
-    ConfigContext, ConfigContextModel, CustomLink, ExportTemplate, Graph, ImageAttachment, JobResult, ObjectChange,
-    Report, Script, Webhook,
+    ConfigContext, ConfigContextModel, CustomLink, ExportTemplate, Graph, ImageAttachment, JobResult, Report, Script,
+    Webhook,
 )
 from .tags import Tag, TaggedItem
 
 __all__ = (
+    'ChangeLoggedModel',
     'ConfigContext',
     'ConfigContextModel',
     'CustomField',
diff --git a/netbox/extras/models/change_logging.py b/netbox/extras/models/change_logging.py
new file mode 100644
index 000000000..3260c5302
--- /dev/null
+++ b/netbox/extras/models/change_logging.py
@@ -0,0 +1,155 @@
+from django.contrib.auth.models import User
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.postgres.fields import JSONField
+from django.db import models
+from django.urls import reverse
+
+from utilities.querysets import RestrictedQuerySet
+from utilities.utils import serialize_object
+from extras.choices import *
+
+
+#
+# Change logging
+#
+
+class ChangeLoggedModel(models.Model):
+    """
+    An abstract model which adds fields to store the creation and last-updated times for an object. Both fields can be
+    null to facilitate adding these fields to existing instances via a database migration.
+    """
+    created = models.DateField(
+        auto_now_add=True,
+        blank=True,
+        null=True
+    )
+    last_updated = models.DateTimeField(
+        auto_now=True,
+        blank=True,
+        null=True
+    )
+
+    class Meta:
+        abstract = True
+
+    def to_objectchange(self, action):
+        """
+        Return a new ObjectChange representing a change made to this object. This will typically be called automatically
+        by extras.middleware.ChangeLoggingMiddleware.
+        """
+        return ObjectChange(
+            changed_object=self,
+            object_repr=str(self),
+            action=action,
+            object_data=serialize_object(self)
+        )
+
+
+class ObjectChange(models.Model):
+    """
+    Record a change to an object and the user account associated with that change. A change record may optionally
+    indicate an object related to the one being changed. For example, a change to an interface may also indicate the
+    parent device. This will ensure changes made to component models appear in the parent model's changelog.
+    """
+    time = models.DateTimeField(
+        auto_now_add=True,
+        editable=False,
+        db_index=True
+    )
+    user = models.ForeignKey(
+        to=User,
+        on_delete=models.SET_NULL,
+        related_name='changes',
+        blank=True,
+        null=True
+    )
+    user_name = models.CharField(
+        max_length=150,
+        editable=False
+    )
+    request_id = models.UUIDField(
+        editable=False
+    )
+    action = models.CharField(
+        max_length=50,
+        choices=ObjectChangeActionChoices
+    )
+    changed_object_type = models.ForeignKey(
+        to=ContentType,
+        on_delete=models.PROTECT,
+        related_name='+'
+    )
+    changed_object_id = models.PositiveIntegerField()
+    changed_object = GenericForeignKey(
+        ct_field='changed_object_type',
+        fk_field='changed_object_id'
+    )
+    related_object_type = models.ForeignKey(
+        to=ContentType,
+        on_delete=models.PROTECT,
+        related_name='+',
+        blank=True,
+        null=True
+    )
+    related_object_id = models.PositiveIntegerField(
+        blank=True,
+        null=True
+    )
+    related_object = GenericForeignKey(
+        ct_field='related_object_type',
+        fk_field='related_object_id'
+    )
+    object_repr = models.CharField(
+        max_length=200,
+        editable=False
+    )
+    object_data = JSONField(
+        editable=False
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'time', 'user', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id',
+        'related_object_type', 'related_object_id', 'object_repr', 'object_data',
+    ]
+
+    class Meta:
+        ordering = ['-time']
+
+    def __str__(self):
+        return '{} {} {} by {}'.format(
+            self.changed_object_type,
+            self.object_repr,
+            self.get_action_display().lower(),
+            self.user_name
+        )
+
+    def save(self, *args, **kwargs):
+
+        # Record the user's name and the object's representation as static strings
+        if not self.user_name:
+            self.user_name = self.user.username
+        if not self.object_repr:
+            self.object_repr = str(self.changed_object)
+
+        return super().save(*args, **kwargs)
+
+    def get_absolute_url(self):
+        return reverse('extras:objectchange', args=[self.pk])
+
+    def to_csv(self):
+        return (
+            self.time,
+            self.user,
+            self.user_name,
+            self.request_id,
+            self.get_action_display(),
+            self.changed_object_type,
+            self.changed_object_id,
+            self.related_object_type,
+            self.related_object_id,
+            self.object_repr,
+            self.object_data,
+        )
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 009fdc2d1..093589f84 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -2,7 +2,6 @@ import json
 import uuid
 from collections import OrderedDict
 
-import django_rq
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
@@ -15,12 +14,13 @@ from django.urls import reverse
 from django.utils import timezone
 from rest_framework.utils.encoders import JSONEncoder
 
-from utilities.querysets import RestrictedQuerySet
-from utilities.utils import deepmerge, render_jinja2
 from extras.choices import *
 from extras.constants import *
+from extras.models import ChangeLoggedModel
 from extras.querysets import ConfigContextQuerySet
 from extras.utils import extras_features, FeatureQuery, image_upload
+from utilities.querysets import RestrictedQuerySet
+from utilities.utils import deepmerge, render_jinja2
 
 
 #
@@ -684,116 +684,3 @@ class JobResult(models.Model):
         func.delay(*args, job_id=str(job_result.job_id), job_result=job_result, **kwargs)
 
         return job_result
-
-
-#
-# Change logging
-#
-
-class ObjectChange(models.Model):
-    """
-    Record a change to an object and the user account associated with that change. A change record may optionally
-    indicate an object related to the one being changed. For example, a change to an interface may also indicate the
-    parent device. This will ensure changes made to component models appear in the parent model's changelog.
-    """
-    time = models.DateTimeField(
-        auto_now_add=True,
-        editable=False,
-        db_index=True
-    )
-    user = models.ForeignKey(
-        to=User,
-        on_delete=models.SET_NULL,
-        related_name='changes',
-        blank=True,
-        null=True
-    )
-    user_name = models.CharField(
-        max_length=150,
-        editable=False
-    )
-    request_id = models.UUIDField(
-        editable=False
-    )
-    action = models.CharField(
-        max_length=50,
-        choices=ObjectChangeActionChoices
-    )
-    changed_object_type = models.ForeignKey(
-        to=ContentType,
-        on_delete=models.PROTECT,
-        related_name='+'
-    )
-    changed_object_id = models.PositiveIntegerField()
-    changed_object = GenericForeignKey(
-        ct_field='changed_object_type',
-        fk_field='changed_object_id'
-    )
-    related_object_type = models.ForeignKey(
-        to=ContentType,
-        on_delete=models.PROTECT,
-        related_name='+',
-        blank=True,
-        null=True
-    )
-    related_object_id = models.PositiveIntegerField(
-        blank=True,
-        null=True
-    )
-    related_object = GenericForeignKey(
-        ct_field='related_object_type',
-        fk_field='related_object_id'
-    )
-    object_repr = models.CharField(
-        max_length=200,
-        editable=False
-    )
-    object_data = JSONField(
-        editable=False
-    )
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'time', 'user', 'user_name', 'request_id', 'action', 'changed_object_type', 'changed_object_id',
-        'related_object_type', 'related_object_id', 'object_repr', 'object_data',
-    ]
-
-    class Meta:
-        ordering = ['-time']
-
-    def __str__(self):
-        return '{} {} {} by {}'.format(
-            self.changed_object_type,
-            self.object_repr,
-            self.get_action_display().lower(),
-            self.user_name
-        )
-
-    def save(self, *args, **kwargs):
-
-        # Record the user's name and the object's representation as static strings
-        if not self.user_name:
-            self.user_name = self.user.username
-        if not self.object_repr:
-            self.object_repr = str(self.changed_object)
-
-        return super().save(*args, **kwargs)
-
-    def get_absolute_url(self):
-        return reverse('extras:objectchange', args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.time,
-            self.user,
-            self.user_name,
-            self.request_id,
-            self.get_action_display(),
-            self.changed_object_type,
-            self.changed_object_id,
-            self.related_object_type,
-            self.related_object_id,
-            self.object_repr,
-            self.object_data,
-        )
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index 5ced4b962..b9d7934ce 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -2,9 +2,9 @@ from django.db import models
 from django.utils.text import slugify
 from taggit.models import TagBase, GenericTaggedItemBase
 
+from extras.models import ChangeLoggedModel
 from utilities.choices import ColorChoices
 from utilities.fields import ColorField
-from utilities.models import ChangeLoggedModel
 from utilities.querysets import RestrictedQuerySet
 
 
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 48884ba20..7ccb85d59 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -10,9 +10,8 @@ from django.urls import reverse
 from taggit.managers import TaggableManager
 
 from dcim.models import Device, Interface
-from extras.models import CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
-from utilities.models import ChangeLoggedModel
 from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
 from virtualization.models import VirtualMachine, VMInterface
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index bf5858ff8..e5e53399c 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -14,9 +14,8 @@ from django.utils.encoding import force_bytes
 from taggit.managers import TaggableManager
 
 from dcim.models import Device
-from extras.models import CustomFieldModel, TaggedItem
+from extras.models import ChangeLoggedModel, CustomFieldModel, TaggedItem
 from extras.utils import extras_features
-from utilities.models import ChangeLoggedModel
 from utilities.querysets import RestrictedQuerySet
 from .exceptions import InvalidKey
 from .hashers import SecretValidationHasher
diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py
index 2e415b965..cc3abf19a 100644
--- a/netbox/tenancy/models.py
+++ b/netbox/tenancy/models.py
@@ -4,9 +4,8 @@ from django.urls import reverse
 from mptt.models import MPTTModel, TreeForeignKey
 from taggit.managers import TaggableManager
 
-from extras.models import CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
-from utilities.models import ChangeLoggedModel
 from utilities.mptt import TreeManager
 from utilities.querysets import RestrictedQuerySet
 from utilities.utils import serialize_object
diff --git a/netbox/utilities/models.py b/netbox/utilities/models.py
deleted file mode 100644
index ac3812ea8..000000000
--- a/netbox/utilities/models.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from django.db import models
-
-from extras.models import ObjectChange
-from utilities.utils import serialize_object
-
-
-__all__ = (
-    'ChangeLoggedModel',
-)
-
-
-class ChangeLoggedModel(models.Model):
-    """
-    An abstract model which adds fields to store the creation and last-updated times for an object. Both fields can be
-    null to facilitate adding these fields to existing instances via a database migration.
-    """
-    created = models.DateField(
-        auto_now_add=True,
-        blank=True,
-        null=True
-    )
-    last_updated = models.DateTimeField(
-        auto_now=True,
-        blank=True,
-        null=True
-    )
-
-    class Meta:
-        abstract = True
-
-    def to_objectchange(self, action):
-        """
-        Return a new ObjectChange representing a change made to this object. This will typically be called automatically
-        by extras.middleware.ChangeLoggingMiddleware.
-        """
-        return ObjectChange(
-            changed_object=self,
-            object_repr=str(self),
-            action=action,
-            object_data=serialize_object(self)
-        )
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index 258183bff..edc6fb423 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -7,10 +7,9 @@ from taggit.managers import TaggableManager
 
 from dcim.choices import InterfaceModeChoices
 from dcim.models import BaseInterface, Device
-from extras.models import ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
+from extras.models import ChangeLoggedModel, ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
 from extras.utils import extras_features
 from utilities.fields import NaturalOrderingField
-from utilities.models import ChangeLoggedModel
 from utilities.ordering import naturalize_interface
 from utilities.query_functions import CollateAsChar
 from utilities.querysets import RestrictedQuerySet

From 59091efa86aec1857cb06ada4676c9a2f1903e07 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 9 Jul 2020 17:09:03 -0400
Subject: [PATCH 332/505] Closes #4840: Enable change logging for config
 contexts

---
 docs/release-notes/version-2.9.md             |  1 +
 netbox/extras/api/serializers.py              |  2 +-
 .../0045_configcontext_changelog.py           | 23 +++++++++++++++++++
 netbox/extras/models/models.py                |  2 +-
 netbox/extras/tests/test_views.py             |  1 +
 netbox/extras/urls.py                         |  3 ++-
 netbox/templates/extras/configcontext.html    | 10 ++++++++
 7 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 netbox/extras/migrations/0045_configcontext_changelog.py

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 21470aaa1..dc9139986 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -26,6 +26,7 @@ When running a report or custom script, the task is now queued for background pr
 * [#4807](https://github.com/netbox-community/netbox/issues/4807) - Add bulk edit ability for device bay templates
 * [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
 * [#4837](https://github.com/netbox-community/netbox/issues/4837) - Use dynamic form widget for relationships to MPTT objects (e.g. regions)
+* [#4840](https://github.com/netbox-community/netbox/issues/4840) - Enable change logging for config contexts
 
 ### Configuration Changes
 
diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 2f0235e80..0d4d91a64 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -233,7 +233,7 @@ class ConfigContextSerializer(ValidatedModelSerializer):
         model = ConfigContext
         fields = [
             'id', 'url', 'name', 'weight', 'description', 'is_active', 'regions', 'sites', 'roles', 'platforms',
-            'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'tags', 'data',
+            'cluster_groups', 'clusters', 'tenant_groups', 'tenants', 'tags', 'data', 'created', 'last_updated',
         ]
 
 
diff --git a/netbox/extras/migrations/0045_configcontext_changelog.py b/netbox/extras/migrations/0045_configcontext_changelog.py
new file mode 100644
index 000000000..0368e80ee
--- /dev/null
+++ b/netbox/extras/migrations/0045_configcontext_changelog.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.6 on 2020-07-09 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0044_jobresult'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='configcontext',
+            name='created',
+            field=models.DateField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='configcontext',
+            name='last_updated',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+    ]
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 093589f84..edd13a123 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -434,7 +434,7 @@ class ImageAttachment(models.Model):
 # Config contexts
 #
 
-class ConfigContext(models.Model):
+class ConfigContext(ChangeLoggedModel):
     """
     A ConfigContext represents a set of arbitrary data available to any Device or VirtualMachine matching its assigned
     qualifiers (region, site, etc.). For example, the data stored in a ConfigContext assigned to site A and tenant B
diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index f14f02e43..cc25bef90 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -45,6 +45,7 @@ class TagTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 # Blocked by absence of standard create/edit, bulk create views
 class ConfigContextTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkEditObjectsViewTestCase,
diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py
index 6f8832487..36077dc7a 100644
--- a/netbox/extras/urls.py
+++ b/netbox/extras/urls.py
@@ -1,7 +1,7 @@
 from django.urls import path
 
 from extras import views
-from extras.models import Tag
+from extras.models import ConfigContext, Tag
 
 
 app_name = 'extras'
@@ -25,6 +25,7 @@ urlpatterns = [
     path('config-contexts/<int:pk>/', views.ConfigContextView.as_view(), name='configcontext'),
     path('config-contexts/<int:pk>/edit/', views.ConfigContextEditView.as_view(), name='configcontext_edit'),
     path('config-contexts/<int:pk>/delete/', views.ConfigContextDeleteView.as_view(), name='configcontext_delete'),
+    path('config-contexts/<int:pk>/changelog/', views.ObjectChangeLogView.as_view(), name='configcontext_changelog', kwargs={'model': ConfigContext}),
 
     # Image attachments
     path('image-attachments/<int:pk>/edit/', views.ImageAttachmentEditView.as_view(), name='imageattachment_edit'),
diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html
index 21e8cdab6..7dd8d8b0c 100644
--- a/netbox/templates/extras/configcontext.html
+++ b/netbox/templates/extras/configcontext.html
@@ -31,6 +31,16 @@
             </a>
         {% endif %}
     </div>
+    <ul class="nav nav-tabs">
+        <li role="presentation"{% if not active_tab %} class="active"{% endif %}>
+            <a href="{{ configcontext.get_absolute_url }}">Config Context</a>
+        </li>
+        {% if perms.extras.view_objectchange %}
+            <li role="presentation"{% if active_tab == 'changelog' %} class="active"{% endif %}>
+                <a href="{% url 'extras:configcontext_changelog' pk=configcontext.pk %}">Change Log</a>
+            </li>
+        {% endif %}
+    </ul>
     <h1>{% block title %}{{ configcontext }}{% endblock %}</h1>
 {% endblock %}
 

From 9f025747a77ad9438b144a64087b89e865d8f3c2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 10 Jul 2020 09:56:23 -0400
Subject: [PATCH 333/505] Tweak queryset for Service views to prefetch related
 IPs with unrestricted()

---
 netbox/ipam/views.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index b5abbe251..442da7882 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -809,7 +809,9 @@ class ServiceListView(ObjectListView):
 
 
 class ServiceView(ObjectView):
-    queryset = Service.objects.all()
+    queryset = Service.objects.prefetch_related(
+        Prefetch('ipaddresses', IPAddress.objects.unrestricted())
+    )
 
     def get(self, request, pk):
 
@@ -821,7 +823,9 @@ class ServiceView(ObjectView):
 
 
 class ServiceEditView(ObjectEditView):
-    queryset = Service.objects.all()
+    queryset = Service.objects.prefetch_related(
+        Prefetch('ipaddresses', IPAddress.objects.unrestricted())
+    )
     model_form = forms.ServiceForm
     template_name = 'ipam/service_edit.html'
 

From c8418fe5508bc6123dc8980bb7305877e15fc2a0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 10 Jul 2020 10:09:51 -0400
Subject: [PATCH 334/505] Fix RestrictedQuerySet evaluation for VLAN CSV export

---
 netbox/ipam/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 442da7882..8a9c647f0 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -720,7 +720,10 @@ class VLANGroupVLANsView(ObjectView):
 #
 
 class VLANListView(ObjectListView):
-    queryset = VLAN.objects.prefetch_related('site', 'group', 'tenant', 'role').prefetch_related('prefixes')
+    queryset = VLAN.objects.prefetch_related(
+        Prefetch('prefixes', Prefix.objects.unrestricted()),
+        'site', 'group', 'tenant', 'role'
+    )
     filterset = filters.VLANFilterSet
     filterset_form = forms.VLANFilterForm
     table = tables.VLANDetailTable

From b1686c2db9be016c44258a18de783073fc0b3f61 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 10 Jul 2020 10:26:43 -0400
Subject: [PATCH 335/505] Fix bulk editing, deletion of VM interfaces

---
 netbox/virtualization/forms.py  | 2 ++
 netbox/virtualization/tables.py | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index ce6eea1e8..26894fdd0 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -747,6 +747,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     )
     virtual_machine = forms.ModelChoiceField(
         queryset=VirtualMachine.objects.all(),
+        required=False,
+        disabled=True,
         widget=forms.HiddenInput()
     )
     enabled = forms.NullBooleanField(
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index d53572583..c1b927239 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 VIRTUALMACHINE_STATUS = """
@@ -147,6 +147,8 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 #
 
 class VMInterfaceTable(BaseTable):
+    pk = ToggleColumn()
+    enabled = BooleanColumn()
     virtual_machine = tables.LinkColumn()
     name = tables.Column(
         linkify=True
@@ -154,4 +156,5 @@ class VMInterfaceTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = VMInterface
-        fields = ('virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description')
+        fields = ('pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description')
+        default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'description')

From 96b3de7916a08d91183c81b1f541694f654f1e9b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 10 Jul 2020 10:27:07 -0400
Subject: [PATCH 336/505] Remove extraneous queryset filter

---
 netbox/virtualization/api/views.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index e3c3224e4..867413357 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -78,9 +78,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
 
 
 class VMInterfaceViewSet(ModelViewSet):
-    queryset = VMInterface.objects.filter(
-        virtual_machine__isnull=False
-    ).prefetch_related(
+    queryset = VMInterface.objects.prefetch_related(
         Prefetch('tagged_vlans', queryset=VLAN.objects.unrestricted()),
         'virtual_machine', 'tags'
     )

From f83ec7256f71339d3c8bc27a4090688a59594259 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 10 Jul 2020 13:01:02 -0400
Subject: [PATCH 337/505] Add model documentation for VM interfaces

---
 docs/core-functionality/virtualization.md | 1 +
 docs/models/virtualization/vminterface.md | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 docs/models/virtualization/vminterface.md

diff --git a/docs/core-functionality/virtualization.md b/docs/core-functionality/virtualization.md
index b2bab2b7d..58e71be58 100644
--- a/docs/core-functionality/virtualization.md
+++ b/docs/core-functionality/virtualization.md
@@ -7,3 +7,4 @@
 ---
 
 {!docs/models/virtualization/virtualmachine.md!}
+{!docs/models/virtualization/vminterface.md!}
diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md
new file mode 100644
index 000000000..97a944f9a
--- /dev/null
+++ b/docs/models/virtualization/vminterface.md
@@ -0,0 +1,3 @@
+## Interfaces
+
+Virtual machine interfaces are similar to device interfaces, but lack properties pertaining to physical attributes. For example, VM interfaces do not have a physical type and cannot have cables attached to them. However, they can have IP address and VLANs (both tagged and untagged) associated with them, just as device interfaces do.

From e53839ca2aa8f2fb3d9ccf603c3590a94359ed3e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 13:13:37 -0400
Subject: [PATCH 338/505] Add progress counter to VM interface replication
 migration

---
 .../migrations/0016_replicate_interfaces.py      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index e141dff04..a8960b101 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -4,6 +4,8 @@ from django.db import migrations
 
 
 def replicate_interfaces(apps, schema_editor):
+    show_output = 'test' not in sys.argv
+
     ContentType = apps.get_model('contenttypes', 'ContentType')
     TaggedItem = apps.get_model('extras', 'TaggedItem')
     Interface = apps.get_model('dcim', 'Interface')
@@ -15,7 +17,9 @@ def replicate_interfaces(apps, schema_editor):
 
     # Replicate dcim.Interface instances assigned to VirtualMachines
     original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
-    for interface in original_interfaces:
+    if show_output:
+        print(f"\n    Replicating {len(original_interfaces)} VM interfaces...", flush=True)
+    for i, interface in enumerate(original_interfaces, start=1):
         vminterface = VMInterface(
             virtual_machine=interface.virtual_machine,
             name=interface.name,
@@ -44,12 +48,16 @@ def replicate_interfaces(apps, schema_editor):
             assigned_object_id=vminterface.pk
         )
 
-    replicated_count = VMInterface.objects.count()
-    if 'test' not in sys.argv:
-        print(f"\n    Replicated {replicated_count} interfaces ", end='', flush=True)
+        # Progress counter
+        if show_output and not i % 250:
+            percentage = int(i / len(original_interfaces) * 100)
+            print(f"    {i}/{len(original_interfaces)} ({percentage}%)", flush=True)
 
     # Verify that all interfaces have been replicated
+    replicated_count = VMInterface.objects.count()
     assert replicated_count == original_interfaces.count(), "Replicated interfaces count does not match original count!"
+    if show_output:
+        print(f"\n    Replicated {replicated_count} interfaces ", end='', flush=True)
 
     # Delete all interfaces not assigned to a Device
     Interface.objects.filter(device__isnull=True).delete()

From 05aa008ce12b919c9cd0607e016a7fabc34e7f4c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 15:11:58 -0400
Subject: [PATCH 339/505] #2006: Prevent script/report execution if no RQ
 worker is running

---
 netbox/extras/api/views.py     | 12 +++++++++++-
 netbox/extras/views.py         | 21 +++++++++++++++------
 netbox/utilities/exceptions.py | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index e9e2b6c85..501182da5 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -3,11 +3,13 @@ from collections import OrderedDict
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count
 from django.http import Http404
+from django_rq.queues import get_connection
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
+from rq import Worker
 
 from extras import filters
 from extras.choices import JobResultStatusChoices
@@ -17,6 +19,7 @@ from extras.models import (
 from extras.reports import get_report, get_reports, run_report
 from extras.scripts import get_script, get_scripts, run_script
 from utilities.api import IsAuthenticatedOrLoginNotRequired, ModelViewSet
+from utilities.exceptions import RQWorkerNotRunningException
 from utilities.metadata import ContentTypeMetadata
 from utilities.utils import copy_safe_request
 from . import serializers
@@ -219,11 +222,14 @@ class ReportViewSet(ViewSet):
         """
         Run a Report identified as "<module>.<script>" and return the pending JobResult as the result
         """
-
         # Check that the user has permission to run reports.
         if not request.user.has_perm('extras.run_script'):
             raise PermissionDenied("This user does not have permission to run reports.")
 
+        # Check that at least one RQ worker is running
+        if not Worker.count(get_connection('default')):
+            raise RQWorkerNotRunningException()
+
         # Retrieve and run the Report. This will create a new JobResult.
         report = self._retrieve_report(pk)
         report_content_type = ContentType.objects.get(app_label='extras', model='report')
@@ -299,6 +305,10 @@ class ScriptViewSet(ViewSet):
         script = self._get_script(pk)()
         input_serializer = serializers.ScriptInputSerializer(data=request.data)
 
+        # Check that at least one RQ worker is running
+        if not Worker.count(get_connection('default')):
+            raise RQWorkerNotRunningException()
+
         if input_serializer.is_valid():
             data = input_serializer.data['data']
             commit = input_serializer.data['commit']
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 10e711064..b38b39cd6 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1,13 +1,14 @@
-import time
-
 from django import template
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Count, Prefetch, Q
 from django.http import Http404, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
 from django.views.generic import View
+from django_rq.queues import get_connection
 from django_tables2 import RequestConfig
+from rq import Worker
 
 from dcim.models import DeviceRole, Platform, Region, Site
 from tenancy.models import Tenant, TenantGroup
@@ -21,7 +22,7 @@ from utilities.views import (
 from virtualization.models import Cluster, ClusterGroup
 from . import filters, forms, tables
 from .choices import JobResultStatusChoices
-from .models import ConfigContext, ImageAttachment, ObjectChange, Report, JobResult, Script, Tag, TaggedItem
+from .models import ConfigContext, ImageAttachment, ObjectChange, JobResult, Tag
 from .reports import get_report, get_reports, run_report
 from .scripts import get_scripts, run_script
 
@@ -388,9 +389,13 @@ class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
             return HttpResponseForbidden()
 
         report = self._get_report(name, module)
-
         form = ConfirmationForm(request.POST)
-        if form.is_valid():
+
+        # Allow execution only if RQ worker process is running
+        if not Worker.count(get_connection('default')):
+            messages.error(request, "Unable to run report: RQ worker process not running.")
+
+        elif form.is_valid():
 
             # Run the Report. A new JobResult is created.
             report_content_type = ContentType.objects.get(app_label='extras', model='report')
@@ -504,7 +509,11 @@ class ScriptView(ContentTypePermissionRequiredMixin, GetScriptMixin, View):
         script = self._get_script(name, module)
         form = script.as_form(request.POST, request.FILES)
 
-        if form.is_valid():
+        # Allow execution only if RQ worker process is running
+        if not Worker.count(get_connection('default')):
+            messages.error(request, "Unable to run script: RQ worker process not running.")
+
+        elif form.is_valid():
             commit = form.cleaned_data.pop('_commit')
 
             script_content_type = ContentType.objects.get(app_label='extras', model='script')
diff --git a/netbox/utilities/exceptions.py b/netbox/utilities/exceptions.py
index 5032aacee..77a915d9c 100644
--- a/netbox/utilities/exceptions.py
+++ b/netbox/utilities/exceptions.py
@@ -1,5 +1,19 @@
+from rest_framework import status
+from rest_framework.exceptions import APIException
+
+
 class AbortTransaction(Exception):
     """
     A dummy exception used to trigger a database transaction rollback.
     """
     pass
+
+
+class RQWorkerNotRunningException(APIException):
+    """
+    Indicates the temporary inability to enqueue a new task (e.g. custom script execution) because no RQ worker
+    processes are currently running.
+    """
+    status_code = status.HTTP_503_SERVICE_UNAVAILABLE
+    default_detail = 'Unable to process request: RQ worker process not running.'
+    default_code = 'rq_worker_not_running'

From 9cece39ee98e8f43c03ab94987d0b93af2eaf449 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 15:26:06 -0400
Subject: [PATCH 340/505] Remove incorrect bulk edit test data

---
 netbox/virtualization/tests/test_views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index ec4159dd4..e35f977fd 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -255,7 +255,6 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase):
         )
 
         cls.bulk_edit_data = {
-            'virtual_machine': virtualmachines[1].pk,
             'enabled': False,
             'mtu': 2000,
             'description': 'New description',

From 013a2a35e0f613554fa812405ac498aa68be47f3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 15:43:54 -0400
Subject: [PATCH 341/505] Add cluster and virtual machine filters to VM
 interfaces list

---
 netbox/virtualization/filters.py | 11 +++++++++++
 netbox/virtualization/forms.py   | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 33ca44a22..4a9d9f1bf 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -206,6 +206,17 @@ class VMInterfaceFilterSet(BaseFilterSet):
         method='search',
         label='Search',
     )
+    cluster_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='virtual_machine__cluster',
+        queryset=Cluster.objects.unrestricted(),
+        label='Cluster (ID)',
+    )
+    cluster = django_filters.ModelMultipleChoiceFilter(
+        field_name='virtual_machine__cluster__name',
+        queryset=Cluster.objects.unrestricted(),
+        to_field_name='name',
+        label='Cluster',
+    )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine',
         queryset=VirtualMachine.objects.unrestricted(),
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 26894fdd0..d32b08ffa 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -821,6 +821,21 @@ class VMInterfaceBulkRenameForm(BulkRenameForm):
 
 class VMInterfaceFilterForm(forms.Form):
     model = VMInterface
+    cluster_id = DynamicModelMultipleChoiceField(
+        queryset=Cluster.objects.all(),
+        required=False,
+        label='Cluster',
+        widget=APISelectMultiple(
+            filter_for={
+                'virtual_machine_id': 'cluster_id'
+            }
+        )
+    )
+    virtual_machine_id = DynamicModelMultipleChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        required=False,
+        label='Virtual machine'
+    )
     enabled = forms.NullBooleanField(
         required=False,
         widget=StaticSelect2(

From 9f7ed25e740936d747e0dade2214516221dfe2cf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 16:18:17 -0400
Subject: [PATCH 342/505] Add assigned IP addresses and VLANs to interface
 tables

---
 netbox/dcim/tables.py           | 29 ++++++++++++++++++++++++++++-
 netbox/virtualization/tables.py |  9 ++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 028c658f7..823788292 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -109,6 +109,18 @@ POWERPANEL_POWERFEED_COUNT = """
 <a href="{% url 'dcim:powerfeed_list' %}?power_panel_id={{ record.pk }}">{{ value }}</a>
 """
 
+INTERFACE_IPADDRESSES = """
+{% for ip in record.ip_addresses.unrestricted %}
+    <a href="{{ ip.get_absolute_url }}">{{ ip }}</a><br />
+{% endfor %}
+"""
+
+INTERFACE_TAGGED_VLANS = """
+{% for vlan in record.tagged_vlans.unrestricted %}
+    <a href="{{ vlan.get_absolute_url }}">{{ vlan }}</a><br />
+{% endfor %}
+"""
+
 
 #
 # Regions
@@ -711,13 +723,28 @@ class PowerOutletTable(DeviceComponentTable):
         default_columns = ('pk', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description')
 
 
-class InterfaceTable(DeviceComponentTable):
+class BaseInterfaceTable(BaseTable):
     enabled = BooleanColumn()
+    ip_addresses = tables.TemplateColumn(
+        template_code=INTERFACE_IPADDRESSES,
+        orderable=False,
+        verbose_name='IP Addresses'
+    )
+    untagged_vlan = tables.Column(linkify=True)
+    tagged_vlans = tables.TemplateColumn(
+        template_code=INTERFACE_TAGGED_VLANS,
+        orderable=False,
+        verbose_name='Tagged VLANs'
+    )
+
+
+class InterfaceTable(DeviceComponentTable, BaseInterfaceTable):
 
     class Meta(DeviceComponentTable.Meta):
         model = Interface
         fields = (
             'pk', 'device', 'name', 'label', 'enabled', 'type', 'mgmt_only', 'mtu', 'mode', 'description', 'cable',
+            'ip_addresses', 'untagged_vlan', 'tagged_vlans',
         )
         default_columns = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description')
 
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index c1b927239..8289d9758 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -1,6 +1,7 @@
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
+from dcim.tables import BaseInterfaceTable
 from tenancy.tables import COL_TENANT
 from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -146,9 +147,8 @@ class VirtualMachineDetailTable(VirtualMachineTable):
 # VM components
 #
 
-class VMInterfaceTable(BaseTable):
+class VMInterfaceTable(BaseInterfaceTable):
     pk = ToggleColumn()
-    enabled = BooleanColumn()
     virtual_machine = tables.LinkColumn()
     name = tables.Column(
         linkify=True
@@ -156,5 +156,8 @@ class VMInterfaceTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = VMInterface
-        fields = ('pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description')
+        fields = (
+            'pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'ip_addresses',
+            'untagged_vlan', 'tagged_vlans',
+        )
         default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'description')

From d5a5a4a8d172a2c89ba67fc70e276c83493d7e39 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 16:48:44 -0400
Subject: [PATCH 343/505] Skip report/script execution tests if RQ worker is
 not running

---
 netbox/extras/tests/test_api.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index f6b7811cd..fccb03665 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -1,9 +1,12 @@
 import datetime
+from unittest import skipIf
 
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from django.utils import timezone
+from django_rq.queues import get_connection
 from rest_framework import status
+from rq import Worker
 
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Rack, RackGroup, RackRole, Site
 from extras.api.views import ReportViewSet, ScriptViewSet
@@ -13,6 +16,9 @@ from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from utilities.testing import APITestCase, APIViewTestCases
 
 
+rq_worker_running = Worker.count(get_connection('default'))
+
+
 class AppTest(APITestCase):
 
     def test_root(self):
@@ -230,6 +236,7 @@ class ReportTest(APITestCase):
 
         self.assertEqual(response.data['name'], self.TestReport.__name__)
 
+    @skipIf(not rq_worker_running, "RQ worker not running")
     def test_run_report(self):
         self.add_permissions('extras.run_script')
 
@@ -279,6 +286,7 @@ class ScriptTest(APITestCase):
         self.assertEqual(response.data['vars']['var2'], 'IntegerVar')
         self.assertEqual(response.data['vars']['var3'], 'BooleanVar')
 
+    @skipIf(not rq_worker_running, "RQ worker not running")
     def test_run_script(self):
 
         script_data = {

From d47ea04ec4e9647064abd8414b5d2a6a1cb929a1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 13 Jul 2020 16:59:46 -0400
Subject: [PATCH 344/505] Add "add interfaces" button to virtual machine view

---
 netbox/templates/virtualization/virtualmachine.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 9cc206dac..ea33aa460 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -29,6 +29,11 @@
         </div>
     </div>
     <div class="pull-right noprint">
+        {% if perms.virtualization.add_vminterface %}
+            <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add Interfaces
+            </a>
+        {% endif %}
         {% plugin_buttons virtualmachine %}
         {% if perms.virtualization.add_virtualmachine %}
             {% clone_button virtualmachine %}

From 49c6bee6d7ad87182fc9a5cfaafd38a29f334179 Mon Sep 17 00:00:00 2001
From: Glenn Matthews <glenn.matthews@networktocode.com>
Date: Tue, 14 Jul 2020 09:45:36 -0400
Subject: [PATCH 345/505] Fix jobresult success label spelling

---
 netbox/extras/choices.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index fe5c74fa5..033de708d 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -127,7 +127,7 @@ class TemplateLanguageChoices(ChoiceSet):
 class LogLevelChoices(ChoiceSet):
 
     LOG_DEFAULT = 'default'
-    LOG_SUCCESS = 'sucess'
+    LOG_SUCCESS = 'success'
     LOG_INFO = 'info'
     LOG_WARNING = 'warning'
     LOG_FAILURE = 'failure'

From 81ed03575dff1650bc1ee1d3938d152429bb22af Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 14 Jul 2020 11:08:59 -0400
Subject: [PATCH 346/505] Rename BulkCreateObjectsViewTestCase to
 CreateMultipleObjectsViewTestCase

---
 netbox/utilities/testing/views.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 33d239c54..c3010ad9c 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -577,7 +577,7 @@ class ViewTestCases:
                 self.assertIn(instance1.get_absolute_url(), content)
                 self.assertNotIn(instance2.get_absolute_url(), content)
 
-    class BulkCreateObjectsViewTestCase(ModelViewTestCase):
+    class CreateMultipleObjectsViewTestCase(ModelViewTestCase):
         """
         Create multiple instances using a single form. Expects the creation of three new instances by default.
 
@@ -588,7 +588,7 @@ class ViewTestCases:
         bulk_create_data = {}
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_create_objects_without_permission(self):
+        def test_create_multiple_objects_without_permission(self):
             request = {
                 'path': self._get_url('add'),
                 'data': post_data(self.bulk_create_data),
@@ -599,7 +599,7 @@ class ViewTestCases:
                 self.assertHttpStatus(self.client.post(**request), 403)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_create_objects_with_permission(self):
+        def test_create_multiple_objects_with_permission(self):
             initial_count = self._get_queryset().count()
             request = {
                 'path': self._get_url('add'),
@@ -622,7 +622,7 @@ class ViewTestCases:
                 self.assertInstanceEqual(instance, self.bulk_create_data)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
-        def test_bulk_create_objects_with_constrained_permission(self):
+        def test_create_multiple_objects_with_constrained_permission(self):
             initial_count = self._get_queryset().count()
             request = {
                 'path': self._get_url('add'),
@@ -919,7 +919,7 @@ class ViewTestCases:
     class DeviceComponentTemplateViewTestCase(
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
-        BulkCreateObjectsViewTestCase,
+        CreateMultipleObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):
@@ -934,7 +934,7 @@ class ViewTestCases:
         EditObjectViewTestCase,
         DeleteObjectViewTestCase,
         ListObjectsViewTestCase,
-        BulkCreateObjectsViewTestCase,
+        CreateMultipleObjectsViewTestCase,
         BulkImportObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,

From 4458ce69df7fdee1ba8958e6936a214ac7a6806a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 14 Jul 2020 13:18:22 -0400
Subject: [PATCH 347/505] Enforce constrained permissions when bulk renaming
 objects

---
 netbox/utilities/views.py | 55 +++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index ccb3c65ff..b773ee63b 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1054,33 +1054,48 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         return get_permission_for_model(self.queryset.model, 'change')
 
     def post(self, request):
+        logger = logging.getLogger('netbox.views.BulkRenameView')
 
         if '_preview' in request.POST or '_apply' in request.POST:
             form = self.form(request.POST, initial={'pk': request.POST.getlist('pk')})
             selected_objects = self.queryset.filter(pk__in=form.initial['pk'])
 
             if form.is_valid():
-                for obj in selected_objects:
-                    find = form.cleaned_data['find']
-                    replace = form.cleaned_data['replace']
-                    if form.cleaned_data['use_regex']:
-                        try:
-                            obj.new_name = re.sub(find, replace, obj.name)
-                        # Catch regex group reference errors
-                        except re.error:
-                            obj.new_name = obj.name
-                    else:
-                        obj.new_name = obj.name.replace(find, replace)
+                try:
+                    with transaction.atomic():
+                        renamed_pks = []
+                        for obj in selected_objects:
+                            find = form.cleaned_data['find']
+                            replace = form.cleaned_data['replace']
+                            if form.cleaned_data['use_regex']:
+                                try:
+                                    obj.new_name = re.sub(find, replace, obj.name)
+                                # Catch regex group reference errors
+                                except re.error:
+                                    obj.new_name = obj.name
+                            else:
+                                obj.new_name = obj.name.replace(find, replace)
+                            renamed_pks.append(obj.pk)
 
-                if '_apply' in request.POST:
-                    for obj in selected_objects:
-                        obj.name = obj.new_name
-                        obj.save()
-                    messages.success(request, "Renamed {} {}".format(
-                        len(selected_objects),
-                        self.queryset.model._meta.verbose_name_plural
-                    ))
-                    return redirect(self.get_return_url(request))
+                        if '_apply' in request.POST:
+                            for obj in selected_objects:
+                                obj.name = obj.new_name
+                                obj.save()
+
+                            # Enforce constrained permissions
+                            if self.queryset.filter(pk__in=renamed_pks).count() != len(selected_objects):
+                                raise ObjectDoesNotExist
+
+                            messages.success(request, "Renamed {} {}".format(
+                                len(selected_objects),
+                                self.queryset.model._meta.verbose_name_plural
+                            ))
+                            return redirect(self.get_return_url(request))
+
+                except ObjectDoesNotExist:
+                    msg = "Object update failed due to object-level permissions violation"
+                    logger.debug(msg)
+                    form.add_error(None, msg)
 
         else:
             form = self.form(initial={'pk': request.POST.getlist('pk')})

From cf0e31ac0ff4047f197a710e32d4aa26e4c73872 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 14 Jul 2020 13:19:00 -0400
Subject: [PATCH 348/505] Introduce BulkRenameObjectsViewTestCase

---
 netbox/utilities/testing/views.py | 83 +++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index c3010ad9c..6913d6107 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -886,6 +886,87 @@ class ViewTestCases:
             self.assertHttpStatus(self.client.post(self._get_url('bulk_delete'), data), 302)
             self.assertEqual(self._get_queryset().count(), 0)
 
+    class BulkRenameObjectsViewTestCase(ModelViewTestCase):
+        """
+        Rename multiple instances.
+        """
+        rename_data = {
+            'find': '(.*)',
+            'replace': '\\1X',  # Append an X to the original value
+            'use_regex': True,
+        }
+
+        def test_bulk_rename_objects_without_permission(self):
+            pk_list = self._get_queryset().values_list('pk', flat=True)[:3]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
+            data.update(self.rename_data)
+
+            # Test GET without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.get(self._get_url('bulk_rename')), 403)
+
+            # Try POST without permission
+            with disable_warnings('django.request'):
+                self.assertHttpStatus(self.client.post(self._get_url('bulk_rename'), data), 403)
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_bulk_rename_objects_with_permission(self):
+            objects = self._get_queryset().all()[:3]
+            pk_list = [obj.pk for obj in objects]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
+            data.update(self.rename_data)
+
+            # Assign model-level permission
+            obj_perm = ObjectPermission(
+                actions=['change']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            # Try POST with model-level permission
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_rename'), data), 302)
+            for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)):
+                self.assertEqual(instance.name, f'{objects[i].name}X')
+
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        def test_bulk_rename_objects_with_constrained_permission(self):
+            objects = self._get_queryset().all()[:3]
+            pk_list = [obj.pk for obj in objects]
+            data = {
+                'pk': pk_list,
+                '_apply': True,  # Form button
+            }
+            data.update(self.rename_data)
+
+            # Assign constrained permission
+            obj_perm = ObjectPermission(
+                constraints={'name__regex': '[^X]$'},
+                actions=['change']
+            )
+            obj_perm.save()
+            obj_perm.users.add(self.user)
+            obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
+
+            # Attempt to bulk edit permitted objects into a non-permitted state
+            response = self.client.post(self._get_url('bulk_rename'), data)
+            self.assertHttpStatus(response, 200)
+
+            # Update permission constraints
+            obj_perm.constraints = {'pk__gt': 0}
+            obj_perm.save()
+
+            # Bulk rename permitted objects
+            self.assertHttpStatus(self.client.post(self._get_url('bulk_rename'), data), 302)
+            for i, instance in enumerate(self._get_queryset().filter(pk__in=pk_list)):
+                self.assertEqual(instance.name, f'{objects[i].name}X')
+
     class PrimaryObjectViewTestCase(
         GetObjectViewTestCase,
         GetObjectChangelogViewTestCase,
@@ -921,6 +1002,7 @@ class ViewTestCases:
         DeleteObjectViewTestCase,
         CreateMultipleObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
+        BulkRenameObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):
         """
@@ -937,6 +1019,7 @@ class ViewTestCases:
         CreateMultipleObjectsViewTestCase,
         BulkImportObjectsViewTestCase,
         BulkEditObjectsViewTestCase,
+        BulkRenameObjectsViewTestCase,
         BulkDeleteObjectsViewTestCase,
     ):
         """

From 04d8ab37929dcba322398234fd16983759104beb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 14 Jul 2020 15:51:13 -0400
Subject: [PATCH 349/505] Clean up device component creation forms

---
 netbox/dcim/forms.py | 140 +++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 79 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index b0c6f15d9..47b19f267 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -135,7 +135,8 @@ class ComponentForm(BootstrapMixin, forms.Form):
     )
     label_pattern = ExpandableNameField(
         label='Label',
-        required=False
+        required=False,
+        help_text='Alphanumeric ranges are supported. (Must match the number of names being created.)'
     )
 
     def clean(self):
@@ -1034,7 +1035,7 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm):
 
 class ComponentTemplateCreateForm(ComponentForm):
     """
-    Base form for the creation of device component templates.
+    Base form for the creation of device component templates (subclassed from ComponentTemplateModel).
     """
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
@@ -1073,6 +1074,7 @@ class ConsolePortTemplateCreateForm(ComponentTemplateCreateForm):
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
+    field_order = ('manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'description')
 
 
 class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -1111,6 +1113,7 @@ class ConsoleServerPortTemplateCreateForm(ComponentTemplateCreateForm):
         choices=add_blank_choice(ConsolePortTypeChoices),
         widget=StaticSelect2()
     )
+    field_order = ('manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'description')
 
 
 class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -1162,6 +1165,10 @@ class PowerPortTemplateCreateForm(ComponentTemplateCreateForm):
         required=False,
         help_text="Allocated power draw (watts)"
     )
+    field_order = (
+        'manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'maximum_draw', 'allocated_draw',
+        'description',
+    )
 
 
 class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -1232,6 +1239,10 @@ class PowerOutletTemplateCreateForm(ComponentTemplateCreateForm):
         required=False,
         widget=StaticSelect2()
     )
+    field_order = (
+        'manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'power_port', 'feed_leg',
+        'description',
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1315,6 +1326,7 @@ class InterfaceTemplateCreateForm(ComponentTemplateCreateForm):
         required=False,
         label='Management only'
     )
+    field_order = ('manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'mgmt_only', 'description')
 
 
 class InterfaceTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -1377,6 +1389,9 @@ class FrontPortTemplateCreateForm(ComponentTemplateCreateForm):
         label='Rear ports',
         help_text='Select one rear port assignment for each front port being created.',
     )
+    field_order = (
+        'manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'rear_port_set', 'description',
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1470,6 +1485,7 @@ class RearPortTemplateCreateForm(ComponentTemplateCreateForm):
         initial=1,
         help_text='The number of front ports which may be mapped to each rear port'
     )
+    field_order = ('manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'type', 'positions', 'description')
 
 
 class RearPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -1507,9 +1523,7 @@ class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
 
 
 class DeviceBayTemplateCreateForm(ComponentTemplateCreateForm):
-    description = forms.CharField(
-        required=False
-    )
+    field_order = ('manufacturer', 'device_type', 'name_pattern', 'label_pattern', 'description')
 
 
 class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
@@ -2257,11 +2271,15 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
 
 class ComponentCreateForm(ComponentForm):
     """
-    Base form for the creation of device components.
+    Base form for the creation of device components (models subclassed from ComponentModel).
     """
     device = DynamicModelChoiceField(
         queryset=Device.objects.all()
     )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False
@@ -2273,6 +2291,10 @@ class DeviceBulkAddComponentForm(ComponentForm):
         queryset=Device.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    description = forms.CharField(
+        max_length=100,
+        required=False
+    )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False
@@ -2316,21 +2338,14 @@ class ConsolePortCreateForm(ComponentCreateForm):
         required=False,
         widget=StaticSelect2()
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
+    field_order = ('device', 'name_pattern', 'label_pattern', 'type', 'description', 'tags')
 
 
 class ConsolePortBulkCreateForm(
-    form_from_model(ConsolePort, ['label', 'type', 'description', 'tags']),
+    form_from_model(ConsolePort, ['type']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'description', 'tags')
 
 
 class ConsolePortBulkEditForm(
@@ -2396,21 +2411,14 @@ class ConsoleServerPortCreateForm(ComponentCreateForm):
         required=False,
         widget=StaticSelect2()
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
+    field_order = ('device', 'name_pattern', 'label_pattern', 'type', 'description', 'tags')
 
 
 class ConsoleServerPortBulkCreateForm(
-    form_from_model(ConsoleServerPort, ['label', 'type', 'description', 'tags']),
+    form_from_model(ConsoleServerPort, ['type']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'description', 'tags')
 
 
 class ConsoleServerPortBulkEditForm(
@@ -2486,21 +2494,16 @@ class PowerPortCreateForm(ComponentCreateForm):
         required=False,
         help_text="Allocated draw in watts"
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
+    field_order = (
+        'device', 'name_pattern', 'label_pattern', 'type', 'maximum_draw', 'allocated_draw', 'description', 'tags',
     )
 
 
 class PowerPortBulkCreateForm(
-    form_from_model(PowerPort, ['label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'tags']),
+    form_from_model(PowerPort, ['type', 'maximum_draw', 'allocated_draw']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'maximum_draw', 'allocated_draw', 'description', 'tags')
 
 
 class PowerPortBulkEditForm(
@@ -2587,14 +2590,7 @@ class PowerOutletCreateForm(ComponentCreateForm):
         choices=add_blank_choice(PowerOutletFeedLegChoices),
         required=False
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
+    field_order = ('device', 'name_pattern', 'label_pattern', 'type', 'power_port', 'feed_leg', 'description', 'tags')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -2607,10 +2603,10 @@ class PowerOutletCreateForm(ComponentCreateForm):
 
 
 class PowerOutletBulkCreateForm(
-    form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'description', 'tags']),
+    form_from_model(PowerOutlet, ['type', 'feed_leg']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'feed_leg', 'description', 'tags')
 
 
 class PowerOutletBulkEditForm(
@@ -2808,19 +2804,11 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
         label='Management only',
         help_text='This interface is used only for out-of-band management'
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
-    )
     mode = forms.ChoiceField(
         choices=add_blank_choice(InterfaceModeChoices),
         required=False,
         widget=StaticSelect2(),
     )
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
@@ -2843,6 +2831,10 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
             },
         )
     )
+    field_order = (
+        'device', 'name_pattern', 'label_pattern', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'description',
+        'mgmt_only', 'mode', 'untagged_vlan', 'tagged_vlans', 'tags'
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -2862,10 +2854,10 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
 
 
 class InterfaceBulkCreateForm(
-    form_from_model(Interface, ['label', 'type', 'enabled', 'mtu', 'mgmt_only', 'description']),
+    form_from_model(Interface, ['type', 'enabled', 'mtu', 'mgmt_only']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'enabled', 'mtu', 'mgmt_only', 'description', 'tags')
 
 
 class InterfaceBulkEditForm(
@@ -3048,9 +3040,7 @@ class FrontPortCreateForm(ComponentCreateForm):
         label='Rear ports',
         help_text='Select one rear port assignment for each front port being created.',
     )
-    description = forms.CharField(
-        required=False
-    )
+    field_order = ('device', 'name_pattern', 'label_pattern', 'type', 'rear_port_set', 'description', 'tags')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -3208,16 +3198,14 @@ class RearPortCreateForm(ComponentCreateForm):
         initial=1,
         help_text='The number of front ports which may be mapped to each rear port'
     )
-    description = forms.CharField(
-        required=False
-    )
+    field_order = ('device', 'name_pattern', 'label_pattern', 'type', 'positions', 'description', 'tags')
 
 
 class RearPortBulkCreateForm(
-    form_from_model(RearPort, ['label', 'type', 'positions', 'description', 'tags']),
+    form_from_model(RearPort, ['type', 'positions']),
     DeviceBulkAddComponentForm
 ):
-    pass
+    field_order = ('name_pattern', 'label_pattern', 'type', 'positions', 'description', 'tags')
 
 
 class RearPortBulkEditForm(
@@ -3279,7 +3267,7 @@ class DeviceBayForm(BootstrapMixin, forms.ModelForm):
 
 
 class DeviceBayCreateForm(ComponentCreateForm):
-    pass
+    field_order = ('device', 'name_pattern', 'label_pattern', 'description', 'tags')
 
 
 class PopulateDeviceBayForm(BootstrapMixin, forms.Form):
@@ -3303,14 +3291,8 @@ class PopulateDeviceBayForm(BootstrapMixin, forms.Form):
         ).exclude(pk=device_bay.device.pk)
 
 
-class DeviceBayBulkCreateForm(
-    form_from_model(DeviceBay, ['label', 'description', 'tags']),
-    DeviceBulkAddComponentForm
-):
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
-    )
+class DeviceBayBulkCreateForm(DeviceBulkAddComponentForm):
+    field_order = ('name_pattern', 'label_pattern', 'description', 'tags')
 
 
 class DeviceBayBulkEditForm(
@@ -3416,9 +3398,9 @@ class InventoryItemCreateForm(ComponentCreateForm):
         max_length=50,
         required=False,
     )
-    description = forms.CharField(
-        max_length=100,
-        required=False
+    field_order = (
+        'device', 'name_pattern', 'label_pattern', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description',
+        'tags',
     )
 
 
@@ -3439,12 +3421,12 @@ class InventoryItemCSVForm(CSVModelForm):
 
 
 class InventoryItemBulkCreateForm(
-    form_from_model(InventoryItem, ['label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'tags']),
+    form_from_model(InventoryItem, ['manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered']),
     DeviceBulkAddComponentForm
 ):
-    tags = DynamicModelMultipleChoiceField(
-        queryset=Tag.objects.all(),
-        required=False
+    field_order = (
+        'name_pattern', 'label_pattern', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description',
+        'tags',
     )
 
 

From 1291fc41870b5fc4f131d4e92f5583715c656f9c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 14 Jul 2020 16:31:55 -0400
Subject: [PATCH 350/505] Add missing changelog view tests

---
 netbox/dcim/tests/test_views.py    | 2 ++
 netbox/ipam/tests/test_views.py    | 1 +
 netbox/secrets/tests/test_views.py | 1 +
 3 files changed, 4 insertions(+)

diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index ef7ff993f..066ea1b02 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -333,6 +333,7 @@ class ManufacturerTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 # Blocked by absence of bulk import view for DeviceTypes
 class DeviceTypeTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.CreateObjectViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
@@ -1479,6 +1480,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase):
 # Blocked by lack of common creation view for cables (termination A must be initialized)
 class CableTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index eb7f05e8f..35bae013a 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -353,6 +353,7 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 # Blocked by absence of standard creation view
 class ServiceTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.EditObjectViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index d88c02e15..ea8e6ed48 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -40,6 +40,7 @@ class SecretRoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
 # TODO: Change base class to PrimaryObjectViewTestCase
 class SecretTestCase(
     ViewTestCases.GetObjectViewTestCase,
+    ViewTestCases.GetObjectChangelogViewTestCase,
     ViewTestCases.DeleteObjectViewTestCase,
     ViewTestCases.ListObjectsViewTestCase,
     ViewTestCases.BulkEditObjectsViewTestCase,

From d8b0a11a496e405c0e1e198477b65e6f630f0222 Mon Sep 17 00:00:00 2001
From: Glenn Matthews <glenn.matthews@networktocode.com>
Date: Tue, 14 Jul 2020 10:54:32 -0400
Subject: [PATCH 351/505] Save JobResult even for a script run with
 commit=False

---
 netbox/extras/scripts.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index dd096c392..fd349dfeb 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -415,8 +415,6 @@ def run_script(data, request, commit=True, *args, **kwargs):
     try:
         with transaction.atomic():
             script.output = script.run(**kwargs)
-            job_result.data = ScriptOutputSerializer(script).data
-            job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
 
             if not commit:
                 raise AbortTransaction()
@@ -434,6 +432,10 @@ def run_script(data, request, commit=True, *args, **kwargs):
         job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
 
     finally:
+        if job_result.status != JobResultStatusChoices.STATUS_ERRORED:
+            job_result.data = ScriptOutputSerializer(script).data
+            job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
+
         if not commit:
             # Delete all pending changelog entries
             purge_changelog.send(Script)

From 7461e766060d198cc3bb5d9031510ac37c4f8e61 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 15 Jul 2020 16:19:30 -0400
Subject: [PATCH 352/505] Fix regex for Python 3.7

---
 netbox/utilities/testing/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 6913d6107..98bc8ff02 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -891,7 +891,7 @@ class ViewTestCases:
         Rename multiple instances.
         """
         rename_data = {
-            'find': '(.*)',
+            'find': '^(.*)$',
             'replace': '\\1X',  # Append an X to the original value
             'use_regex': True,
         }

From 19d0d6ff10e9372d8f81e1e079f15d48e19f6150 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 15 Jul 2020 16:54:33 -0400
Subject: [PATCH 353/505] Closes #4857: Drop support for legacy numeric choice
 field values

---
 docs/release-notes/version-2.9.md      |   1 +
 netbox/circuits/choices.py             |   9 --
 netbox/dcim/choices.py                 | 205 -------------------------
 netbox/extras/choices.py               |  34 ----
 netbox/ipam/choices.py                 |  36 -----
 netbox/utilities/api.py                |  15 +-
 netbox/utilities/choices.py            |  20 ---
 netbox/utilities/tests/test_choices.py |  15 +-
 netbox/virtualization/choices.py       |   6 -
 9 files changed, 4 insertions(+), 337 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index dc9139986..944badaf3 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -55,6 +55,7 @@ When running a report or custom script, the task is now queued for background pr
 * extras.Script: Added `module` and `result` fields. The `result` field now conveys the nested representation of a JobResult.
 * A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
 * A `_depth` field has been added to all objects which feature a self-recursive hierarchy (namely regions, rack groups, and tenant groups).
+* Legacy numeric values for choice fields are no longer conveyed or accepted.
 
 ### Other Changes
 
diff --git a/netbox/circuits/choices.py b/netbox/circuits/choices.py
index 94a765d11..1b5e69cb5 100644
--- a/netbox/circuits/choices.py
+++ b/netbox/circuits/choices.py
@@ -23,15 +23,6 @@ class CircuitStatusChoices(ChoiceSet):
         (STATUS_DECOMMISSIONED, 'Decommissioned'),
     )
 
-    LEGACY_MAP = {
-        STATUS_DEPROVISIONING: 0,
-        STATUS_ACTIVE: 1,
-        STATUS_PLANNED: 2,
-        STATUS_PROVISIONING: 3,
-        STATUS_OFFLINE: 4,
-        STATUS_DECOMMISSIONED: 5,
-    }
-
 
 #
 # CircuitTerminations
diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index 59f30a206..276d6bd27 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -17,12 +17,6 @@ class SiteStatusChoices(ChoiceSet):
         (STATUS_RETIRED, 'Retired'),
     )
 
-    LEGACY_MAP = {
-        STATUS_ACTIVE: 1,
-        STATUS_PLANNED: 2,
-        STATUS_RETIRED: 4,
-    }
-
 
 #
 # Racks
@@ -44,14 +38,6 @@ class RackTypeChoices(ChoiceSet):
         (TYPE_WALLCABINET, 'Wall-mounted cabinet'),
     )
 
-    LEGACY_MAP = {
-        TYPE_2POST: 100,
-        TYPE_4POST: 200,
-        TYPE_CABINET: 300,
-        TYPE_WALLFRAME: 1000,
-        TYPE_WALLCABINET: 1100,
-    }
-
 
 class RackWidthChoices(ChoiceSet):
 
@@ -84,14 +70,6 @@ class RackStatusChoices(ChoiceSet):
         (STATUS_DEPRECATED, 'Deprecated'),
     )
 
-    LEGACY_MAP = {
-        STATUS_RESERVED: 0,
-        STATUS_AVAILABLE: 1,
-        STATUS_PLANNED: 2,
-        STATUS_ACTIVE: 3,
-        STATUS_DEPRECATED: 4,
-    }
-
 
 class RackDimensionUnitChoices(ChoiceSet):
 
@@ -103,11 +81,6 @@ class RackDimensionUnitChoices(ChoiceSet):
         (UNIT_INCH, 'Inches'),
     )
 
-    LEGACY_MAP = {
-        UNIT_MILLIMETER: 1000,
-        UNIT_INCH: 2000,
-    }
-
 
 class RackElevationDetailRenderChoices(ChoiceSet):
 
@@ -134,11 +107,6 @@ class SubdeviceRoleChoices(ChoiceSet):
         (ROLE_CHILD, 'Child'),
     )
 
-    LEGACY_MAP = {
-        ROLE_PARENT: True,
-        ROLE_CHILD: False,
-    }
-
 
 #
 # Devices
@@ -154,11 +122,6 @@ class DeviceFaceChoices(ChoiceSet):
         (FACE_REAR, 'Rear'),
     )
 
-    LEGACY_MAP = {
-        FACE_FRONT: 0,
-        FACE_REAR: 1,
-    }
-
 
 class DeviceStatusChoices(ChoiceSet):
 
@@ -180,16 +143,6 @@ class DeviceStatusChoices(ChoiceSet):
         (STATUS_DECOMMISSIONING, 'Decommissioning'),
     )
 
-    LEGACY_MAP = {
-        STATUS_OFFLINE: 0,
-        STATUS_ACTIVE: 1,
-        STATUS_PLANNED: 2,
-        STATUS_STAGED: 3,
-        STATUS_FAILED: 4,
-        STATUS_INVENTORY: 5,
-        STATUS_DECOMMISSIONING: 6,
-    }
-
 
 #
 # ConsolePorts
@@ -571,12 +524,6 @@ class PowerOutletFeedLegChoices(ChoiceSet):
         (FEED_LEG_C, 'C'),
     )
 
-    LEGACY_MAP = {
-        FEED_LEG_A: 1,
-        FEED_LEG_B: 2,
-        FEED_LEG_C: 3,
-    }
-
 
 #
 # Interfaces
@@ -806,80 +753,6 @@ class InterfaceTypeChoices(ChoiceSet):
         ),
     )
 
-    LEGACY_MAP = {
-        TYPE_VIRTUAL: 0,
-        TYPE_LAG: 200,
-        TYPE_100ME_FIXED: 800,
-        TYPE_1GE_FIXED: 1000,
-        TYPE_1GE_GBIC: 1050,
-        TYPE_1GE_SFP: 1100,
-        TYPE_2GE_FIXED: 1120,
-        TYPE_5GE_FIXED: 1130,
-        TYPE_10GE_FIXED: 1150,
-        TYPE_10GE_CX4: 1170,
-        TYPE_10GE_SFP_PLUS: 1200,
-        TYPE_10GE_XFP: 1300,
-        TYPE_10GE_XENPAK: 1310,
-        TYPE_10GE_X2: 1320,
-        TYPE_25GE_SFP28: 1350,
-        TYPE_40GE_QSFP_PLUS: 1400,
-        TYPE_50GE_QSFP28: 1420,
-        TYPE_100GE_CFP: 1500,
-        TYPE_100GE_CFP2: 1510,
-        TYPE_100GE_CFP4: 1520,
-        TYPE_100GE_CPAK: 1550,
-        TYPE_100GE_QSFP28: 1600,
-        TYPE_200GE_CFP2: 1650,
-        TYPE_200GE_QSFP56: 1700,
-        TYPE_400GE_QSFP_DD: 1750,
-        TYPE_400GE_OSFP: 1800,
-        TYPE_80211A: 2600,
-        TYPE_80211G: 2610,
-        TYPE_80211N: 2620,
-        TYPE_80211AC: 2630,
-        TYPE_80211AD: 2640,
-        TYPE_GSM: 2810,
-        TYPE_CDMA: 2820,
-        TYPE_LTE: 2830,
-        TYPE_SONET_OC3: 6100,
-        TYPE_SONET_OC12: 6200,
-        TYPE_SONET_OC48: 6300,
-        TYPE_SONET_OC192: 6400,
-        TYPE_SONET_OC768: 6500,
-        TYPE_SONET_OC1920: 6600,
-        TYPE_SONET_OC3840: 6700,
-        TYPE_1GFC_SFP: 3010,
-        TYPE_2GFC_SFP: 3020,
-        TYPE_4GFC_SFP: 3040,
-        TYPE_8GFC_SFP_PLUS: 3080,
-        TYPE_16GFC_SFP_PLUS: 3160,
-        TYPE_32GFC_SFP28: 3320,
-        TYPE_128GFC_QSFP28: 3400,
-        TYPE_INFINIBAND_SDR: 7010,
-        TYPE_INFINIBAND_DDR: 7020,
-        TYPE_INFINIBAND_QDR: 7030,
-        TYPE_INFINIBAND_FDR10: 7040,
-        TYPE_INFINIBAND_FDR: 7050,
-        TYPE_INFINIBAND_EDR: 7060,
-        TYPE_INFINIBAND_HDR: 7070,
-        TYPE_INFINIBAND_NDR: 7080,
-        TYPE_INFINIBAND_XDR: 7090,
-        TYPE_T1: 4000,
-        TYPE_E1: 4010,
-        TYPE_T3: 4040,
-        TYPE_E3: 4050,
-        TYPE_STACKWISE: 5000,
-        TYPE_STACKWISE_PLUS: 5050,
-        TYPE_FLEXSTACK: 5100,
-        TYPE_FLEXSTACK_PLUS: 5150,
-        TYPE_JUNIPER_VCP: 5200,
-        TYPE_SUMMITSTACK: 5300,
-        TYPE_SUMMITSTACK128: 5310,
-        TYPE_SUMMITSTACK256: 5320,
-        TYPE_SUMMITSTACK512: 5330,
-        TYPE_OTHER: 32767,
-    }
-
 
 class InterfaceModeChoices(ChoiceSet):
 
@@ -893,12 +766,6 @@ class InterfaceModeChoices(ChoiceSet):
         (MODE_TAGGED_ALL, 'Tagged (All)'),
     )
 
-    LEGACY_MAP = {
-        MODE_ACCESS: 100,
-        MODE_TAGGED: 200,
-        MODE_TAGGED_ALL: 300,
-    }
-
 
 #
 # FrontPorts/RearPorts
@@ -948,22 +815,6 @@ class PortTypeChoices(ChoiceSet):
         )
     )
 
-    LEGACY_MAP = {
-        TYPE_8P8C: 1000,
-        TYPE_110_PUNCH: 1100,
-        TYPE_BNC: 1200,
-        TYPE_ST: 2000,
-        TYPE_SC: 2100,
-        TYPE_SC_APC: 2110,
-        TYPE_FC: 2200,
-        TYPE_LC: 2300,
-        TYPE_LC_APC: 2310,
-        TYPE_MTRJ: 2400,
-        TYPE_MPO: 2500,
-        TYPE_LSH: 2600,
-        TYPE_LSH_APC: 2610,
-    }
-
 
 #
 # Cables
@@ -1023,28 +874,6 @@ class CableTypeChoices(ChoiceSet):
         (TYPE_POWER, 'Power'),
     )
 
-    LEGACY_MAP = {
-        TYPE_CAT3: 1300,
-        TYPE_CAT5: 1500,
-        TYPE_CAT5E: 1510,
-        TYPE_CAT6: 1600,
-        TYPE_CAT6A: 1610,
-        TYPE_CAT7: 1700,
-        TYPE_DAC_ACTIVE: 1800,
-        TYPE_DAC_PASSIVE: 1810,
-        TYPE_COAXIAL: 1900,
-        TYPE_MMF: 3000,
-        TYPE_MMF_OM1: 3010,
-        TYPE_MMF_OM2: 3020,
-        TYPE_MMF_OM3: 3030,
-        TYPE_MMF_OM4: 3040,
-        TYPE_SMF: 3500,
-        TYPE_SMF_OS1: 3510,
-        TYPE_SMF_OS2: 3520,
-        TYPE_AOC: 3800,
-        TYPE_POWER: 5000,
-    }
-
 
 class CableStatusChoices(ChoiceSet):
 
@@ -1058,11 +887,6 @@ class CableStatusChoices(ChoiceSet):
         (STATUS_DECOMMISSIONING, 'Decommissioning'),
     )
 
-    LEGACY_MAP = {
-        STATUS_CONNECTED: True,
-        STATUS_PLANNED: False,
-    }
-
 
 class CableLengthUnitChoices(ChoiceSet):
 
@@ -1078,13 +902,6 @@ class CableLengthUnitChoices(ChoiceSet):
         (UNIT_INCH, 'Inches'),
     )
 
-    LEGACY_MAP = {
-        UNIT_METER: 1200,
-        UNIT_CENTIMETER: 1100,
-        UNIT_FOOT: 2100,
-        UNIT_INCH: 2000,
-    }
-
 
 #
 # PowerFeeds
@@ -1104,13 +921,6 @@ class PowerFeedStatusChoices(ChoiceSet):
         (STATUS_FAILED, 'Failed'),
     )
 
-    LEGACY_MAP = {
-        STATUS_OFFLINE: 0,
-        STATUS_ACTIVE: 1,
-        STATUS_PLANNED: 2,
-        STATUS_FAILED: 4,
-    }
-
 
 class PowerFeedTypeChoices(ChoiceSet):
 
@@ -1122,11 +932,6 @@ class PowerFeedTypeChoices(ChoiceSet):
         (TYPE_REDUNDANT, 'Redundant'),
     )
 
-    LEGACY_MAP = {
-        TYPE_PRIMARY: 1,
-        TYPE_REDUNDANT: 2,
-    }
-
 
 class PowerFeedSupplyChoices(ChoiceSet):
 
@@ -1138,11 +943,6 @@ class PowerFeedSupplyChoices(ChoiceSet):
         (SUPPLY_DC, 'DC'),
     )
 
-    LEGACY_MAP = {
-        SUPPLY_AC: 1,
-        SUPPLY_DC: 2,
-    }
-
 
 class PowerFeedPhaseChoices(ChoiceSet):
 
@@ -1153,8 +953,3 @@ class PowerFeedPhaseChoices(ChoiceSet):
         (PHASE_SINGLE, 'Single phase'),
         (PHASE_3PHASE, 'Three-phase'),
     )
-
-    LEGACY_MAP = {
-        PHASE_SINGLE: 1,
-        PHASE_3PHASE: 3,
-    }
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index fe5c74fa5..69ff1460b 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -23,15 +23,6 @@ class CustomFieldTypeChoices(ChoiceSet):
         (TYPE_SELECT, 'Selection'),
     )
 
-    LEGACY_MAP = {
-        TYPE_TEXT: 100,
-        TYPE_INTEGER: 200,
-        TYPE_BOOLEAN: 300,
-        TYPE_DATE: 400,
-        TYPE_URL: 500,
-        TYPE_SELECT: 600,
-    }
-
 
 class CustomFieldFilterLogicChoices(ChoiceSet):
 
@@ -45,12 +36,6 @@ class CustomFieldFilterLogicChoices(ChoiceSet):
         (FILTER_EXACT, 'Exact'),
     )
 
-    LEGACY_MAP = {
-        FILTER_DISABLED: 0,
-        FILTER_LOOSE: 1,
-        FILTER_EXACT: 2,
-    }
-
 
 #
 # CustomLinks
@@ -93,12 +78,6 @@ class ObjectChangeActionChoices(ChoiceSet):
         (ACTION_DELETE, 'Deleted'),
     )
 
-    LEGACY_MAP = {
-        ACTION_CREATE: 1,
-        ACTION_UPDATE: 2,
-        ACTION_DELETE: 3,
-    }
-
 
 #
 # ExportTemplates
@@ -114,11 +93,6 @@ class TemplateLanguageChoices(ChoiceSet):
         (LANGUAGE_JINJA2, 'Jinja2'),
     )
 
-    LEGACY_MAP = {
-        LANGUAGE_DJANGO: 10,
-        LANGUAGE_JINJA2: 20,
-    }
-
 
 #
 # Log Levels for Reports and Scripts
@@ -148,14 +122,6 @@ class LogLevelChoices(ChoiceSet):
         (LOG_FAILURE, 'danger'),
     )
 
-    LEGACY_MAP = (
-        (LOG_DEFAULT, 0),
-        (LOG_SUCCESS, 10),
-        (LOG_INFO, 20),
-        (LOG_WARNING, 30),
-        (LOG_FAILURE, 40),
-    )
-
 
 #
 # Job results
diff --git a/netbox/ipam/choices.py b/netbox/ipam/choices.py
index 9e211ab6d..68fdfd9df 100644
--- a/netbox/ipam/choices.py
+++ b/netbox/ipam/choices.py
@@ -30,13 +30,6 @@ class PrefixStatusChoices(ChoiceSet):
         (STATUS_DEPRECATED, 'Deprecated'),
     )
 
-    LEGACY_MAP = {
-        STATUS_CONTAINER: 0,
-        STATUS_ACTIVE: 1,
-        STATUS_RESERVED: 2,
-        STATUS_DEPRECATED: 3,
-    }
-
 
 #
 # IPAddresses
@@ -56,13 +49,6 @@ class IPAddressStatusChoices(ChoiceSet):
         (STATUS_DHCP, 'DHCP'),
     )
 
-    LEGACY_MAP = {
-        STATUS_ACTIVE: 1,
-        STATUS_RESERVED: 2,
-        STATUS_DEPRECATED: 3,
-        STATUS_DHCP: 5,
-    }
-
 
 class IPAddressRoleChoices(ChoiceSet):
 
@@ -86,17 +72,6 @@ class IPAddressRoleChoices(ChoiceSet):
         (ROLE_CARP, 'CARP'),
     )
 
-    LEGACY_MAP = {
-        ROLE_LOOPBACK: 10,
-        ROLE_SECONDARY: 20,
-        ROLE_ANYCAST: 30,
-        ROLE_VIP: 40,
-        ROLE_VRRP: 41,
-        ROLE_HSRP: 42,
-        ROLE_GLBP: 43,
-        ROLE_CARP: 44,
-    }
-
 
 #
 # VLANs
@@ -114,12 +89,6 @@ class VLANStatusChoices(ChoiceSet):
         (STATUS_DEPRECATED, 'Deprecated'),
     )
 
-    LEGACY_MAP = {
-        STATUS_ACTIVE: 1,
-        STATUS_RESERVED: 2,
-        STATUS_DEPRECATED: 3,
-    }
-
 
 #
 # Services
@@ -134,8 +103,3 @@ class ServiceProtocolChoices(ChoiceSet):
         (PROTOCOL_TCP, 'TCP'),
         (PROTOCOL_UDP, 'UDP'),
     )
-
-    LEGACY_MAP = {
-        PROTOCOL_TCP: 6,
-        PROTOCOL_UDP: 17,
-    }
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 9a41edbe5..980de7672 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -103,18 +103,11 @@ class ChoiceField(serializers.Field):
     def to_representation(self, obj):
         if obj is '':
             return None
-        data = OrderedDict([
+        return OrderedDict([
             ('value', obj),
             ('label', self._choices[obj])
         ])
 
-        # TODO: Remove in v2.8
-        # Include legacy numeric ID (where applicable)
-        if hasattr(self.choiceset, 'LEGACY_MAP') and obj in self.choiceset.LEGACY_MAP:
-            data['id'] = self.choiceset.LEGACY_MAP.get(obj)
-
-        return data
-
     def to_internal_value(self, data):
         if data is '':
             if self.allow_blank:
@@ -140,14 +133,10 @@ class ChoiceField(serializers.Field):
         try:
             if data in self._choices:
                 return data
-            # Check if data is a legacy numeric ID
-            slug = self.choiceset.id_to_slug(data)
-            if slug is not None:
-                return slug
         except TypeError:  # Input is an unhashable type
             pass
 
-        raise ValidationError("{} is not a valid choice.".format(data))
+        raise ValidationError(f"{data} is not a valid choice.")
 
     @property
     def choices(self):
diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py
index ce0929a8b..3d1002105 100644
--- a/netbox/utilities/choices.py
+++ b/netbox/utilities/choices.py
@@ -14,7 +14,6 @@ class ChoiceSetMeta(type):
 class ChoiceSet(metaclass=ChoiceSetMeta):
 
     CHOICES = list()
-    LEGACY_MAP = dict()
 
     @classmethod
     def values(cls):
@@ -25,25 +24,6 @@ class ChoiceSet(metaclass=ChoiceSetMeta):
         # Unpack grouped choices before casting as a dict
         return dict(unpack_grouped_choices(cls.CHOICES))
 
-    @classmethod
-    def slug_to_id(cls, slug):
-        """
-        Return the legacy integer value corresponding to a slug.
-        """
-        return cls.LEGACY_MAP.get(slug)
-
-    @classmethod
-    def id_to_slug(cls, legacy_id):
-        """
-        Return the slug value corresponding to a legacy integer value.
-        """
-        if legacy_id in cls.LEGACY_MAP.values():
-            # Invert the legacy map to allow lookup by integer
-            legacy_map = dict([
-                (id, slug) for slug, id in cls.LEGACY_MAP.items()
-            ])
-            return legacy_map.get(legacy_id)
-
 
 def unpack_grouped_choices(choices):
     """
diff --git a/netbox/utilities/tests/test_choices.py b/netbox/utilities/tests/test_choices.py
index adff4eb60..bbf75e40e 100644
--- a/netbox/utilities/tests/test_choices.py
+++ b/netbox/utilities/tests/test_choices.py
@@ -11,6 +11,7 @@ class ExampleChoices(ChoiceSet):
     CHOICE_1 = 1
     CHOICE_2 = 2
     CHOICE_3 = 3
+
     CHOICES = (
         ('Letters', (
             (CHOICE_A, 'A'),
@@ -23,14 +24,6 @@ class ExampleChoices(ChoiceSet):
             (CHOICE_3, 'Three'),
         )),
     )
-    LEGACY_MAP = {
-        CHOICE_A: 101,
-        CHOICE_B: 102,
-        CHOICE_C: 103,
-        CHOICE_1: 201,
-        CHOICE_2: 202,
-        CHOICE_3: 203,
-    }
 
 
 class ChoiceSetTestCase(TestCase):
@@ -42,9 +35,3 @@ class ChoiceSetTestCase(TestCase):
         self.assertEqual(ExampleChoices.as_dict(), {
             'a': 'A', 'b': 'B', 'c': 'C', 1: 'One', 2: 'Two', 3: 'Three'
         })
-
-    def test_slug_to_id(self):
-        self.assertEqual(ExampleChoices.slug_to_id('a'), 101)
-
-    def test_id_to_slug(self):
-        self.assertEqual(ExampleChoices.id_to_slug(101), 'a')
diff --git a/netbox/virtualization/choices.py b/netbox/virtualization/choices.py
index 3795ddb76..083470bd9 100644
--- a/netbox/virtualization/choices.py
+++ b/netbox/virtualization/choices.py
@@ -22,9 +22,3 @@ class VirtualMachineStatusChoices(ChoiceSet):
         (STATUS_FAILED, 'Failed'),
         (STATUS_DECOMMISSIONING, 'Decommissioning'),
     )
-
-    LEGACY_MAP = {
-        STATUS_OFFLINE: 0,
-        STATUS_ACTIVE: 1,
-        STATUS_STAGED: 3,
-    }

From a4829198ffd4a05247a475e2aa90841b11751275 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 11:28:19 -0400
Subject: [PATCH 354/505] Update dependencies for v2.9

---
 docs/installation/2-redis.md |  3 +++
 requirements.txt             | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/installation/2-redis.md b/docs/installation/2-redis.md
index 83424f156..b8c7aa7a2 100644
--- a/docs/installation/2-redis.md
+++ b/docs/installation/2-redis.md
@@ -4,6 +4,9 @@
 
 [Redis](https://redis.io/) is an in-memory key-value store which NetBox employs for caching and queuing. This section entails the installation and configuration of a local Redis instance. If you already have a Redis service in place, skip to [the next section](3-netbox.md).
 
+!!! note
+    NetBox v2.9.0 or later requires Redis v4.0 or higher.
+
 ### Ubuntu
 
 ```no-highlight
diff --git a/requirements.txt b/requirements.txt
index eac5ca9d4..51f857d2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,24 +1,24 @@
 Django>=3.0,<3.1
-django-cacheops==4.2
-django-cors-headers==3.2.1
+django-cacheops==5.0.1
+django-cors-headers==3.4.0
 django-debug-toolbar==2.2
-django-filter==2.2.0
+django-filter==2.3.0
 django-mptt==0.11.0
 django-pglocks==1.0.4
 django-prometheus==2.0.0
 django-rq==2.3.2
 django-tables2==2.3.1
-django-taggit==1.2.0
+django-taggit==1.3.0
 django-timezone-field==4.0
 djangorestframework==3.11.0
 drf-yasg[validation]==1.17.1
 gunicorn==20.0.4
-Jinja2==2.11.1
-Markdown==3.2.1
-netaddr==0.7.19
-Pillow==7.1.1
+Jinja2==2.11.2
+Markdown==3.2.2
+netaddr==0.8.0
+Pillow==7.2.0
 psycopg2-binary==2.8.5
-pycryptodome==3.9.7
+pycryptodome==3.9.8
 PyYAML==5.3.1
-redis==3.4.1
+redis==3.5.3
 svgwrite==1.4

From 8dd41b771ee89f17c0be40eeb05451079657c07f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 11:54:08 -0400
Subject: [PATCH 355/505] Update import locations for Django 3.1

---
 netbox/extras/scripts.py  | 2 +-
 netbox/utilities/forms.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index dd096c392..9c8ef7b09 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -11,7 +11,7 @@ from django import forms
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import transaction
-from django.utils.decorators import classproperty
+from django.utils.functional import classproperty
 from django_rq import job
 
 from extras.api.serializers import ScriptOutputSerializer
diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 5c4b58213..0e1768387 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -8,7 +8,7 @@ import yaml
 from django import forms
 from django.conf import settings
 from django.contrib.postgres.forms import SimpleArrayField
-from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput
+from django.forms.fields import JSONField as _JSONField, InvalidJSONInput
 from django.core.exceptions import MultipleObjectsReturned
 from django.db.models import Count
 from django.forms import BoundField

From 68ecddccdb148176fb25347a1af6abd78fe0513b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 11:56:35 -0400
Subject: [PATCH 356/505] Convert NullBooleanField to BooleanField(null=True)

---
 .../0019_nullbooleanfield_to_booleanfield.py  | 18 ++++++++
 netbox/circuits/models.py                     |  5 ++-
 .../0113_nullbooleanfield_to_booleanfield.py  | 43 +++++++++++++++++++
 netbox/dcim/models/__init__.py                |  5 ++-
 netbox/dcim/models/device_components.py       | 25 ++++++-----
 5 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 netbox/circuits/migrations/0019_nullbooleanfield_to_booleanfield.py
 create mode 100644 netbox/dcim/migrations/0113_nullbooleanfield_to_booleanfield.py

diff --git a/netbox/circuits/migrations/0019_nullbooleanfield_to_booleanfield.py b/netbox/circuits/migrations/0019_nullbooleanfield_to_booleanfield.py
new file mode 100644
index 000000000..c8e844284
--- /dev/null
+++ b/netbox/circuits/migrations/0019_nullbooleanfield_to_booleanfield.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1b1 on 2020-07-16 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('circuits', '0018_standardize_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='circuittermination',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+    ]
diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 63491ca20..9ec90d110 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -275,9 +275,10 @@ class CircuitTermination(CableTermination):
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     port_speed = models.PositiveIntegerField(
         verbose_name='Port speed (Kbps)'
diff --git a/netbox/dcim/migrations/0113_nullbooleanfield_to_booleanfield.py b/netbox/dcim/migrations/0113_nullbooleanfield_to_booleanfield.py
new file mode 100644
index 000000000..b96e2dcd4
--- /dev/null
+++ b/netbox/dcim/migrations/0113_nullbooleanfield_to_booleanfield.py
@@ -0,0 +1,43 @@
+# Generated by Django 3.1b1 on 2020-07-16 15:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0112_standardize_components'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='consoleport',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='consoleserverport',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='interface',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='powerfeed',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='poweroutlet',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='powerport',
+            name='connection_status',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 9b1019990..9f4b23603 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -1905,9 +1905,10 @@ class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     name = models.CharField(
         max_length=50
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 1ebb0c4d5..6764f8bcf 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -264,9 +264,10 @@ class ConsolePort(CableTermination, ComponentModel):
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     tags = TaggableManager(through=TaggedItem)
 
@@ -304,9 +305,10 @@ class ConsoleServerPort(CableTermination, ComponentModel):
         blank=True,
         help_text='Physical port type'
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     tags = TaggableManager(through=TaggedItem)
 
@@ -370,9 +372,10 @@ class PowerPort(CableTermination, ComponentModel):
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     tags = TaggableManager(through=TaggedItem)
 
@@ -505,9 +508,10 @@ class PowerOutlet(CableTermination, ComponentModel):
         blank=True,
         help_text="Phase (for three-phase feeds)"
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     tags = TaggableManager(through=TaggedItem)
 
@@ -598,9 +602,10 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
         blank=True,
         null=True
     )
-    connection_status = models.NullBooleanField(
+    connection_status = models.BooleanField(
         choices=CONNECTION_STATUS_CHOICES,
-        blank=True
+        blank=True,
+        null=True
     )
     lag = models.ForeignKey(
         to='self',

From 21a750e8ec7bb02e7ab471e685ab931f8f8ec82e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 12:02:49 -0400
Subject: [PATCH 357/505] Change Postgres-specific JSONField to stock Django
 field

---
 .../dcim/migrations/0114_update_jsonfield.py  | 23 +++++++++++++++
 netbox/dcim/models/__init__.py                |  4 +--
 .../migrations/0046_update_jsonfield.py       | 28 +++++++++++++++++++
 netbox/extras/models/change_logging.py        |  3 +-
 netbox/extras/models/models.py                |  7 ++---
 .../users/migrations/0010_update_jsonfield.py | 23 +++++++++++++++
 netbox/users/models.py                        |  6 ++--
 .../migrations/0017_update_jsonfield.py       | 18 ++++++++++++
 8 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 netbox/dcim/migrations/0114_update_jsonfield.py
 create mode 100644 netbox/extras/migrations/0046_update_jsonfield.py
 create mode 100644 netbox/users/migrations/0010_update_jsonfield.py
 create mode 100644 netbox/virtualization/migrations/0017_update_jsonfield.py

diff --git a/netbox/dcim/migrations/0114_update_jsonfield.py b/netbox/dcim/migrations/0114_update_jsonfield.py
new file mode 100644
index 000000000..5a971bced
--- /dev/null
+++ b/netbox/dcim/migrations/0114_update_jsonfield.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1b1 on 2020-07-16 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0113_nullbooleanfield_to_booleanfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='device',
+            name='local_context_data',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='platform',
+            name='napalm_args',
+            field=models.JSONField(blank=True, null=True),
+        ),
+    ]
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 9f4b23603..5e3f57e0e 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import ArrayField, JSONField
+from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
@@ -1280,7 +1280,7 @@ class Platform(ChangeLoggedModel):
         verbose_name='NAPALM driver',
         help_text='The name of the NAPALM driver to use when interacting with devices'
     )
-    napalm_args = JSONField(
+    napalm_args = models.JSONField(
         blank=True,
         null=True,
         verbose_name='NAPALM arguments',
diff --git a/netbox/extras/migrations/0046_update_jsonfield.py b/netbox/extras/migrations/0046_update_jsonfield.py
new file mode 100644
index 000000000..a06302840
--- /dev/null
+++ b/netbox/extras/migrations/0046_update_jsonfield.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.1b1 on 2020-07-16 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0045_configcontext_changelog'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='configcontext',
+            name='data',
+            field=models.JSONField(),
+        ),
+        migrations.AlterField(
+            model_name='jobresult',
+            name='data',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='objectchange',
+            name='object_data',
+            field=models.JSONField(editable=False),
+        ),
+    ]
diff --git a/netbox/extras/models/change_logging.py b/netbox/extras/models/change_logging.py
index 3260c5302..bec8e2b75 100644
--- a/netbox/extras/models/change_logging.py
+++ b/netbox/extras/models/change_logging.py
@@ -1,7 +1,6 @@
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.urls import reverse
 
@@ -104,7 +103,7 @@ class ObjectChange(models.Model):
         max_length=200,
         editable=False
     )
-    object_data = JSONField(
+    object_data = models.JSONField(
         editable=False
     )
 
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index edd13a123..fcfcfefb3 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -5,7 +5,6 @@ from collections import OrderedDict
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import JSONField
 from django.core.validators import ValidationError
 from django.db import models
 from django.http import HttpResponse
@@ -499,7 +498,7 @@ class ConfigContext(ChangeLoggedModel):
         related_name='+',
         blank=True
     )
-    data = JSONField()
+    data = models.JSONField()
 
     objects = ConfigContextQuerySet.as_manager()
 
@@ -526,7 +525,7 @@ class ConfigContextModel(models.Model):
     A model which includes local configuration context data. This local data will override any inherited data from
     ConfigContexts.
     """
-    local_context_data = JSONField(
+    local_context_data = models.JSONField(
         blank=True,
         null=True,
     )
@@ -627,7 +626,7 @@ class JobResult(models.Model):
         choices=JobResultStatusChoices,
         default=JobResultStatusChoices.STATUS_PENDING
     )
-    data = JSONField(
+    data = models.JSONField(
         null=True,
         blank=True
     )
diff --git a/netbox/users/migrations/0010_update_jsonfield.py b/netbox/users/migrations/0010_update_jsonfield.py
new file mode 100644
index 000000000..1935e58b7
--- /dev/null
+++ b/netbox/users/migrations/0010_update_jsonfield.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1b1 on 2020-07-16 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0009_replicate_permissions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='objectpermission',
+            name='constraints',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='userconfig',
+            name='data',
+            field=models.JSONField(default=dict),
+        ),
+    ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index f210cb4d0..9e890cfdf 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -3,7 +3,7 @@ import os
 
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import ArrayField, JSONField
+from django.contrib.postgres.fields import ArrayField
 from django.core.validators import MinLengthValidator
 from django.db import models
 from django.db.models.signals import post_save
@@ -56,7 +56,7 @@ class UserConfig(models.Model):
         on_delete=models.CASCADE,
         related_name='config'
     )
-    data = JSONField(
+    data = models.JSONField(
         default=dict
     )
 
@@ -265,7 +265,7 @@ class ObjectPermission(models.Model):
         base_field=models.CharField(max_length=30),
         help_text="The list of actions granted by this permission"
     )
-    constraints = JSONField(
+    constraints = models.JSONField(
         blank=True,
         null=True,
         help_text="Queryset filter matching the applicable objects of the selected type(s)"
diff --git a/netbox/virtualization/migrations/0017_update_jsonfield.py b/netbox/virtualization/migrations/0017_update_jsonfield.py
new file mode 100644
index 000000000..2a23deef6
--- /dev/null
+++ b/netbox/virtualization/migrations/0017_update_jsonfield.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1b1 on 2020-07-16 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('virtualization', '0016_replicate_interfaces'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='virtualmachine',
+            name='local_context_data',
+            field=models.JSONField(blank=True, null=True),
+        ),
+    ]

From 82cd24a7dec61a40057ffd8ba474bb60b2117031 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 13:01:31 -0400
Subject: [PATCH 358/505] Remove deprecated ifequal template tags

---
 netbox/templates/inc/paginator.html |  2 +-
 netbox/templates/users/base.html    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html
index c0baef070..50d7e06d3 100644
--- a/netbox/templates/inc/paginator.html
+++ b/netbox/templates/inc/paginator.html
@@ -9,7 +9,7 @@
                 {% endif %}
                 {% for p in page.smart_pages %}
                     {% if p %}
-                        <li{% ifequal page.number p %} class="active"{% endifequal %}><a href="{% querystring request page=p %}">{{ p }}</a></li>
+                        <li{% if page.number == p %} class="active"{% endif %}><a href="{% querystring request page=p %}">{{ p }}</a></li>
                     {% else %}
                         <li class="disabled"><span>&hellip;</span></li>
                     {% endif %}
diff --git a/netbox/templates/users/base.html b/netbox/templates/users/base.html
index 15d81ae0f..e9b4532e1 100644
--- a/netbox/templates/users/base.html
+++ b/netbox/templates/users/base.html
@@ -9,21 +9,21 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 col-md-offset-1">
         <ul class="nav nav-pills nav-stacked">
-            <li{% ifequal active_tab "profile" %} class="active"{% endifequal %}>
+            <li{% if active_tab == "profile" %} class="active"{% endif %}>
                 <a href="{% url 'user:profile' %}">Profile</a>
             </li>
-            <li{% ifequal active_tab "preferences" %} class="active"{% endifequal %}>
+            <li{% if active_tab == "preferences" %} class="active"{% endif %}>
                 <a href="{% url 'user:preferences' %}">Preferences</a>
             </li>
             {% if not request.user.ldap_username %}
-                <li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}>
+                <li{% if active_tab == "change_password" %} class="active"{% endif %}>
                     <a href="{% url 'user:change_password' %}">Change Password</a>
                 </li>
             {% endif %}
-            <li{% ifequal active_tab "api_tokens" %} class="active"{% endifequal %}>
+            <li{% if active_tab == "api_tokens" %} class="active"{% endif %}>
                 <a href="{% url 'user:token_list' %}">API Tokens</a>
             </li>
-            <li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}>
+            <li{% if active_tab == "userkey" %} class="active"{% endif %}>
                 <a href="{% url 'user:userkey' %}">User Key</a>
             </li>
         </ul>

From bdf41451eb42aa2b31a35305e99e8f584a39a249 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 13:04:19 -0400
Subject: [PATCH 359/505] Pin Django version to 3.1-beta1 for v2.9 beta

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 51f857d2a..8f7cbefd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django>=3.0,<3.1
+Django==3.1b1
 django-cacheops==5.0.1
 django-cors-headers==3.4.0
 django-debug-toolbar==2.2

From 1dbf776279abfc645e31bb8dea4a76dfab699ea3 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 13:45:02 -0400
Subject: [PATCH 360/505] Fix handling of ProtectedError exceptions

---
 netbox/utilities/api.py            |  7 +++----
 netbox/utilities/error_handlers.py | 26 ++++++--------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 980de7672..83405a3c1 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -345,10 +345,9 @@ class ModelViewSet(_ModelViewSet):
         try:
             return super().dispatch(request, *args, **kwargs)
         except ProtectedError as e:
-            models = [
-                '{} ({})'.format(o, o._meta) for o in e.protected_objects.all()
-            ]
-            msg = 'Unable to delete object. The following dependent objects were found: {}'.format(', '.join(models))
+            protected_objects = list(e.protected_objects)
+            msg = f'Unable to delete object. {len(protected_objects)} dependent objects were found: '
+            msg += ', '.join([f'{obj} ({obj.pk})' for obj in protected_objects])
             logger.warning(msg)
             return self.finalize_response(
                 request,
diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py
index da8510950..7f912dcb1 100644
--- a/netbox/utilities/error_handlers.py
+++ b/netbox/utilities/error_handlers.py
@@ -7,31 +7,17 @@ def handle_protectederror(obj, request, e):
     """
     Generate a user-friendly error message in response to a ProtectedError exception.
     """
-    try:
-        dep_class = e.protected_objects[0]._meta.verbose_name_plural
-    except IndexError:
-        raise e
-
-    # Grammar for single versus multiple triggering objects
-    if type(obj) in (list, tuple):
-        err_message = "Unable to delete the requested {}. The following dependent {} were found: ".format(
-            obj[0]._meta.verbose_name_plural,
-            dep_class,
-        )
-    else:
-        err_message = "Unable to delete {} {}. The following dependent {} were found: ".format(
-            obj._meta.verbose_name,
-            obj,
-            dep_class,
-        )
+    protected_objects = list(e.protected_objects)
+    err_message = f"Unable to delete {obj._meta.verbose_name} <strong>{obj}</strong>. " \
+                  f"{len(protected_objects)} dependent objects were found: "
 
     # Append dependent objects to error message
     dependent_objects = []
-    for obj in e.protected_objects:
+    for dependent in protected_objects:
         if hasattr(obj, 'get_absolute_url'):
-            dependent_objects.append('<a href="{}">{}</a>'.format(obj.get_absolute_url(), escape(obj)))
+            dependent_objects.append(f'<a href="{dependent.get_absolute_url()}">{escape(dependent)}</a>')
         else:
-            dependent_objects.append(str(obj))
+            dependent_objects.append(str(dependent))
     err_message += ', '.join(dependent_objects)
 
     messages.error(request, mark_safe(err_message))

From 16f44305e4cd13f6c8923e3f5fb9236afb7a5c08 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 15:22:31 -0400
Subject: [PATCH 361/505] Update static dependencies

---
 .../clipboard.js/clipboard-2.0.4.min.js       |   7 -
 .../clipboard.js/clipboard-2.0.6.min.js       |   7 +
 .../project-static/jquery/jquery-3.4.1.min.js |   2 -
 .../project-static/jquery/jquery-3.5.1.min.js |   2 +
 .../select2-4.0.12/.github/FUNDING.yml        |   1 -
 .../dist/js/select2.full.min.js               |   2 -
 .../select2-4.0.12/dist/js/select2.min.js     |   2 -
 .../.editorconfig                             |   0
 .../.github/CONTRIBUTING.md                   |   0
 .../select2-4.0.13/.github/FUNDING.yml        |   2 +
 .../.github/ISSUE_TEMPLATE.md                 |   0
 .../.github/PULL_REQUEST_TEMPLATE.md          |   0
 .../.github/stale.yml                         |   0
 .../.github/workflows/docs-deploy.yml         |   0
 .../.github/workflows/main.yml                |   0
 .../.github/workflows/package-deploy.yml      |   0
 .../.gitignore                                |   0
 .../.jshintignore                             |   0
 .../.jshintrc                                 |   0
 .../CHANGELOG.md                              |  20 ++
 .../Gruntfile.js                              |   0
 .../LICENSE.md                                |   0
 .../README.md                                 |  32 ++-
 .../bower.json                                |   0
 .../component.json                            |   2 +-
 .../composer.json                             |   0
 .../dist/css/select2.css                      |   0
 .../dist/css/select2.min.css                  |   0
 .../dist/js/i18n/af.js                        |   2 +-
 .../dist/js/i18n/ar.js                        |   2 +-
 .../dist/js/i18n/az.js                        |   2 +-
 .../dist/js/i18n/bg.js                        |   2 +-
 .../dist/js/i18n/bn.js                        |   2 +-
 .../dist/js/i18n/bs.js                        |   2 +-
 .../dist/js/i18n/ca.js                        |   2 +-
 .../dist/js/i18n/cs.js                        |   2 +-
 .../dist/js/i18n/da.js                        |   2 +-
 .../dist/js/i18n/de.js                        |   2 +-
 .../dist/js/i18n/dsb.js                       |   2 +-
 .../dist/js/i18n/el.js                        |   2 +-
 .../dist/js/i18n/en.js                        |   2 +-
 .../dist/js/i18n/es.js                        |   2 +-
 .../dist/js/i18n/et.js                        |   2 +-
 .../dist/js/i18n/eu.js                        |   2 +-
 .../dist/js/i18n/fa.js                        |   2 +-
 .../dist/js/i18n/fi.js                        |   2 +-
 .../dist/js/i18n/fr.js                        |   2 +-
 .../dist/js/i18n/gl.js                        |   2 +-
 .../dist/js/i18n/he.js                        |   2 +-
 .../dist/js/i18n/hi.js                        |   2 +-
 .../dist/js/i18n/hr.js                        |   2 +-
 .../dist/js/i18n/hsb.js                       |   2 +-
 .../dist/js/i18n/hu.js                        |   2 +-
 .../dist/js/i18n/hy.js                        |   2 +-
 .../dist/js/i18n/id.js                        |   2 +-
 .../dist/js/i18n/is.js                        |   2 +-
 .../dist/js/i18n/it.js                        |   2 +-
 .../dist/js/i18n/ja.js                        |   2 +-
 .../dist/js/i18n/ka.js                        |   2 +-
 .../dist/js/i18n/km.js                        |   2 +-
 .../dist/js/i18n/ko.js                        |   2 +-
 .../dist/js/i18n/lt.js                        |   2 +-
 .../dist/js/i18n/lv.js                        |   2 +-
 .../dist/js/i18n/mk.js                        |   2 +-
 .../dist/js/i18n/ms.js                        |   2 +-
 .../dist/js/i18n/nb.js                        |   2 +-
 .../dist/js/i18n/ne.js                        |   2 +-
 .../dist/js/i18n/nl.js                        |   2 +-
 .../dist/js/i18n/pl.js                        |   2 +-
 .../dist/js/i18n/ps.js                        |   2 +-
 .../dist/js/i18n/pt-BR.js                     |   2 +-
 .../dist/js/i18n/pt.js                        |   2 +-
 .../dist/js/i18n/ro.js                        |   2 +-
 .../dist/js/i18n/ru.js                        |   2 +-
 .../dist/js/i18n/sk.js                        |   2 +-
 .../dist/js/i18n/sl.js                        |   2 +-
 .../dist/js/i18n/sq.js                        |   2 +-
 .../dist/js/i18n/sr-Cyrl.js                   |   2 +-
 .../dist/js/i18n/sr.js                        |   2 +-
 .../dist/js/i18n/sv.js                        |   2 +-
 .../dist/js/i18n/th.js                        |   2 +-
 .../dist/js/i18n/tk.js                        |   2 +-
 .../dist/js/i18n/tr.js                        |   2 +-
 .../dist/js/i18n/uk.js                        |   2 +-
 .../dist/js/i18n/vi.js                        |   2 +-
 .../dist/js/i18n/zh-CN.js                     |   2 +-
 .../dist/js/i18n/zh-TW.js                     |   2 +-
 .../dist/js/select2.full.js                   | 105 ++++++++--
 .../dist/js/select2.full.min.js               |   2 +
 .../dist/js/select2.js                        |  99 +++++++--
 .../select2-4.0.13/dist/js/select2.min.js     |   2 +
 .../docs/LICENSE.md                           |   0
 .../docs/README.md                            |   0
 .../docs/accounts/.gitkeep                    |   0
 .../docs/assets/rtfm-screenshot.png           | Bin
 .../docs/blueprints.yaml                      |   0
 .../docs/config/plugins/anchors.yaml          |   0
 .../docs/config/plugins/highlight.yaml        |   0
 .../docs/config/plugins/simplesearch.yaml     |   0
 .../docs/config/site.yaml                     |   0
 .../docs/config/system.yaml                   |   0
 .../docs/data/.gitkeep                        |   0
 .../docs/localhost/config/security.yaml       |   0
 .../docs/localhost/config/system.yaml         |   0
 .../01.installation/docs.md                   |   4 +-
 .../01.getting-started/02.basic-usage/docs.md |   0
 .../03.builds-and-modules/docs.md             |   0
 .../docs/pages/01.getting-started/chapter.md  |   0
 .../01.getting-help/docs.md                   |   0
 .../02.common-problems/docs.md                |   0
 .../docs/pages/02.troubleshooting/chapter.md  |   0
 .../03.configuration/01.options-api/docs.md   |   0
 .../03.configuration/02.defaults/docs.md      |   0
 .../03.data-attributes/docs.md                |   0
 .../docs/pages/03.configuration/docs.md       |   0
 .../docs/pages/04.appearance/docs.md          |   0
 .../docs/pages/05.options/docs.md             |   0
 .../pages/06.data-sources/01.formats/docs.md  |   0
 .../pages/06.data-sources/02.ajax/docs.md     |   0
 .../pages/06.data-sources/03.arrays/docs.md   |   0
 .../docs/pages/06.data-sources/chapter.md     |   0
 .../docs/pages/07.dropdown/docs.md            |   0
 .../docs/pages/08.selections/docs.md          |   0
 .../docs/pages/09.tagging/docs.md             |   0
 .../docs/pages/10.placeholders/docs.md        |   0
 .../docs/pages/11.searching/docs.md           |   0
 .../01.add-select-clear-items/docs.md         |   0
 .../02.retrieving-selections/docs.md          |   0
 .../03.methods/docs.md                        |   0
 .../12.programmatic-control/04.events/docs.md |   0
 .../pages/12.programmatic-control/chapter.md  |   0
 .../docs/pages/13.i18n/docs.md                |   2 +-
 .../01.adapters-and-decorators/docs.md        |   0
 .../02.default-adapters/01.selection/docs.md  |   0
 .../02.default-adapters/02.array/docs.md      |   0
 .../02.default-adapters/03.ajax/docs.md       |   0
 .../02.default-adapters/04.data/docs.md       |   0
 .../02.default-adapters/05.results/docs.md    |   0
 .../02.default-adapters/06.dropdown/docs.md   |   0
 .../14.advanced/02.default-adapters/docs.md   |   0
 .../docs/pages/14.advanced/chapter.md         |   0
 .../pages/15.upgrading/01.new-in-40/docs.md   |   0
 .../15.upgrading/02.migrating-from-35/docs.md |   0
 .../docs/pages/15.upgrading/chapter.md        |   0
 .../docs/pages/images/flags/ak.png            | Bin
 .../docs/pages/images/flags/al.png            | Bin
 .../docs/pages/images/flags/ar.png            | Bin
 .../docs/pages/images/flags/az.png            | Bin
 .../docs/pages/images/flags/ca.png            | Bin
 .../docs/pages/images/flags/co.png            | Bin
 .../docs/pages/images/flags/ct.png            | Bin
 .../docs/pages/images/flags/de.png            | Bin
 .../docs/pages/images/flags/fl.png            | Bin
 .../docs/pages/images/flags/ga.png            | Bin
 .../docs/pages/images/flags/hi.png            | Bin
 .../docs/pages/images/flags/ia.png            | Bin
 .../docs/pages/images/flags/id.png            | Bin
 .../docs/pages/images/flags/il.png            | Bin
 .../docs/pages/images/flags/in.png            | Bin
 .../docs/pages/images/flags/ks.png            | Bin
 .../docs/pages/images/flags/ky.png            | Bin
 .../docs/pages/images/flags/la.png            | Bin
 .../docs/pages/images/flags/ma.png            | Bin
 .../docs/pages/images/flags/md.png            | Bin
 .../docs/pages/images/flags/me.png            | Bin
 .../docs/pages/images/flags/mi.png            | Bin
 .../docs/pages/images/flags/mn.png            | Bin
 .../docs/pages/images/flags/mo.png            | Bin
 .../docs/pages/images/flags/ms.png            | Bin
 .../docs/pages/images/flags/mt.png            | Bin
 .../docs/pages/images/flags/nc.png            | Bin
 .../docs/pages/images/flags/nd.png            | Bin
 .../docs/pages/images/flags/ne.png            | Bin
 .../docs/pages/images/flags/nh.png            | Bin
 .../docs/pages/images/flags/nj.png            | Bin
 .../docs/pages/images/flags/nm.png            | Bin
 .../docs/pages/images/flags/nv.png            | Bin
 .../docs/pages/images/flags/ny.png            | Bin
 .../docs/pages/images/flags/oh.png            | Bin
 .../docs/pages/images/flags/ok.png            | Bin
 .../docs/pages/images/flags/or.png            | Bin
 .../docs/pages/images/flags/pa.png            | Bin
 .../docs/pages/images/flags/ri.png            | Bin
 .../docs/pages/images/flags/sc.png            | Bin
 .../docs/pages/images/flags/sd.png            | Bin
 .../docs/pages/images/flags/tn.png            | Bin
 .../docs/pages/images/flags/tx.png            | Bin
 .../docs/pages/images/flags/ut.png            | Bin
 .../docs/pages/images/flags/va.png            | Bin
 .../docs/pages/images/flags/vt.png            | Bin
 .../docs/pages/images/flags/wa.png            | Bin
 .../docs/pages/images/flags/wi.png            | Bin
 .../docs/pages/images/flags/wv.png            | Bin
 .../docs/pages/images/flags/wy.png            | Bin
 .../docs/pages/images/logo.png                | Bin
 .../docs/plugins/.gitkeep                     |   0
 .../docs/plugins/anchors/CHANGELOG.md         |   0
 .../docs/plugins/anchors/LICENSE              |   0
 .../docs/plugins/anchors/README.md            |   0
 .../docs/plugins/anchors/anchors.php          |   0
 .../docs/plugins/anchors/anchors.yaml         |   0
 .../docs/plugins/anchors/blueprints.yaml      |   0
 .../docs/plugins/anchors/js/anchor.min.js     |   0
 .../docs/plugins/breadcrumbs/CHANGELOG.md     |   0
 .../docs/plugins/breadcrumbs/LICENSE          |   0
 .../docs/plugins/breadcrumbs/README.md        |   0
 .../plugins/breadcrumbs/assets/readme_1.png   | Bin
 .../docs/plugins/breadcrumbs/blueprints.yaml  |   0
 .../docs/plugins/breadcrumbs/breadcrumbs.php  |   0
 .../docs/plugins/breadcrumbs/breadcrumbs.yaml |   0
 .../breadcrumbs/classes/breadcrumbs.php       |   0
 .../plugins/breadcrumbs/css/breadcrumbs.css   |   0
 .../templates/partials/breadcrumbs.html.twig  |   0
 .../docs/plugins/error/CHANGELOG.md           |   0
 .../docs/plugins/error/LICENSE                |   0
 .../docs/plugins/error/README.md              |   0
 .../docs/plugins/error/assets/readme_1.png    | Bin
 .../docs/plugins/error/blueprints.yaml        |   0
 .../docs/plugins/error/cli/LogCommand.php     |   0
 .../docs/plugins/error/error.php              |   0
 .../docs/plugins/error/error.yaml             |   0
 .../docs/plugins/error/languages.yaml         |   0
 .../docs/plugins/error/pages/error.md         |   0
 .../plugins/error/templates/error.html.twig   |   0
 .../plugins/error/templates/error.json.twig   |   0
 .../docs/plugins/highlight/CHANGELOG.md       |   0
 .../docs/plugins/highlight/LICENSE            |   0
 .../docs/plugins/highlight/README.md          |   0
 .../plugins/highlight/assets/readme_1.png     | Bin
 .../docs/plugins/highlight/blueprints.yaml    |   0
 .../docs/plugins/highlight/css/agate.css      |   0
 .../plugins/highlight/css/androidstudio.css   |   0
 .../plugins/highlight/css/arduino-light.css   |   0
 .../docs/plugins/highlight/css/arta.css       |   0
 .../docs/plugins/highlight/css/ascetic.css    |   0
 .../highlight/css/atelier-cave.dark.css       |   0
 .../highlight/css/atelier-cave.light.css      |   0
 .../highlight/css/atelier-dune.dark.css       |   0
 .../highlight/css/atelier-dune.light.css      |   0
 .../highlight/css/atelier-estuary.dark.css    |   0
 .../highlight/css/atelier-estuary.light.css   |   0
 .../highlight/css/atelier-forest.dark.css     |   0
 .../highlight/css/atelier-forest.light.css    |   0
 .../highlight/css/atelier-heath.dark.css      |   0
 .../highlight/css/atelier-heath.light.css     |   0
 .../highlight/css/atelier-lakeside.dark.css   |   0
 .../highlight/css/atelier-lakeside.light.css  |   0
 .../highlight/css/atelier-plateau.dark.css    |   0
 .../highlight/css/atelier-plateau.light.css   |   0
 .../highlight/css/atelier-savanna.dark.css    |   0
 .../highlight/css/atelier-savanna.light.css   |   0
 .../highlight/css/atelier-seaside.dark.css    |   0
 .../highlight/css/atelier-seaside.light.css   |   0
 .../css/atelier-sulphurpool.dark.css          |   0
 .../css/atelier-sulphurpool.light.css         |   0
 .../plugins/highlight/css/brown-paper.css     |   0
 .../plugins/highlight/css/codepen-embed.css   |   0
 .../plugins/highlight/css/color-brewer.css    |   0
 .../docs/plugins/highlight/css/dark.css       |   0
 .../docs/plugins/highlight/css/darkula.css    |   0
 .../docs/plugins/highlight/css/default.css    |   0
 .../docs/plugins/highlight/css/docco.css      |   0
 .../docs/plugins/highlight/css/far.css        |   0
 .../docs/plugins/highlight/css/foundation.css |   0
 .../plugins/highlight/css/github-gist.css     |   0
 .../docs/plugins/highlight/css/github.css     |   0
 .../docs/plugins/highlight/css/googlecode.css |   0
 .../docs/plugins/highlight/css/grayscale.css  |   0
 .../docs/plugins/highlight/css/hopscotch.css  |   0
 .../docs/plugins/highlight/css/hybrid.css     |   0
 .../docs/plugins/highlight/css/idea.css       |   0
 .../docs/plugins/highlight/css/ir-black.css   |   0
 .../plugins/highlight/css/kimbie.dark.css     |   0
 .../plugins/highlight/css/kimbie.light.css    |   0
 .../docs/plugins/highlight/css/learn.css      |   0
 .../docs/plugins/highlight/css/magula.css     |   0
 .../docs/plugins/highlight/css/mono-blue.css  |   0
 .../plugins/highlight/css/monokai-sublime.css |   0
 .../docs/plugins/highlight/css/monokai.css    |   0
 .../docs/plugins/highlight/css/obsidian.css   |   0
 .../plugins/highlight/css/paraiso-dark.css    |   0
 .../plugins/highlight/css/paraiso-light.css   |   0
 .../plugins/highlight/css/paraiso.dark.css    |   0
 .../plugins/highlight/css/paraiso.light.css   |   0
 .../docs/plugins/highlight/css/pojoaque.css   |   0
 .../docs/plugins/highlight/css/railscasts.css |   0
 .../docs/plugins/highlight/css/rainbow.css    |   0
 .../plugins/highlight/css/school-book.css     |   0
 .../plugins/highlight/css/solarized-dark.css  |   0
 .../plugins/highlight/css/solarized-light.css |   0
 .../docs/plugins/highlight/css/sunburst.css   |   0
 .../highlight/css/tomorrow-night-blue.css     |   0
 .../highlight/css/tomorrow-night-bright.css   |   0
 .../highlight/css/tomorrow-night-eighties.css |   0
 .../plugins/highlight/css/tomorrow-night.css  |   0
 .../docs/plugins/highlight/css/tomorrow.css   |   0
 .../docs/plugins/highlight/css/vs.css         |   0
 .../docs/plugins/highlight/css/xcode.css      |   0
 .../docs/plugins/highlight/css/zenburn.css    |   0
 .../docs/plugins/highlight/highlight.php      |   0
 .../docs/plugins/highlight/highlight.yaml     |   0
 .../plugins/highlight/js/highlight.pack.js    |   0
 .../js/highlightjs-line-numbers.min.js        |   0
 .../docs/plugins/problems/CHANGELOG.md        |   0
 .../docs/plugins/problems/LICENSE             |   0
 .../docs/plugins/problems/README.md           |   0
 .../docs/plugins/problems/assets/readme_1.png | Bin
 .../docs/plugins/problems/blueprints.yaml     |   0
 .../docs/plugins/problems/css/problems.css    |   0
 .../docs/plugins/problems/css/template.css    |   0
 .../docs/plugins/problems/html/problems.html  |   0
 .../docs/plugins/problems/problems.php        |   0
 .../docs/plugins/problems/problems.yaml       |   0
 .../docs/plugins/simplesearch/CHANGELOG.md    |   0
 .../docs/plugins/simplesearch/LICENSE         |   0
 .../docs/plugins/simplesearch/README.md       |   0
 .../plugins/simplesearch/assets/readme_1.png  | Bin
 .../plugins/simplesearch/assets/search.svg    |   0
 .../docs/plugins/simplesearch/blueprints.yaml |   0
 .../plugins/simplesearch/css/simplesearch.css |   0
 .../plugins/simplesearch/js/simplesearch.js   |   0
 .../docs/plugins/simplesearch/languages.yaml  |   0
 .../simplesearch/pages/simplesearch.md        |   0
 .../plugins/simplesearch/simplesearch.php     |   0
 .../plugins/simplesearch/simplesearch.yaml    |   0
 .../partials/simplesearch_base.html.twig      |   0
 .../partials/simplesearch_item.html.twig      |   0
 .../partials/simplesearch_searchbox.html.twig |   0
 .../templates/simplesearch_results.html.twig  |   0
 .../templates/simplesearch_results.json.twig  |   0
 .../docs/screenshot.jpg                       | Bin
 .../docs/themes/.gitkeep                      |   0
 .../docs/themes/learn2/CHANGELOG.md           |   0
 .../docs/themes/learn2/LICENSE                |   0
 .../docs/themes/learn2/README.md              |   0
 .../docs/themes/learn2/blueprints.yaml        |   0
 .../themes/learn2/blueprints/chapter.yaml     |   0
 .../docs/themes/learn2/blueprints/docs.yaml   |   0
 .../themes/learn2/css-compiled/nucleus.css    |   0
 .../learn2/css-compiled/nucleus.css.map       |   0
 .../docs/themes/learn2/css-compiled/theme.css |   0
 .../themes/learn2/css-compiled/theme.css.map  |   0
 .../themes/learn2/css/featherlight.min.css    |   0
 .../themes/learn2/css/font-awesome.min.css    |   0
 .../docs/themes/learn2/css/nucleus-ie10.css   |   0
 .../docs/themes/learn2/css/nucleus-ie9.css    |   0
 .../learn2/css/pure-0.5.0/grids-min.css       |   0
 .../learn2/fonts/fontawesome-webfont.eot      | Bin
 .../learn2/fonts/fontawesome-webfont.svg      |   0
 .../learn2/fonts/fontawesome-webfont.ttf      | Bin
 .../learn2/fonts/fontawesome-webfont.woff     | Bin
 .../learn2/fonts/fontawesome-webfont.woff2    | Bin
 .../docs/themes/learn2/images/clippy.svg      |   0
 .../docs/themes/learn2/images/favicon.png     | Bin
 .../docs/themes/learn2/images/logo.png        | Bin
 .../docs/themes/learn2/js/clipboard.min.js    |   0
 .../docs/themes/learn2/js/featherlight.min.js |   0
 .../learn2/js/html5shiv-printshiv.min.js      |   0
 .../themes/learn2/js/jquery.scrollbar.min.js  |   0
 .../docs/themes/learn2/js/learn.js            |   0
 .../learn2/js/modernizr.custom.71422.js       |   0
 .../docs/themes/learn2/languages.yaml         |   0
 .../docs/themes/learn2/learn2.php             |   0
 .../docs/themes/learn2/learn2.yaml            |   0
 .../docs/themes/learn2/screenshot.jpg         | Bin
 .../docs/themes/learn2/scss.sh                |   0
 .../scss/configuration/nucleus/_base.scss     |   0
 .../configuration/nucleus/_breakpoints.scss   |   0
 .../scss/configuration/nucleus/_core.scss     |   0
 .../scss/configuration/nucleus/_layout.scss   |   0
 .../scss/configuration/nucleus/_nav.scss      |   0
 .../configuration/nucleus/_typography.scss    |   0
 .../scss/configuration/theme/_base.scss       |   0
 .../scss/configuration/theme/_bullets.scss    |   0
 .../scss/configuration/theme/_colors.scss     |   0
 .../docs/themes/learn2/scss/nucleus.scss      |   0
 .../themes/learn2/scss/nucleus/_core.scss     |   0
 .../themes/learn2/scss/nucleus/_flex.scss     |   0
 .../themes/learn2/scss/nucleus/_forms.scss    |   0
 .../learn2/scss/nucleus/_typography.scss      |   0
 .../learn2/scss/nucleus/functions/_base.scss  |   0
 .../scss/nucleus/functions/_direction.scss    |   0
 .../learn2/scss/nucleus/functions/_range.scss |   0
 .../learn2/scss/nucleus/mixins/_base.scss     |   0
 .../scss/nucleus/mixins/_breakpoints.scss     |   0
 .../scss/nucleus/mixins/_utilities.scss       |   0
 .../scss/nucleus/particles/_align-text.scss   |   0
 .../scss/nucleus/particles/_visibility.scss   |   0
 .../docs/themes/learn2/scss/theme.scss        |   0
 .../themes/learn2/scss/theme/_bullets.scss    |   0
 .../themes/learn2/scss/theme/_buttons.scss    |   0
 .../learn2/scss/theme/_configuration.scss     |   0
 .../docs/themes/learn2/scss/theme/_core.scss  |   0
 .../themes/learn2/scss/theme/_custom.scss     |   0
 .../docs/themes/learn2/scss/theme/_fonts.scss |   0
 .../docs/themes/learn2/scss/theme/_forms.scss |   0
 .../themes/learn2/scss/theme/_header.scss     |   0
 .../docs/themes/learn2/scss/theme/_main.scss  |   0
 .../docs/themes/learn2/scss/theme/_nav.scss   |   0
 .../themes/learn2/scss/theme/_scrollbar.scss  |   0
 .../themes/learn2/scss/theme/_tables.scss     |   0
 .../themes/learn2/scss/theme/_tooltips.scss   |   0
 .../themes/learn2/scss/theme/_typography.scss |   0
 .../learn2/scss/theme/modules/_base.scss      |   0
 .../learn2/scss/theme/modules/_buttons.scss   |   0
 .../bourbon/_bourbon-deprecated-upcoming.scss |   0
 .../learn2/scss/vendor/bourbon/_bourbon.scss  |   0
 .../scss/vendor/bourbon/addons/_button.scss   |   0
 .../scss/vendor/bourbon/addons/_clearfix.scss |   0
 .../bourbon/addons/_directional-values.scss   |   0
 .../scss/vendor/bourbon/addons/_ellipsis.scss |   0
 .../vendor/bourbon/addons/_font-family.scss   |   0
 .../vendor/bourbon/addons/_hide-text.scss     |   0
 .../bourbon/addons/_html5-input-types.scss    |   0
 .../scss/vendor/bourbon/addons/_position.scss |   0
 .../scss/vendor/bourbon/addons/_prefixer.scss |   0
 .../scss/vendor/bourbon/addons/_rem.scss      |   0
 .../vendor/bourbon/addons/_retina-image.scss  |   0
 .../scss/vendor/bourbon/addons/_size.scss     |   0
 .../bourbon/addons/_timing-functions.scss     |   0
 .../scss/vendor/bourbon/addons/_triangle.scss |   0
 .../vendor/bourbon/addons/_word-wrap.scss     |   0
 .../scss/vendor/bourbon/css3/_animation.scss  |   0
 .../scss/vendor/bourbon/css3/_appearance.scss |   0
 .../bourbon/css3/_backface-visibility.scss    |   0
 .../bourbon/css3/_background-image.scss       |   0
 .../scss/vendor/bourbon/css3/_background.scss |   0
 .../vendor/bourbon/css3/_border-image.scss    |   0
 .../vendor/bourbon/css3/_border-radius.scss   |   0
 .../scss/vendor/bourbon/css3/_box-sizing.scss |   0
 .../scss/vendor/bourbon/css3/_calc.scss       |   0
 .../scss/vendor/bourbon/css3/_columns.scss    |   0
 .../scss/vendor/bourbon/css3/_filter.scss     |   0
 .../scss/vendor/bourbon/css3/_flex-box.scss   |   0
 .../scss/vendor/bourbon/css3/_font-face.scss  |   0
 .../bourbon/css3/_font-feature-settings.scss  |   0
 .../bourbon/css3/_hidpi-media-query.scss      |   0
 .../scss/vendor/bourbon/css3/_hyphens.scss    |   0
 .../vendor/bourbon/css3/_image-rendering.scss |   0
 .../scss/vendor/bourbon/css3/_keyframes.scss  |   0
 .../vendor/bourbon/css3/_linear-gradient.scss |   0
 .../vendor/bourbon/css3/_perspective.scss     |   0
 .../vendor/bourbon/css3/_placeholder.scss     |   0
 .../vendor/bourbon/css3/_radial-gradient.scss |   0
 .../scss/vendor/bourbon/css3/_transform.scss  |   0
 .../scss/vendor/bourbon/css3/_transition.scss |   0
 .../vendor/bourbon/css3/_user-select.scss     |   0
 .../vendor/bourbon/functions/_assign.scss     |   0
 .../bourbon/functions/_color-lightness.scss   |   0
 .../vendor/bourbon/functions/_flex-grid.scss  |   0
 .../bourbon/functions/_golden-ratio.scss      |   0
 .../vendor/bourbon/functions/_grid-width.scss |   0
 .../bourbon/functions/_modular-scale.scss     |   0
 .../vendor/bourbon/functions/_px-to-em.scss   |   0
 .../vendor/bourbon/functions/_px-to-rem.scss  |   0
 .../bourbon/functions/_strip-units.scss       |   0
 .../vendor/bourbon/functions/_tint-shade.scss |   0
 .../functions/_transition-property-name.scss  |   0
 .../vendor/bourbon/functions/_unpack.scss     |   0
 .../bourbon/helpers/_convert-units.scss       |   0
 .../helpers/_gradient-positions-parser.scss   |   0
 .../scss/vendor/bourbon/helpers/_is-num.scss  |   0
 .../bourbon/helpers/_linear-angle-parser.scss |   0
 .../helpers/_linear-gradient-parser.scss      |   0
 .../helpers/_linear-positions-parser.scss     |   0
 .../helpers/_linear-side-corner-parser.scss   |   0
 .../bourbon/helpers/_radial-arg-parser.scss   |   0
 .../helpers/_radial-gradient-parser.scss      |   0
 .../helpers/_radial-positions-parser.scss     |   0
 .../bourbon/helpers/_render-gradients.scss    |   0
 .../bourbon/helpers/_shape-size-stripper.scss |   0
 .../vendor/bourbon/helpers/_str-to-num.scss   |   0
 .../vendor/bourbon/settings/_prefixer.scss    |   0
 .../vendor/bourbon/settings/_px-to-em.scss    |   0
 .../vendor/color-schemer/_color-schemer.scss  |   0
 .../color-schemer/color-schemer/_cmyk.scss    |   0
 .../color-schemer/_color-adjustments.scss     |   0
 .../color-schemer/_color-schemer.scss         |   0
 .../color-schemer/_colorblind.scss            |   0
 .../color-schemer/_comparison.scss            |   0
 .../color-schemer/_equalize.scss              |   0
 .../color-schemer/_harmonize.scss             |   0
 .../color-schemer/_interpolation.scss         |   0
 .../color-schemer/color-schemer/_mix.scss     |   0
 .../color-schemer/color-schemer/_mixins.scss  |   0
 .../color-schemer/color-schemer/_ryb.scss     |   0
 .../color-schemer/_tint-shade.scss            |   0
 .../themes/learn2/templates/chapter.html.twig |   0
 .../themes/learn2/templates/default.html.twig |   0
 .../themes/learn2/templates/docs.html.twig    |   0
 .../themes/learn2/templates/error.html.twig   |   0
 .../templates/partials/analytics.html.twig    |   0
 .../learn2/templates/partials/base.html.twig  |   0
 .../templates/partials/github_link.html.twig  |   0
 .../templates/partials/github_note.html.twig  |   0
 .../learn2/templates/partials/logo.html.twig  |   0
 .../templates/partials/metadata.html.twig     |   0
 .../learn2/templates/partials/page.html.twig  |   0
 .../templates/partials/sidebar.html.twig      |   0
 .../docs/themes/learn2/thumbnail.jpg          | Bin
 .../docs/themes/site/css/s2-docs.css          |   0
 .../docs/themes/site/css/theme.css            |   0
 .../site/images/android-chrome-36x36.png      | Bin
 .../site/images/android-chrome-48x48.png      | Bin
 .../site/images/android-chrome-72x72.png      | Bin
 .../site/images/apple-touch-icon-57x57.png    | Bin
 .../site/images/apple-touch-icon-60x60.png    | Bin
 .../site/images/apple-touch-icon-72x72.png    | Bin
 .../images/apple-touch-icon-precomposed.png   | Bin
 .../themes/site/images/apple-touch-icon.png   | Bin
 .../docs/themes/site/images/favicon-16x16.png | Bin
 .../docs/themes/site/images/favicon-32x32.png | Bin
 .../docs/themes/site/images/favicon.ico       | Bin
 .../docs/themes/site/images/favicon.png       | Bin
 .../docs/themes/site/images/manifest.json     |   0
 .../themes/site/images/mstile-150x150.png     | Bin
 .../themes/site/images/mstile-310x150.png     | Bin
 .../docs/themes/site/images/mstile-70x70.png  | Bin
 .../themes/site/images/safari-pinned-tab.svg  |   0
 .../docs/themes/site/js/data-fill-from.js     |   0
 .../docs/themes/site/site.yaml                |   4 +-
 .../site/templates/partials/base.html.twig    |   4 +-
 .../partials/js/source-states.html.twig       |   0
 .../site/templates/partials/logo.html.twig    |   0
 .../site/templates/partials/sidebar.html.twig |   0
 .../package.json                              |   2 +-
 .../src/js/banner.end.js                      |   0
 .../src/js/banner.start.js                    |   0
 .../src/js/jquery.mousewheel.shim.js          |   0
 .../src/js/jquery.select2.js                  |   0
 .../src/js/jquery.shim.js                     |   0
 .../src/js/select2/compat/containerCss.js     |   0
 .../src/js/select2/compat/dropdownCss.js      |   0
 .../src/js/select2/compat/initSelection.js    |   0
 .../src/js/select2/compat/inputData.js        |   6 +-
 .../src/js/select2/compat/matcher.js          |   0
 .../src/js/select2/compat/query.js            |   0
 .../src/js/select2/compat/utils.js            |   0
 .../src/js/select2/core.js                    |  58 +++++-
 .../src/js/select2/data/ajax.js               |   0
 .../src/js/select2/data/array.js              |   0
 .../src/js/select2/data/base.js               |   0
 .../src/js/select2/data/maximumInputLength.js |   0
 .../js/select2/data/maximumSelectionLength.js |   0
 .../src/js/select2/data/minimumInputLength.js |   0
 .../src/js/select2/data/select.js             |  10 +-
 .../src/js/select2/data/tags.js               |   0
 .../src/js/select2/data/tokenizer.js          |   0
 .../src/js/select2/defaults.js                |   0
 .../src/js/select2/diacritics.js              |   0
 .../src/js/select2/dropdown.js                |   0
 .../src/js/select2/dropdown/attachBody.js     |   0
 .../js/select2/dropdown/attachContainer.js    |   0
 .../src/js/select2/dropdown/closeOnSelect.js  |   0
 .../js/select2/dropdown/hidePlaceholder.js    |   0
 .../src/js/select2/dropdown/infiniteScroll.js |   0
 .../dropdown/minimumResultsForSearch.js       |   0
 .../src/js/select2/dropdown/search.js         |   0
 .../src/js/select2/dropdown/selectOnClose.js  |   0
 .../js/select2/dropdown/stopPropagation.js    |   0
 .../src/js/select2/i18n/af.js                 |   0
 .../src/js/select2/i18n/ar.js                 |   0
 .../src/js/select2/i18n/az.js                 |   0
 .../src/js/select2/i18n/bg.js                 |   0
 .../src/js/select2/i18n/bn.js                 |   0
 .../src/js/select2/i18n/bs.js                 |   0
 .../src/js/select2/i18n/ca.js                 |   0
 .../src/js/select2/i18n/cs.js                 |   0
 .../src/js/select2/i18n/da.js                 |   0
 .../src/js/select2/i18n/de.js                 |   0
 .../src/js/select2/i18n/dsb.js                |   0
 .../src/js/select2/i18n/el.js                 |   0
 .../src/js/select2/i18n/en.js                 |   0
 .../src/js/select2/i18n/es.js                 |   0
 .../src/js/select2/i18n/et.js                 |   0
 .../src/js/select2/i18n/eu.js                 |   0
 .../src/js/select2/i18n/fa.js                 |   0
 .../src/js/select2/i18n/fi.js                 |   0
 .../src/js/select2/i18n/fr.js                 |   0
 .../src/js/select2/i18n/gl.js                 |   0
 .../src/js/select2/i18n/he.js                 |   0
 .../src/js/select2/i18n/hi.js                 |   0
 .../src/js/select2/i18n/hr.js                 |   0
 .../src/js/select2/i18n/hsb.js                |   0
 .../src/js/select2/i18n/hu.js                 |   0
 .../src/js/select2/i18n/hy.js                 |   0
 .../src/js/select2/i18n/id.js                 |   0
 .../src/js/select2/i18n/is.js                 |   0
 .../src/js/select2/i18n/it.js                 |   0
 .../src/js/select2/i18n/ja.js                 |   0
 .../src/js/select2/i18n/ka.js                 |   0
 .../src/js/select2/i18n/km.js                 |   0
 .../src/js/select2/i18n/ko.js                 |   0
 .../src/js/select2/i18n/lt.js                 |   0
 .../src/js/select2/i18n/lv.js                 |   0
 .../src/js/select2/i18n/mk.js                 |   0
 .../src/js/select2/i18n/ms.js                 |   0
 .../src/js/select2/i18n/nb.js                 |   0
 .../src/js/select2/i18n/ne.js                 |   0
 .../src/js/select2/i18n/nl.js                 |   0
 .../src/js/select2/i18n/pl.js                 |   0
 .../src/js/select2/i18n/ps.js                 |   0
 .../src/js/select2/i18n/pt-BR.js              |   0
 .../src/js/select2/i18n/pt.js                 |   0
 .../src/js/select2/i18n/ro.js                 |   0
 .../src/js/select2/i18n/ru.js                 |   0
 .../src/js/select2/i18n/sk.js                 |   0
 .../src/js/select2/i18n/sl.js                 |   0
 .../src/js/select2/i18n/sq.js                 |   0
 .../src/js/select2/i18n/sr-Cyrl.js            |   0
 .../src/js/select2/i18n/sr.js                 |   0
 .../src/js/select2/i18n/sv.js                 |   0
 .../src/js/select2/i18n/th.js                 |   0
 .../src/js/select2/i18n/tk.js                 |   0
 .../src/js/select2/i18n/tr.js                 |   0
 .../src/js/select2/i18n/uk.js                 |   0
 .../src/js/select2/i18n/vi.js                 |   0
 .../src/js/select2/i18n/zh-CN.js              |   0
 .../src/js/select2/i18n/zh-TW.js              |   0
 .../src/js/select2/keys.js                    |   0
 .../src/js/select2/options.js                 |   0
 .../src/js/select2/results.js                 |   0
 .../src/js/select2/selection/allowClear.js    |   6 +-
 .../src/js/select2/selection/base.js          |  21 ++
 .../src/js/select2/selection/clickMask.js     |   0
 .../src/js/select2/selection/eventRelay.js    |   0
 .../src/js/select2/selection/multiple.js      |   2 +-
 .../src/js/select2/selection/placeholder.js   |   0
 .../src/js/select2/selection/search.js        |   0
 .../src/js/select2/selection/single.js        |   0
 .../js/select2/selection/stopPropagation.js   |   0
 .../src/js/select2/translation.js             |   0
 .../src/js/select2/utils.js                   |   0
 .../src/js/wrapper.end.js                     |   0
 .../src/js/wrapper.start.js                   |   0
 .../src/scss/_dropdown.scss                   |   0
 .../src/scss/_multiple.scss                   |   0
 .../src/scss/_single.scss                     |   0
 .../src/scss/core.scss                        |   0
 .../src/scss/mixins/_gradients.scss           |   0
 .../src/scss/theme/classic/_defaults.scss     |   0
 .../src/scss/theme/classic/_multiple.scss     |   0
 .../src/scss/theme/classic/_single.scss       |   0
 .../src/scss/theme/classic/layout.scss        |   0
 .../src/scss/theme/default/_multiple.scss     |   0
 .../src/scss/theme/default/_single.scss       |   0
 .../src/scss/theme/default/layout.scss        |   0
 .../tests/a11y/selection-tests.js             |   0
 .../tests/data/array-tests.js                 |   0
 .../tests/data/base-tests.js                  |   0
 .../tests/data/inputData-tests.js             |   0
 .../tests/data/maximumInputLength-tests.js    |   0
 .../data/maximumSelectionLength-tests.js      |   0
 .../tests/data/minimumInputLength-tests.js    |   0
 .../tests/data/select-tests.js                |  52 +++--
 .../tests/data/tags-tests.js                  |   0
 .../tests/data/tokenizer-tests.js             |   0
 .../tests/dropdown/dropdownCss-tests.js       |   0
 .../tests/dropdown/dropdownParent-tests.js    |   0
 .../tests/dropdown/positioning-tests.js       |   0
 .../tests/dropdown/search-a11y-tests.js       |   0
 .../tests/dropdown/selectOnClose-tests.js     |   0
 .../tests/dropdown/stopPropagation-tests.js   |   0
 .../tests/helpers.js                          |   0
 .../tests/integration-jq1.html                |   0
 .../tests/integration-jq2.html                |   0
 .../tests/integration-jq3.html                |   0
 .../tests/integration/dom-changes.js          |  44 ++++
 .../tests/integration/jquery-calls.js         |   0
 .../tests/integration/select2-methods.js      |   0
 .../tests/options/ajax-tests.js               |   0
 .../tests/options/data-tests.js               |   0
 .../tests/options/deprecated-tests.js         |   0
 .../tests/options/translation-tests.js        |   0
 .../tests/options/width-tests.js              |   0
 .../tests/results/a11y-tests.js               |   0
 .../tests/results/focusing-tests.js           |   0
 .../tests/results/infiniteScroll-tests.js     |   0
 .../tests/results/option-tests.js             |   0
 .../tests/selection/allowClear-tests.js       |   0
 .../tests/selection/containerCss-tests.js     |   0
 .../tests/selection/focusing-tests.js         |   0
 .../tests/selection/multiple-tests.js         |   0
 .../tests/selection/openOnKeyDown-tests.js    | 188 ++++++++++++++++++
 .../tests/selection/placeholder-tests.js      |   0
 .../tests/selection/search-a11y-tests.js      |   0
 .../selection/search-placeholder-tests.js     |   0
 .../tests/selection/search-tests.js           |   0
 .../tests/selection/single-tests.js           |   0
 .../tests/selection/stopPropagation-tests.js  |   0
 .../tests/unit-jq1.html                       |   1 +
 .../tests/unit-jq2.html                       |   1 +
 .../tests/unit-jq3.html                       |   1 +
 .../tests/utils/data-tests.js                 |   0
 .../tests/utils/decorator-tests.js            |   0
 .../tests/utils/escapeMarkup-tests.js         |   0
 .../tests/vendor/jquery-1.7.2.js              |   0
 .../tests/vendor/jquery-2.2.4.js              |   0
 .../tests/vendor/jquery-3.4.1.js              |   0
 .../tests/vendor/qunit-1.23.1.css             |   0
 .../tests/vendor/qunit-1.23.1.js              |   0
 netbox/templates/base.html                    |  16 +-
 702 files changed, 662 insertions(+), 165 deletions(-)
 delete mode 100755 netbox/project-static/clipboard.js/clipboard-2.0.4.min.js
 create mode 100644 netbox/project-static/clipboard.js/clipboard-2.0.6.min.js
 delete mode 100644 netbox/project-static/jquery/jquery-3.4.1.min.js
 create mode 100644 netbox/project-static/jquery/jquery-3.5.1.min.js
 delete mode 100644 netbox/project-static/select2-4.0.12/.github/FUNDING.yml
 delete mode 100644 netbox/project-static/select2-4.0.12/dist/js/select2.full.min.js
 delete mode 100644 netbox/project-static/select2-4.0.12/dist/js/select2.min.js
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.editorconfig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/CONTRIBUTING.md (100%)
 create mode 100644 netbox/project-static/select2-4.0.13/.github/FUNDING.yml
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/ISSUE_TEMPLATE.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/PULL_REQUEST_TEMPLATE.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/stale.yml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/workflows/docs-deploy.yml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/workflows/main.yml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.github/workflows/package-deploy.yml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.gitignore (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.jshintignore (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/.jshintrc (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/CHANGELOG.md (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/Gruntfile.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/LICENSE.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/README.md (66%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/bower.json (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/component.json (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/composer.json (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/css/select2.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/css/select2.min.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/af.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ar.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/az.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/bg.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/bn.js (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/bs.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ca.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/cs.js (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/da.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/de.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/dsb.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/el.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/en.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/es.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/et.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/eu.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/fa.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/fi.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/fr.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/gl.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/he.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/hi.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/hr.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/hsb.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/hu.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/hy.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/id.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/is.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/it.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ja.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ka.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/km.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ko.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/lt.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/lv.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/mk.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ms.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/nb.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ne.js (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/nl.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/pl.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ps.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/pt-BR.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/pt.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ro.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/ru.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sk.js (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sl.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sq.js (92%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sr-Cyrl.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sr.js (93%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/sv.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/th.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/tk.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/tr.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/uk.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/vi.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/zh-CN.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/i18n/zh-TW.js (90%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/select2.full.js (98%)
 create mode 100644 netbox/project-static/select2-4.0.13/dist/js/select2.full.min.js
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/dist/js/select2.js (98%)
 create mode 100644 netbox/project-static/select2-4.0.13/dist/js/select2.min.js
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/LICENSE.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/accounts/.gitkeep (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/assets/rtfm-screenshot.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/config/plugins/anchors.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/config/plugins/highlight.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/config/plugins/simplesearch.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/config/site.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/config/system.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/data/.gitkeep (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/localhost/config/security.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/localhost/config/system.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/01.getting-started/01.installation/docs.md (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/01.getting-started/02.basic-usage/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/01.getting-started/03.builds-and-modules/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/01.getting-started/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/02.troubleshooting/01.getting-help/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/02.troubleshooting/02.common-problems/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/02.troubleshooting/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/03.configuration/01.options-api/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/03.configuration/02.defaults/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/03.configuration/03.data-attributes/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/03.configuration/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/04.appearance/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/05.options/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/06.data-sources/01.formats/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/06.data-sources/02.ajax/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/06.data-sources/03.arrays/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/06.data-sources/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/07.dropdown/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/08.selections/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/09.tagging/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/10.placeholders/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/11.searching/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/12.programmatic-control/01.add-select-clear-items/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/12.programmatic-control/02.retrieving-selections/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/12.programmatic-control/03.methods/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/12.programmatic-control/04.events/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/12.programmatic-control/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/13.i18n/docs.md (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/01.adapters-and-decorators/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/01.selection/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/02.array/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/03.ajax/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/04.data/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/05.results/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/06.dropdown/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/02.default-adapters/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/14.advanced/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/15.upgrading/01.new-in-40/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/15.upgrading/02.migrating-from-35/docs.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/15.upgrading/chapter.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ak.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/al.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ar.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/az.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ca.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/co.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ct.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/de.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/fl.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ga.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/hi.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ia.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/id.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/il.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/in.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ks.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ky.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/la.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ma.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/md.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/me.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/mi.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/mn.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/mo.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ms.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/mt.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nc.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nd.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ne.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nh.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nj.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nm.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/nv.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ny.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/oh.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ok.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/or.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/pa.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ri.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/sc.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/sd.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/tn.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/tx.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/ut.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/va.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/vt.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/wa.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/wi.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/wv.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/flags/wy.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/pages/images/logo.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/.gitkeep (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/anchors.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/anchors.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/anchors/js/anchor.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/assets/readme_1.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/breadcrumbs.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/breadcrumbs.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/classes/breadcrumbs.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/css/breadcrumbs.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/breadcrumbs/templates/partials/breadcrumbs.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/assets/readme_1.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/cli/LogCommand.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/error.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/error.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/languages.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/pages/error.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/templates/error.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/error/templates/error.json.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/assets/readme_1.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/agate.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/androidstudio.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/arduino-light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/arta.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/ascetic.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-cave.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-cave.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-dune.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-dune.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-estuary.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-estuary.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-forest.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-forest.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-heath.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-heath.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-lakeside.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-lakeside.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-plateau.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-plateau.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-savanna.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-savanna.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-seaside.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-seaside.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-sulphurpool.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/atelier-sulphurpool.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/brown-paper.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/codepen-embed.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/color-brewer.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/darkula.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/default.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/docco.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/far.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/foundation.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/github-gist.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/github.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/googlecode.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/grayscale.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/hopscotch.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/hybrid.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/idea.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/ir-black.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/kimbie.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/kimbie.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/learn.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/magula.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/mono-blue.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/monokai-sublime.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/monokai.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/obsidian.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/paraiso-dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/paraiso-light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/paraiso.dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/paraiso.light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/pojoaque.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/railscasts.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/rainbow.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/school-book.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/solarized-dark.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/solarized-light.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/sunburst.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/tomorrow-night-blue.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/tomorrow-night-bright.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/tomorrow-night-eighties.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/tomorrow-night.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/tomorrow.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/vs.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/xcode.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/css/zenburn.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/highlight.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/highlight.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/js/highlight.pack.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/highlight/js/highlightjs-line-numbers.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/assets/readme_1.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/css/problems.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/css/template.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/html/problems.html (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/problems.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/problems/problems.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/assets/readme_1.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/assets/search.svg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/css/simplesearch.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/js/simplesearch.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/languages.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/pages/simplesearch.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/simplesearch.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/simplesearch.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/templates/partials/simplesearch_base.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/templates/partials/simplesearch_item.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/templates/partials/simplesearch_searchbox.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/templates/simplesearch_results.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/plugins/simplesearch/templates/simplesearch_results.json.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/screenshot.jpg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/.gitkeep (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/CHANGELOG.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/LICENSE (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/README.md (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/blueprints.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/blueprints/chapter.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/blueprints/docs.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css-compiled/nucleus.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css-compiled/nucleus.css.map (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css-compiled/theme.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css-compiled/theme.css.map (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css/featherlight.min.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css/font-awesome.min.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css/nucleus-ie10.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css/nucleus-ie9.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/css/pure-0.5.0/grids-min.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/fonts/fontawesome-webfont.eot (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/fonts/fontawesome-webfont.svg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/fonts/fontawesome-webfont.ttf (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/fonts/fontawesome-webfont.woff (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/fonts/fontawesome-webfont.woff2 (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/images/clippy.svg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/images/favicon.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/images/logo.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/clipboard.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/featherlight.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/html5shiv-printshiv.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/jquery.scrollbar.min.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/learn.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/js/modernizr.custom.71422.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/languages.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/learn2.php (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/learn2.yaml (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/screenshot.jpg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss.sh (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_base.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_breakpoints.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_core.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_layout.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_nav.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/nucleus/_typography.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/theme/_base.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/theme/_bullets.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/configuration/theme/_colors.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/_core.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/_flex.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/_forms.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/_typography.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/functions/_base.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/functions/_direction.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/functions/_range.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/mixins/_base.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/mixins/_breakpoints.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/mixins/_utilities.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/particles/_align-text.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/nucleus/particles/_visibility.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_bullets.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_buttons.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_configuration.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_core.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_custom.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_fonts.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_forms.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_header.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_main.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_nav.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_scrollbar.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_tables.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_tooltips.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/_typography.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/modules/_base.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/theme/modules/_buttons.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/_bourbon.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_button.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_position.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_rem.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_size.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_animation.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_background.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_calc.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_columns.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_filter.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_transform.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_transition.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_assign.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/chapter.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/default.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/docs.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/error.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/analytics.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/base.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/github_link.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/github_note.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/logo.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/metadata.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/page.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/templates/partials/sidebar.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/learn2/thumbnail.jpg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/css/s2-docs.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/css/theme.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/android-chrome-36x36.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/android-chrome-48x48.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/android-chrome-72x72.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/apple-touch-icon-57x57.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/apple-touch-icon-60x60.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/apple-touch-icon-72x72.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/apple-touch-icon-precomposed.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/apple-touch-icon.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/favicon-16x16.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/favicon-32x32.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/favicon.ico (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/favicon.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/manifest.json (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/mstile-150x150.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/mstile-310x150.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/mstile-70x70.png (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/images/safari-pinned-tab.svg (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/js/data-fill-from.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/site.yaml (65%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/templates/partials/base.html.twig (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/templates/partials/js/source-states.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/templates/partials/logo.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/docs/themes/site/templates/partials/sidebar.html.twig (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/package.json (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/banner.end.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/banner.start.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/jquery.mousewheel.shim.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/jquery.select2.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/jquery.shim.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/containerCss.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/dropdownCss.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/initSelection.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/inputData.js (94%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/matcher.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/query.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/compat/utils.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/core.js (91%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/ajax.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/array.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/base.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/maximumInputLength.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/maximumSelectionLength.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/minimumInputLength.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/select.js (95%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/tags.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/data/tokenizer.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/defaults.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/diacritics.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/attachBody.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/attachContainer.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/closeOnSelect.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/hidePlaceholder.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/infiniteScroll.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/minimumResultsForSearch.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/search.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/selectOnClose.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/dropdown/stopPropagation.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/af.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ar.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/az.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/bg.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/bn.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/bs.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ca.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/cs.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/da.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/de.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/dsb.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/el.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/en.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/es.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/et.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/eu.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/fa.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/fi.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/fr.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/gl.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/he.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/hi.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/hr.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/hsb.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/hu.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/hy.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/id.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/is.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/it.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ja.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ka.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/km.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ko.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/lt.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/lv.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/mk.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ms.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/nb.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ne.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/nl.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/pl.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ps.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/pt-BR.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/pt.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ro.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/ru.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sk.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sl.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sq.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sr-Cyrl.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sr.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/sv.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/th.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/tk.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/tr.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/uk.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/vi.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/zh-CN.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/i18n/zh-TW.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/keys.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/options.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/results.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/allowClear.js (96%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/base.js (87%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/clickMask.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/eventRelay.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/multiple.js (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/placeholder.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/search.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/single.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/selection/stopPropagation.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/translation.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/select2/utils.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/wrapper.end.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/js/wrapper.start.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/_dropdown.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/_multiple.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/_single.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/core.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/mixins/_gradients.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/classic/_defaults.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/classic/_multiple.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/classic/_single.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/classic/layout.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/default/_multiple.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/default/_single.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/src/scss/theme/default/layout.scss (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/a11y/selection-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/array-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/base-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/inputData-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/maximumInputLength-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/maximumSelectionLength-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/minimumInputLength-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/select-tests.js (90%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/tags-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/data/tokenizer-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/dropdownCss-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/dropdownParent-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/positioning-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/search-a11y-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/selectOnClose-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/dropdown/stopPropagation-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/helpers.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration-jq1.html (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration-jq2.html (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration-jq3.html (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration/dom-changes.js (87%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration/jquery-calls.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/integration/select2-methods.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/options/ajax-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/options/data-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/options/deprecated-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/options/translation-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/options/width-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/results/a11y-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/results/focusing-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/results/infiniteScroll-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/results/option-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/allowClear-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/containerCss-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/focusing-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/multiple-tests.js (100%)
 create mode 100644 netbox/project-static/select2-4.0.13/tests/selection/openOnKeyDown-tests.js
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/placeholder-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/search-a11y-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/search-placeholder-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/search-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/single-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/selection/stopPropagation-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/unit-jq1.html (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/unit-jq2.html (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/unit-jq3.html (98%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/utils/data-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/utils/decorator-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/utils/escapeMarkup-tests.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/vendor/jquery-1.7.2.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/vendor/jquery-2.2.4.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/vendor/jquery-3.4.1.js (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/vendor/qunit-1.23.1.css (100%)
 rename netbox/project-static/{select2-4.0.12 => select2-4.0.13}/tests/vendor/qunit-1.23.1.js (100%)

diff --git a/netbox/project-static/clipboard.js/clipboard-2.0.4.min.js b/netbox/project-static/clipboard.js/clipboard-2.0.4.min.js
deleted file mode 100755
index 02c549e35..000000000
--- a/netbox/project-static/clipboard.js/clipboard-2.0.4.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * clipboard.js v2.0.4
- * https://zenorocha.github.io/clipboard.js
- * 
- * Licensed MIT © Zeno Rocha
- */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(n){var o={};function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}return r.m=n,r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=0)}([function(t,e,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=o(n(1)),c=o(n(3)),u=o(n(4));function o(t){return t&&t.__esModule?t:{default:t}}var l=function(t){function o(t,e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o);var n=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(o.__proto__||Object.getPrototypeOf(o)).call(this));return n.resolveOptions(e),n.listenClick(t),n}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(o,c.default),i(o,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===r(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=(0,u.default)(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new a.default({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return s("action",t)}},{key:"defaultTarget",value:function(t){var e=s("target",t);if(e)return document.querySelector(e)}},{key:"defaultText",value:function(t){return s("text",t)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported;return e.forEach(function(t){n=n&&!!document.queryCommandSupported(t)}),n}}]),o}();function s(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}t.exports=l},function(t,e,n){"use strict";var o,r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=n(2),c=(o=a)&&o.__esModule?o:{default:o};var u=function(){function e(t){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e),this.resolveOptions(t),this.initSelection()}return i(e,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=(0,c.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=(0,c.default)(this.target),this.copyText()}},{key:"copyText",value:function(){var e=void 0;try{e=document.execCommand(this.action)}catch(t){e=!1}this.handleResult(e)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),e}();t.exports=u},function(t,e){t.exports=function(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}return e}},function(t,e){function n(){}n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,a=o.length;i<a;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=n},function(t,e,n){var d=n(5),h=n(6);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!d.string(e))throw new TypeError("Second argument must be a String");if(!d.fn(n))throw new TypeError("Third argument must be a Function");if(d.node(t))return s=e,f=n,(l=t).addEventListener(s,f),{destroy:function(){l.removeEventListener(s,f)}};if(d.nodeList(t))return a=t,c=e,u=n,Array.prototype.forEach.call(a,function(t){t.addEventListener(c,u)}),{destroy:function(){Array.prototype.forEach.call(a,function(t){t.removeEventListener(c,u)})}};if(d.string(t))return o=t,r=e,i=n,h(document.body,o,r,i);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,a,c,u,l,s,f}},function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e,n){var a=n(7);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=a(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},function(t,e){if("undefined"!=typeof Element&&!Element.prototype.matches){var n=Element.prototype;n.matches=n.matchesSelector||n.mozMatchesSelector||n.msMatchesSelector||n.oMatchesSelector||n.webkitMatchesSelector}t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}}])});
\ No newline at end of file
diff --git a/netbox/project-static/clipboard.js/clipboard-2.0.6.min.js b/netbox/project-static/clipboard.js/clipboard-2.0.6.min.js
new file mode 100644
index 000000000..1e6a96f4e
--- /dev/null
+++ b/netbox/project-static/clipboard.js/clipboard-2.0.6.min.js
@@ -0,0 +1,7 @@
+/*!
+ * clipboard.js v2.0.6
+ * https://clipboardjs.com/
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return o={},r.m=n=[function(t,e){t.exports=function(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}return e}},function(t,e){function n(){}n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,a=o.length;i<a;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=n,t.exports.TinyEmitter=n},function(t,e,n){var d=n(3),h=n(4);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!d.string(e))throw new TypeError("Second argument must be a String");if(!d.fn(n))throw new TypeError("Third argument must be a Function");if(d.node(t))return s=e,f=n,(u=t).addEventListener(s,f),{destroy:function(){u.removeEventListener(s,f)}};if(d.nodeList(t))return a=t,c=e,l=n,Array.prototype.forEach.call(a,function(t){t.addEventListener(c,l)}),{destroy:function(){Array.prototype.forEach.call(a,function(t){t.removeEventListener(c,l)})}};if(d.string(t))return o=t,r=e,i=n,h(document.body,o,r,i);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,a,c,l,u,s,f}},function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e,n){var a=n(5);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=a(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},function(t,e){if("undefined"!=typeof Element&&!Element.prototype.matches){var n=Element.prototype;n.matches=n.matchesSelector||n.mozMatchesSelector||n.msMatchesSelector||n.oMatchesSelector||n.webkitMatchesSelector}t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}},function(t,e,n){"use strict";n.r(e);var o=n(0),r=n.n(o),i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t};function a(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}function c(t){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,c),this.resolveOptions(t),this.initSelection()}var l=(function(t,e,n){return e&&a(t.prototype,e),n&&a(t,n),t}(c,[{key:"resolveOptions",value:function(t){var e=0<arguments.length&&void 0!==t?t:{};this.action=e.action,this.container=e.container,this.emitter=e.emitter,this.target=e.target,this.text=e.text,this.trigger=e.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=r()(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=r()(this.target),this.copyText()}},{key:"copyText",value:function(){var e=void 0;try{e=document.execCommand(this.action)}catch(t){e=!1}this.handleResult(e)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),document.activeElement.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(t){var e=0<arguments.length&&void 0!==t?t:"copy";if(this._action=e,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":i(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),c),u=n(1),s=n.n(u),f=n(2),d=n.n(f),h="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},p=function(t,e,n){return e&&y(t.prototype,e),n&&y(t,n),t};function y(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var m=(function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(v,s.a),p(v,[{key:"resolveOptions",value:function(t){var e=0<arguments.length&&void 0!==t?t:{};this.action="function"==typeof e.action?e.action:this.defaultAction,this.target="function"==typeof e.target?e.target:this.defaultTarget,this.text="function"==typeof e.text?e.text:this.defaultText,this.container="object"===h(e.container)?e.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=d()(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new l({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return b("action",t)}},{key:"defaultTarget",value:function(t){var e=b("target",t);if(e)return document.querySelector(e)}},{key:"defaultText",value:function(t){return b("text",t)}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(t){var e=0<arguments.length&&void 0!==t?t:["copy","cut"],n="string"==typeof e?[e]:e,o=!!document.queryCommandSupported;return n.forEach(function(t){o=o&&!!document.queryCommandSupported(t)}),o}}]),v);function v(t,e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,v);var n=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(v.__proto__||Object.getPrototypeOf(v)).call(this));return n.resolveOptions(e),n.listenClick(t),n}function b(t,e){var n="data-clipboard-"+t;if(e.hasAttribute(n))return e.getAttribute(n)}e.default=m}],r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=6).default;function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}var n,o});
diff --git a/netbox/project-static/jquery/jquery-3.4.1.min.js b/netbox/project-static/jquery/jquery-3.4.1.min.js
deleted file mode 100644
index a1c07fd80..000000000
--- a/netbox/project-static/jquery/jquery-3.4.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/netbox/project-static/jquery/jquery-3.5.1.min.js b/netbox/project-static/jquery/jquery-3.5.1.min.js
new file mode 100644
index 000000000..b0614034a
--- /dev/null
+++ b/netbox/project-static/jquery/jquery-3.5.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/netbox/project-static/select2-4.0.12/.github/FUNDING.yml b/netbox/project-static/select2-4.0.12/.github/FUNDING.yml
deleted file mode 100644
index 8dbfc7e6d..000000000
--- a/netbox/project-static/select2-4.0.12/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-github: ['kevin-brown']
diff --git a/netbox/project-static/select2-4.0.12/dist/js/select2.full.min.js b/netbox/project-static/select2-4.0.12/dist/js/select2.full.min.js
deleted file mode 100644
index 9982db5aa..000000000
--- a/netbox/project-static/select2-4.0.12/dist/js/select2.full.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(d){var e=function(){if(d&&d.fn&&d.fn.select2&&d.fn.select2.amd)var e=d.fn.select2.amd;var t,n,i,h,o,s,f,g,m,v,y,_,r,a,w,l;function b(e,t){return r.call(e,t)}function c(e,t){var n,i,r,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(i=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(r=(r=f[h.slice(0,d).join("/")])&&r[i]){o=r,a=u;break}if(o)break;!l&&g&&g[i]&&(l=g[i],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function S(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function u(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function D(e){return e?u(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},r=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,i=u(e),r=i[0],o=t[1];return e=i[1],r&&(n=S(r=c(r,o))),r?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return c(e,t)}}(o)):c(e,o):(r=(i=u(e=c(e,o)))[0],e=i[1],r&&(n=S(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,i){var r,o,s,a,l,c,u,d=[],p=typeof n;if(c=D(i=i||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)r=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=S(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(i,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(r&&r.exports!==h&&r.exports!==m[e]?m[e]=r.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,i,r){if("string"==typeof e)return g[e]?g[e](t):S(f(e,D(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=i,i=r),i?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(i=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=i),e.define("almond",function(){}),e.define("jquery",[],function(){var e=d||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var r={};function u(e){var t=e.prototype,n=[];for(var i in t){"function"==typeof t[i]&&"constructor"!==i&&n.push(i)}return n}r.Extend=function(e,t){var n={}.hasOwnProperty;function i(){this.constructor=e}for(var r in t)n.call(t,r)&&(e[r]=t[r]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},r.Decorate=function(i,r){var e=u(r),t=u(i);function o(){var e=Array.prototype.unshift,t=r.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=r.prototype.constructor),n.apply(this,arguments)}r.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=i.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=r.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},r.Observable=e,r.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},r.bind=function(e,t){return function(){e.apply(t,arguments)}},r._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var r=0;r<n.length;r++){var o=n[r];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),r==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},r.hasScroll=function(e,t){var n=o(t),i=t.style.overflowX,r=t.style.overflowY;return(i!==r||"hidden"!==r&&"visible"!==r)&&("scroll"===i||"scroll"===r||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},r.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},r.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},r.__cache={};var n=0;return r.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},r.StoreData=function(e,t,n){var i=r.GetUniqueElementId(e);r.__cache[i]||(r.__cache[i]={}),r.__cache[i][t]=n},r.GetData=function(e,t){var n=r.GetUniqueElementId(e);return t?r.__cache[n]&&null!=r.__cache[n][t]?r.__cache[n][t]:o(e).data(t):r.__cache[n]},r.RemoveData=function(e){var t=r.GetUniqueElementId(e);null!=r.__cache[t]&&delete r.__cache[t],e.removeAttribute("data-select2-id")},r}),e.define("select2/results",["jquery","./utils"],function(h,f){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return f.Extend(i,f.Observable),i.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],r=this.option(i);t.push(r)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,i)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},i.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var r in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[r];t.setAttribute(r,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},i.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var i=n-1;0===e.length&&(i=0);var r=t.eq(i);r.trigger("mouseenter");var o=l.$results.offset().top,s=r.offset().top,a=l.$results.scrollTop()+(s-o);0===i?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var i=t.eq(n);i.trigger("mouseenter");var r=l.$results.offset().top+l.$results.outerHeight(!1),o=i.offset().top+i.outerHeight(!1),s=l.$results.scrollTop()+o-r;0===n?l.$results.scrollTop(0):r<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,i=0<e.deltaY&&t-e.deltaY<=0,r=e.deltaY<0&&n<=l.$results.height();i?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):r&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,i=e.offset().top,r=this.$results.scrollTop()+(i-n),o=i-n;r-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(r)}},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),r=n(e,t);null==r?t.style.display="none":"string"==typeof r?t.innerHTML=i(r):h(t).append(r)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,r){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===r.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function r(){r.__super__.constructor.apply(this,arguments)}return n.Extend(r,t),r.prototype.render=function(){var e=r.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},r.prototype.bind=function(t,e){var n=this;r.__super__.bind.apply(this,arguments);var i=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",i).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},r.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},r.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},r.prototype.selectionContainer=function(){return e("<span></span>")},r.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),i=this.display(t,n);n.empty().append(i);var r=t.title||t.text;r?n.attr("title",r):n.removeAttr("title")}else this.clear()},r}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(r,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var i=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){i.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!i.options.get("disabled")){var t=r(this).parent(),n=l.GetData(t[0],"data");i.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return r('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var i=e[n],r=this.selectionContainer(),o=this.display(i,r);r.append(o);var s=i.title||i.text;s&&r.attr("title",s),l.StoreData(r[0],"data",i),t.push(r)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var i=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(i)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(r,i,a){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.options.get("disabled")){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=a.GetData(n[0],"data"),r=this.$element.val();this.$element.val(this.placeholder.id);var o={data:i};if(this.trigger("clear",o),o.prevented)this.$element.val(r);else{for(var s=0;s<i.length;s++)if(o={data:i[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(r);this.$element.trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),i=r('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(i[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(i)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=i('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),t.on("open",function(){i.$search.attr("aria-controls",r),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search.prop("disabled",!1),i._transferTabIndex()}),t.on("disable",function(){i.$search.prop("disabled",!0)}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===i.$search.val()){var t=i.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");i.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)i.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&i.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var i=this,r=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,r)){t=t||{};var n=s.Event("select2:"+e,{params:t});i.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){if(!(e in i._cache)){var t=n(e);i._cache[e]=t}return new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(i){function n(e,t){n.__super__.constructor.call(this)}return i.Extend(n,i.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=i.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+i.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],i=this;this.$element.find(":selected").each(function(){var e=l(this),t=i.item(e);n.push(t)}),e(n)},n.prototype.select=function(r){var o=this;if(r.selected=!0,l(r.element).is("option"))return r.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(r=[r]).push.apply(r,e);for(var n=0;n<r.length;n++){var i=r[n].id;-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("change")});else{var e=r.id;this.$element.val(e),this.$element.trigger("change")}},n.prototype.unselect=function(r){var o=this;if(this.$element.prop("multiple")){if(r.selected=!1,l(r.element).is("option"))return r.element.selected=!1,void this.$element.trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==r.id&&-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(i,e){var r=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(i,t);null!==n&&r.push(n)}}),e({results:r})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),i=this._normalizeItem(e);return i.element=t,a.StoreData(t,"data",i),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),i=[],r=0;r<n.length;r++){var o=l(n[r]),s=this.item(o);i.push(s)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return f.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(g(this)).id}).get(),r=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,i)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}r.push(p)}}return r},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var i=o.ajax(e);return i.then(t),i.fail(n),i}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,i){var r=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=r.processResults(e,n);r.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),i(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||r.trigger("results:message",{message:"errorLoading"})});r._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var i=n.get("tags"),r=n.get("createTag");void 0!==r&&(this.createTag=r);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(i))for(var s=0;s<i.length;s++){var a=i[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var i=t.results,r=0;r<i.length;r++){var o=i[r],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=i,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(i,a)}t.results=i,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=i.option(t);n.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([n])}!function(e){i.trigger("select",{data:e})}(t)});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var r=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,r)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(i(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var i=this;this.current(function(e){var t=null!=e?e.length:0;0<i.maximumSelectionLength&&t>=i.maximumSelectionLength?i.trigger("results:message",{message:"maximumSelected",args:{maximum:i.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search.attr("tabindex",0),i.$search.attr("aria-controls",r),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search.attr("tabindex",-1),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer.removeClass("select2-search--hide"):i.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var r=t[i];this.placeholder.id===r.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,r="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(i,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(i+" "+r+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,r="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+i+" "+r)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),i=null,r=this.$container.offset();r.bottom=r.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=r.top,o.bottom=r.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<r.top-s,u=l>r.bottom+s,d={left:r.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(i="below"),u||!c||t?!c&&u&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(d.top=o.top-h.top-s),null!=i&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+i),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+i)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var r=t[i];r.children?n+=e(r.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var i=this.getHighlightedResults();if(!(i.length<1)){var r=o.GetData(i[0],"data");null!=r.element&&r.element.selected||null==r.element&&r.selected||this.trigger("select",{data:r})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,w,$,b,A,x,S,D,C,E,O,T,q,j,L,I,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=$:null!=e.data?e.dataAdapter=w:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,L))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=C;else{var i=y.Decorate(C,E);e.dropdownAdapter=i}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,I)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var r=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,r)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var i=c.extend(!0,{},n),r=n.children.length-1;0<=r;r--)null==e(t,n.children[r])&&i.children.splice(r,1);return 0<i.children.length?i:e(t,i)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,r=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(r),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],i=0;i<t.length;i++)if(n.push(t[i]),"string"==typeof t[i]&&0<t[i].indexOf("-")){var r=t[i].split("-")[0];n.push(r)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,i=0;i<e.length;i++){var r=new s,o=e[i];if("string"==typeof o)try{r=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,r=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else r=c.isPlainObject(o)?new s(o):o;n.extend(r)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var i=y._convertData(n);c.extend(!0,this.defaults,i)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(i,d,r,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=r.applyFromElement(this.options,t)),this.options=r.apply(this.options),t&&t.is("input")){var n=i(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function i(e,t){return t.toUpperCase()}for(var r=0;r<e[0].attributes.length;r++){var o=e[0].attributes[r].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,i)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(r,c,u,i){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var i=this.options.get("dataAdapter");this.dataAdapter=new i(e,this.options);var r=this.render();this._placeContainer(r);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,r);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,r);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var i=this._resolveWidth(e,"style");return null!=i?i:this._resolveWidth(e,"element")}if("element"==t){var r=e.outerWidth(!1);return r<=0?"auto":r+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){r.each(e,t._syncA),r.each(e,t._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===r.inArray(e,i)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.TAB||t===i.UP&&e.altKey?(n.close(),e.preventDefault()):t===i.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._syncSubtree=function(e,t){var n=!1,i=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var r=0;r<t.addedNodes.length;r++){t.addedNodes[r].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length&&(n=!0);else n=!0;n&&this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})})}},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var r=i[e],o={prevented:!1,name:e,args:t};if(n.call(this,r,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.trigger("query",{})},d.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];r.isArray(t)&&(t=r.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=r('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("select2/compat/utils",["jquery"],function(s){return{syncCssClasses:function(e,t,n){var i,r,o=[];(i=s.trim(e.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0===this.indexOf("select2-")&&o.push(this)}),(i=s.trim(t.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(r=n(this))&&o.push(r)}),e.attr("class",o.join(" "))}}}),e.define("select2/compat/containerCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("containerCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptContainerCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("containerCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/dropdownCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("dropdownCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptDropdownCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("dropdownCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/initSelection",["jquery"],function(i){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=n.get("initSelection"),this._isInitialized=!1,e.call(this,t,n)}return e.prototype.current=function(e,t){var n=this;this._isInitialized?e.call(this,t):this.initSelection.call(null,this.$element,function(e){n._isInitialized=!0,i.isArray(e)||(e=[e]),t(e)})},e}),e.define("select2/compat/inputData",["jquery","../utils"],function(s,i){function e(e,t,n){this._currentData=[],this._valueSeparator=n.get("valueSeparator")||",","hidden"===t.prop("type")&&n.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),e.call(this,t,n)}return e.prototype.current=function(e,t){function i(e,t){var n=[];return e.selected||-1!==s.inArray(e.id,t)?(e.selected=!0,n.push(e)):e.selected=!1,e.children&&n.push.apply(n,i(e.children,t)),n}for(var n=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r];n.push.apply(n,i(o,this.$element.val().split(this._valueSeparator)))}t(n)},e.prototype.select=function(e,t){if(this.options.get("multiple")){var n=this.$element.val();n+=this._valueSeparator+t.id,this.$element.val(n),this.$element.trigger("change")}else this.current(function(e){s.map(e,function(e){e.selected=!1})}),this.$element.val(t.id),this.$element.trigger("change")},e.prototype.unselect=function(e,r){var o=this;r.selected=!1,this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n];r.id!=i.id&&t.push(i.id)}o.$element.val(t.join(o._valueSeparator)),o.$element.trigger("change")})},e.prototype.query=function(e,t,n){for(var i=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r],s=this.matches(t,o);null!==s&&i.push(s)}n({results:i})},e.prototype.addOptions=function(e,t){var n=s.map(t,function(e){return i.GetData(e[0],"data")});this._currentData.push.apply(this._currentData,n)},e}),e.define("select2/compat/matcher",["jquery"],function(s){return function(o){return function(e,t){var n=s.extend(!0,{},t);if(null==e.term||""===s.trim(e.term))return n;if(t.children){for(var i=t.children.length-1;0<=i;i--){var r=t.children[i];o(e.term,r.text,r)||n.children.splice(i,1)}if(0<n.children.length)return n}return o(e.term,t.text,t)?n:null}}}),e.define("select2/compat/query",[],function(){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.callback=n,this.options.get("query").call(null,t)},e}),e.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t.addClass("select2-dropdown--below"),n.addClass("select2-container--below")},e}),e.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),e.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),l=function(p){var h,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(p.event.fixHooks)for(var n=e.length;n;)p.event.fixHooks[e[--n]]=p.event.mouseHooks;var m=p.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,!1);else this.onmousewheel=i;p.data(this,"mousewheel-line-height",m.getLineHeight(this)),p.data(this,"mousewheel-page-height",m.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],i,!1);else this.onmousewheel=null;p.removeData(this,"mousewheel-line-height"),p.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=p(e),n=t["offsetParent"in p.fn?"offsetParent":"parent"]();return n.length||(n=p("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return p(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n=e||window.event,i=g.call(arguments,1),r=0,o=0,s=0,a=0,l=0;if((e=p.event.fix(n)).type="mousewheel","detail"in n&&(s=-1*n.detail),"wheelDelta"in n&&(s=n.wheelDelta),"wheelDeltaY"in n&&(s=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*s,s=0),r=0===s?o:s,"deltaY"in n&&(r=s=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===s&&(r=-1*o)),0!==s||0!==o){if(1===n.deltaMode){var c=p.data(this,"mousewheel-line-height");r*=c,s*=c,o*=c}else if(2===n.deltaMode){var u=p.data(this,"mousewheel-page-height");r*=u,s*=u,o*=u}if(t=Math.max(Math.abs(s),Math.abs(o)),(!f||t<f)&&y(n,f=t)&&(f/=40),y(n,t)&&(r/=40,o/=40,s/=40),r=Math[1<=r?"floor":"ceil"](r/f),o=Math[1<=o?"floor":"ceil"](o/f),s=Math[1<=s?"floor":"ceil"](s/f),m.settings.normalizeOffset&&this.getBoundingClientRect){var d=this.getBoundingClientRect();a=e.clientX-d.left,l=e.clientY-d.top}return e.deltaX=o,e.deltaY=s,e.deltaFactor=f,e.offsetX=a,e.offsetY=l,e.deltaMode=0,i.unshift(e,r,o,s),h&&clearTimeout(h),h=setTimeout(v,200),(p.event.dispatch||p.event.handle).apply(this,i)}}function v(){f=null}function y(e,t){return m.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}p.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof e.define&&e.define.amd?e.define("jquery-mousewheel",["jquery"],l):"object"==typeof exports?module.exports=l:l(d),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(r,e,o,t,s){if(null==r.fn.select2){var a=["open","close","destroy"];r.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=r.extend(!0,{},t);new o(r(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,i=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<r.inArray(t,a)?this:n}}return null==r.fn.select2.defaults&&(r.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return d.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/select2.min.js b/netbox/project-static/select2-4.0.12/dist/js/select2.min.js
deleted file mode 100644
index ffd491cc8..000000000
--- a/netbox/project-static/select2-4.0.12/dist/js/select2.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,w;function b(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,r=c(e),i=r[0],o=t[1];return e=r[1],i&&(n=D(i=l(i,o))),i?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return l(e,t)}}(o)):l(e,o):(i=(r=c(e=l(e,o)))[0],e=r[1],i&&(n=D(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.options.get("disabled")){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.options.get("disabled")){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var r=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t=r._normalizeItem(e);if(!r.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=r.option(t);n.attr("data-select2-tag",!0),r._removeOldTags(),r.addOptions([n])}!function(e){r.trigger("select",{data:e})}(t)});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,w,b,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=w:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(i,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){i.each(e,t._syncA),i.each(e,t._syncS)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===i.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._syncSubtree=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length&&(n=!0);else n=!0;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})}},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.trigger("query",{})},d.prototype.close=function(){this.isOpen()&&this.trigger("close",{})},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];i.isArray(t)&&(t=i.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=i('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/.editorconfig b/netbox/project-static/select2-4.0.13/.editorconfig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.editorconfig
rename to netbox/project-static/select2-4.0.13/.editorconfig
diff --git a/netbox/project-static/select2-4.0.12/.github/CONTRIBUTING.md b/netbox/project-static/select2-4.0.13/.github/CONTRIBUTING.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/CONTRIBUTING.md
rename to netbox/project-static/select2-4.0.13/.github/CONTRIBUTING.md
diff --git a/netbox/project-static/select2-4.0.13/.github/FUNDING.yml b/netbox/project-static/select2-4.0.13/.github/FUNDING.yml
new file mode 100644
index 000000000..d8a62dbc7
--- /dev/null
+++ b/netbox/project-static/select2-4.0.13/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: kevin-brown
+open_collective: select2
diff --git a/netbox/project-static/select2-4.0.12/.github/ISSUE_TEMPLATE.md b/netbox/project-static/select2-4.0.13/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/ISSUE_TEMPLATE.md
rename to netbox/project-static/select2-4.0.13/.github/ISSUE_TEMPLATE.md
diff --git a/netbox/project-static/select2-4.0.12/.github/PULL_REQUEST_TEMPLATE.md b/netbox/project-static/select2-4.0.13/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/PULL_REQUEST_TEMPLATE.md
rename to netbox/project-static/select2-4.0.13/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/netbox/project-static/select2-4.0.12/.github/stale.yml b/netbox/project-static/select2-4.0.13/.github/stale.yml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/stale.yml
rename to netbox/project-static/select2-4.0.13/.github/stale.yml
diff --git a/netbox/project-static/select2-4.0.12/.github/workflows/docs-deploy.yml b/netbox/project-static/select2-4.0.13/.github/workflows/docs-deploy.yml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/workflows/docs-deploy.yml
rename to netbox/project-static/select2-4.0.13/.github/workflows/docs-deploy.yml
diff --git a/netbox/project-static/select2-4.0.12/.github/workflows/main.yml b/netbox/project-static/select2-4.0.13/.github/workflows/main.yml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/workflows/main.yml
rename to netbox/project-static/select2-4.0.13/.github/workflows/main.yml
diff --git a/netbox/project-static/select2-4.0.12/.github/workflows/package-deploy.yml b/netbox/project-static/select2-4.0.13/.github/workflows/package-deploy.yml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.github/workflows/package-deploy.yml
rename to netbox/project-static/select2-4.0.13/.github/workflows/package-deploy.yml
diff --git a/netbox/project-static/select2-4.0.12/.gitignore b/netbox/project-static/select2-4.0.13/.gitignore
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.gitignore
rename to netbox/project-static/select2-4.0.13/.gitignore
diff --git a/netbox/project-static/select2-4.0.12/.jshintignore b/netbox/project-static/select2-4.0.13/.jshintignore
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.jshintignore
rename to netbox/project-static/select2-4.0.13/.jshintignore
diff --git a/netbox/project-static/select2-4.0.12/.jshintrc b/netbox/project-static/select2-4.0.13/.jshintrc
similarity index 100%
rename from netbox/project-static/select2-4.0.12/.jshintrc
rename to netbox/project-static/select2-4.0.13/.jshintrc
diff --git a/netbox/project-static/select2-4.0.12/CHANGELOG.md b/netbox/project-static/select2-4.0.13/CHANGELOG.md
similarity index 98%
rename from netbox/project-static/select2-4.0.12/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/CHANGELOG.md
index c620e4d44..d6b2a7587 100644
--- a/netbox/project-static/select2-4.0.12/CHANGELOG.md
+++ b/netbox/project-static/select2-4.0.13/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+## 4.0.13
+
+### New features / improvements
+
+* Trigger `input` event before `change` events (#4649)
+* Feed back the keypress code that was responsible for the 'close' event (#5513)
+* Only trigger `selection:update` once on DOM change events (#5734)
+
+### Bug fixes
+
+* Prevent opening of disabled elements (#5751)
+
+### Documentation
+
+* Fix "edit this page" links in docs (#5689)
+
+### Miscellaneous
+
+* Registered Select2 on Open Collective (#5700, #5721, #5741)
+
 ## 4.0.12
 
 ### Bug fixes
diff --git a/netbox/project-static/select2-4.0.12/Gruntfile.js b/netbox/project-static/select2-4.0.13/Gruntfile.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/Gruntfile.js
rename to netbox/project-static/select2-4.0.13/Gruntfile.js
diff --git a/netbox/project-static/select2-4.0.12/LICENSE.md b/netbox/project-static/select2-4.0.13/LICENSE.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/LICENSE.md
rename to netbox/project-static/select2-4.0.13/LICENSE.md
diff --git a/netbox/project-static/select2-4.0.12/README.md b/netbox/project-static/select2-4.0.13/README.md
similarity index 66%
rename from netbox/project-static/select2-4.0.12/README.md
rename to netbox/project-static/select2-4.0.13/README.md
index bd215280d..a27484fa4 100644
--- a/netbox/project-static/select2-4.0.12/README.md
+++ b/netbox/project-static/select2-4.0.13/README.md
@@ -1,7 +1,7 @@
 Select2
 =======
 ![Build Status][github-actions-image]
-[![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)][cdnjs]
+[![Financial Contributors on Open Collective](https://opencollective.com/select2/all/badge.svg?label=financial+contributors)](https://opencollective.com/select2) [![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)][cdnjs]
 [![jsdelivr](https://data.jsdelivr.com/v1/package/npm/select2/badge)][jsdelivr]
 
 Select2 is a jQuery-based replacement for select boxes. It supports searching,
@@ -125,3 +125,33 @@ The license is available within the repository in the [LICENSE][license] file.
 [wicketstuff-select2]: https://github.com/wicketstuff/core/tree/master/select2-parent
 [yii2]: http://www.yiiframework.com/
 [yii2-widget-select2]: https://github.com/kartik-v/yii2-widget-select2
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](.github/CONTRIBUTING.md)].
+<a href="https://github.com/select2/select2/graphs/contributors"><img src="https://opencollective.com/select2/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/select2/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/select2"><img src="https://opencollective.com/select2/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/select2/contribute)]
+
+<a href="https://opencollective.com/select2/organization/0/website"><img src="https://opencollective.com/select2/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/1/website"><img src="https://opencollective.com/select2/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/2/website"><img src="https://opencollective.com/select2/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/3/website"><img src="https://opencollective.com/select2/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/4/website"><img src="https://opencollective.com/select2/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/5/website"><img src="https://opencollective.com/select2/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/6/website"><img src="https://opencollective.com/select2/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/7/website"><img src="https://opencollective.com/select2/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/8/website"><img src="https://opencollective.com/select2/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/select2/organization/9/website"><img src="https://opencollective.com/select2/organization/9/avatar.svg"></a>
diff --git a/netbox/project-static/select2-4.0.12/bower.json b/netbox/project-static/select2-4.0.13/bower.json
similarity index 100%
rename from netbox/project-static/select2-4.0.12/bower.json
rename to netbox/project-static/select2-4.0.13/bower.json
diff --git a/netbox/project-static/select2-4.0.12/component.json b/netbox/project-static/select2-4.0.13/component.json
similarity index 95%
rename from netbox/project-static/select2-4.0.12/component.json
rename to netbox/project-static/select2-4.0.13/component.json
index 3cfaf0c6e..a8e74c524 100644
--- a/netbox/project-static/select2-4.0.12/component.json
+++ b/netbox/project-static/select2-4.0.13/component.json
@@ -2,7 +2,7 @@
   "name": "select2",
   "repo": "select/select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "version": "4.0.12",
+  "version": "4.0.13",
   "demo": "https://select2.org/",
   "keywords": [
     "jquery"
diff --git a/netbox/project-static/select2-4.0.12/composer.json b/netbox/project-static/select2-4.0.13/composer.json
similarity index 100%
rename from netbox/project-static/select2-4.0.12/composer.json
rename to netbox/project-static/select2-4.0.13/composer.json
diff --git a/netbox/project-static/select2-4.0.12/dist/css/select2.css b/netbox/project-static/select2-4.0.13/dist/css/select2.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/dist/css/select2.css
rename to netbox/project-static/select2-4.0.13/dist/css/select2.css
diff --git a/netbox/project-static/select2-4.0.12/dist/css/select2.min.css b/netbox/project-static/select2-4.0.13/dist/css/select2.min.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/dist/css/select2.min.css
rename to netbox/project-static/select2-4.0.13/dist/css/select2.min.css
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/af.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/af.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/af.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/af.js
index 60a2ef329..32e5ac7de 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/af.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/af.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/af",[],function(){return{errorLoading:function(){return"Die resultate kon nie gelaai word nie."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Verwyders asseblief "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Voer asseblief "+(e.minimum-e.input.length)+" of meer karakters"},loadingMore:function(){return"Meer resultate word gelaai…"},maximumSelected:function(e){var n="Kies asseblief net "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"Geen resultate gevind"},searching:function(){return"Besig…"},removeAllItems:function(){return"Verwyder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ar.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ar.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ar.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ar.js
index 5866da06a..64e1caad3 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ar.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ar.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ar",[],function(){return{errorLoading:function(){return"لا يمكن تحميل النتائج"},inputTooLong:function(n){return"الرجاء حذف "+(n.input.length-n.maximum)+" عناصر"},inputTooShort:function(n){return"الرجاء إضافة "+(n.minimum-n.input.length)+" عناصر"},loadingMore:function(){return"جاري تحميل نتائج إضافية..."},maximumSelected:function(n){return"تستطيع إختيار "+n.maximum+" بنود فقط"},noResults:function(){return"لم يتم العثور على أي نتائج"},searching:function(){return"جاري البحث…"},removeAllItems:function(){return"قم بإزالة كل العناصر"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/az.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/az.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/az.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/az.js
index f15047a50..1d52c260f 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/az.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/az.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/az",[],function(){return{inputTooLong:function(n){return n.input.length-n.maximum+" simvol silin"},inputTooShort:function(n){return n.minimum-n.input.length+" simvol daxil edin"},loadingMore:function(){return"Daha çox nəticə yüklənir…"},maximumSelected:function(n){return"Sadəcə "+n.maximum+" element seçə bilərsiniz"},noResults:function(){return"Nəticə tapılmadı"},searching:function(){return"Axtarılır…"},removeAllItems:function(){return"Bütün elementləri sil"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/bg.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/bg.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/bg.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/bg.js
index ad8915ee4..73b730a70 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/bg.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/bg.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bg",[],function(){return{inputTooLong:function(n){var e=n.input.length-n.maximum,u="Моля въведете с "+e+" по-малко символ";return e>1&&(u+="a"),u},inputTooShort:function(n){var e=n.minimum-n.input.length,u="Моля въведете още "+e+" символ";return e>1&&(u+="a"),u},loadingMore:function(){return"Зареждат се още…"},maximumSelected:function(n){var e="Можете да направите до "+n.maximum+" ";return n.maximum>1?e+="избора":e+="избор",e},noResults:function(){return"Няма намерени съвпадения"},searching:function(){return"Търсене…"},removeAllItems:function(){return"Премахнете всички елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/bn.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/bn.js
similarity index 95%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/bn.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/bn.js
index e2a3926a9..2d17b9d8e 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/bn.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/bn.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/bn",[],function(){return{errorLoading:function(){return"ফলাফলগুলি লোড করা যায়নি।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="অনুগ্রহ করে "+e+" টি অক্ষর মুছে দিন।";return 1!=e&&(u="অনুগ্রহ করে "+e+" টি অক্ষর মুছে দিন।"),u},inputTooShort:function(n){return n.minimum-n.input.length+" টি অক্ষর অথবা অধিক অক্ষর লিখুন।"},loadingMore:function(){return"আরো ফলাফল লোড হচ্ছে ..."},maximumSelected:function(n){var e=n.maximum+" টি আইটেম নির্বাচন করতে পারবেন।";return 1!=n.maximum&&(e=n.maximum+" টি আইটেম নির্বাচন করতে পারবেন।"),e},noResults:function(){return"কোন ফলাফল পাওয়া যায়নি।"},searching:function(){return"অনুসন্ধান করা হচ্ছে ..."}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/bs.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/bs.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/bs.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/bs.js
index 89a88988f..46b084d75 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/bs.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/bs.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/bs",[],function(){function e(e,n,r,t){return e%10==1&&e%100!=11?n:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspijelo."},inputTooLong:function(n){var r=n.input.length-n.maximum,t="Obrišite "+r+" simbol";return t+=e(r,"","a","a")},inputTooShort:function(n){var r=n.minimum-n.input.length,t="Ukucajte bar još "+r+" simbol";return t+=e(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(n){var r="Možete izabrati samo "+n.maximum+" stavk";return r+=e(n.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Uklonite sve stavke"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ca.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ca.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ca.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ca.js
index 9e9e5ab97..82dbbb7a2 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ca.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ca.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ca",[],function(){return{errorLoading:function(){return"La càrrega ha fallat"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Si us plau, elimina "+n+" car";return r+=1==n?"àcter":"àcters"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Si us plau, introdueix "+n+" car";return r+=1==n?"àcter":"àcters"},loadingMore:function(){return"Carregant més resultats…"},maximumSelected:function(e){var n="Només es pot seleccionar "+e.maximum+" element";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No s'han trobat resultats"},searching:function(){return"Cercant…"},removeAllItems:function(){return"Treu tots els elements"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/cs.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/cs.js
similarity index 95%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/cs.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/cs.js
index 3b05cec10..7116d6c1d 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/cs.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/cs.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/cs",[],function(){function e(e,n){switch(e){case 2:return n?"dva":"dvě";case 3:return"tři";case 4:return"čtyři"}return""}return{errorLoading:function(){return"Výsledky nemohly být načteny."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadejte o jeden znak méně.":t<=4?"Prosím, zadejte o "+e(t,!0)+" znaky méně.":"Prosím, zadejte o "+t+" znaků méně."},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadejte ještě jeden znak.":t<=4?"Prosím, zadejte ještě další "+e(t,!0)+" znaky.":"Prosím, zadejte ještě dalších "+t+" znaků."},loadingMore:function(){return"Načítají se další výsledky…"},maximumSelected:function(n){var t=n.maximum;return 1==t?"Můžete zvolit jen jednu položku.":t<=4?"Můžete zvolit maximálně "+e(t,!1)+" položky.":"Můžete zvolit maximálně "+t+" položek."},noResults:function(){return"Nenalezeny žádné položky."},searching:function(){return"Vyhledávání…"},removeAllItems:function(){return"Odstraňte všechny položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/da.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/da.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/da.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/da.js
index cfa74f485..cda32c34a 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/da.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/da.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/da",[],function(){return{errorLoading:function(){return"Resultaterne kunne ikke indlæses."},inputTooLong:function(e){return"Angiv venligst "+(e.input.length-e.maximum)+" tegn mindre"},inputTooShort:function(e){return"Angiv venligst "+(e.minimum-e.input.length)+" tegn mere"},loadingMore:function(){return"Indlæser flere resultater…"},maximumSelected:function(e){var n="Du kan kun vælge "+e.maximum+" emne";return 1!=e.maximum&&(n+="r"),n},noResults:function(){return"Ingen resultater fundet"},searching:function(){return"Søger…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/de.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/de.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/de.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/de.js
index 57e210f81..c2e61e580 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/de.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/de.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/de",[],function(){return{errorLoading:function(){return"Die Ergebnisse konnten nicht geladen werden."},inputTooLong:function(e){return"Bitte "+(e.input.length-e.maximum)+" Zeichen weniger eingeben"},inputTooShort:function(e){return"Bitte "+(e.minimum-e.input.length)+" Zeichen mehr eingeben"},loadingMore:function(){return"Lade mehr Ergebnisse…"},maximumSelected:function(e){var n="Sie können nur "+e.maximum+" Element";return 1!=e.maximum&&(n+="e"),n+=" auswählen"},noResults:function(){return"Keine Übereinstimmungen gefunden"},searching:function(){return"Suche…"},removeAllItems:function(){return"Entferne alle Elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/dsb.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/dsb.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/dsb.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/dsb.js
index 7bee0a002..02f283aba 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/dsb.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/dsb.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/dsb",[],function(){var n=["znamuško","znamušce","znamuška","znamuškow"],e=["zapisk","zapiska","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njejsu se dali zacytaś."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Pšosym lašuj "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Pšosym zapódaj nanejmjenjej "+a+" "+u(a,n)},loadingMore:function(){return"Dalšne wuslědki se zacytaju…"},maximumSelected:function(n){return"Móžoš jano "+n.maximum+" "+u(n.maximum,e)+"wubraś."},noResults:function(){return"Žedne wuslědki namakane"},searching:function(){return"Pyta se…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/el.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/el.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/el.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/el.js
index d345ab213..d4922a1df 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/el.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/el.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/el",[],function(){return{errorLoading:function(){return"Τα αποτελέσματα δεν μπόρεσαν να φορτώσουν."},inputTooLong:function(n){var e=n.input.length-n.maximum,u="Παρακαλώ διαγράψτε "+e+" χαρακτήρ";return 1==e&&(u+="α"),1!=e&&(u+="ες"),u},inputTooShort:function(n){return"Παρακαλώ συμπληρώστε "+(n.minimum-n.input.length)+" ή περισσότερους χαρακτήρες"},loadingMore:function(){return"Φόρτωση περισσότερων αποτελεσμάτων…"},maximumSelected:function(n){var e="Μπορείτε να επιλέξετε μόνο "+n.maximum+" επιλογ";return 1==n.maximum&&(e+="ή"),1!=n.maximum&&(e+="ές"),e},noResults:function(){return"Δεν βρέθηκαν αποτελέσματα"},searching:function(){return"Αναζήτηση…"},removeAllItems:function(){return"Καταργήστε όλα τα στοιχεία"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/en.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/en.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/en.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/en.js
index 5b99c9668..3b1928573 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/en.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/en.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Please delete "+n+" character";return 1!=n&&(r+="s"),r},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var n="You can only select "+e.maximum+" item";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/es.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/es.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/es.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/es.js
index 2354519b8..68afd6d25 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/es.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/es.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/es",[],function(){return{errorLoading:function(){return"No se pudieron cargar los resultados"},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Por favor, elimine "+n+" car";return r+=1==n?"ácter":"acteres"},inputTooShort:function(e){var n=e.minimum-e.input.length,r="Por favor, introduzca "+n+" car";return r+=1==n?"ácter":"acteres"},loadingMore:function(){return"Cargando más resultados…"},maximumSelected:function(e){var n="Sólo puede seleccionar "+e.maximum+" elemento";return 1!=e.maximum&&(n+="s"),n},noResults:function(){return"No se encontraron resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Eliminar todos los elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/et.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/et.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/et.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/et.js
index af186735b..070b61a26 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/et.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/et.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/et",[],function(){return{inputTooLong:function(e){var n=e.input.length-e.maximum,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" vähem"},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Sisesta "+n+" täht";return 1!=n&&(t+="e"),t+=" rohkem"},loadingMore:function(){return"Laen tulemusi…"},maximumSelected:function(e){var n="Saad vaid "+e.maximum+" tulemus";return 1==e.maximum?n+="e":n+="t",n+=" valida"},noResults:function(){return"Tulemused puuduvad"},searching:function(){return"Otsin…"},removeAllItems:function(){return"Eemalda kõik esemed"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/eu.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/eu.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/eu.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/eu.js
index 96751ad4b..90d5e73f8 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/eu.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/eu.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/eu",[],function(){return{inputTooLong:function(e){var t=e.input.length-e.maximum,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gutxiago"},inputTooShort:function(e){var t=e.minimum-e.input.length,n="Idatzi ";return n+=1==t?"karaktere bat":t+" karaktere",n+=" gehiago"},loadingMore:function(){return"Emaitza gehiago kargatzen…"},maximumSelected:function(e){return 1===e.maximum?"Elementu bakarra hauta dezakezu":e.maximum+" elementu hauta ditzakezu soilik"},noResults:function(){return"Ez da bat datorrenik aurkitu"},searching:function(){return"Bilatzen…"},removeAllItems:function(){return"Kendu elementu guztiak"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/fa.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/fa.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/fa.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/fa.js
index 0180ad1b7..e1ffdbed0 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/fa.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/fa.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fa",[],function(){return{errorLoading:function(){return"امکان بارگذاری نتایج وجود ندارد."},inputTooLong:function(n){return"لطفاً "+(n.input.length-n.maximum)+" کاراکتر را حذف نمایید"},inputTooShort:function(n){return"لطفاً تعداد "+(n.minimum-n.input.length)+" کاراکتر یا بیشتر وارد نمایید"},loadingMore:function(){return"در حال بارگذاری نتایج بیشتر..."},maximumSelected:function(n){return"شما تنها می‌توانید "+n.maximum+" آیتم را انتخاب نمایید"},noResults:function(){return"هیچ نتیجه‌ای یافت نشد"},searching:function(){return"در حال جستجو..."},removeAllItems:function(){return"همه موارد را حذف کنید"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/fi.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/fi.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/fi.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/fi.js
index 630144e10..ffed1247d 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/fi.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/fi.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/fi",[],function(){return{errorLoading:function(){return"Tuloksia ei saatu ladattua."},inputTooLong:function(n){return"Ole hyvä ja anna "+(n.input.length-n.maximum)+" merkkiä vähemmän"},inputTooShort:function(n){return"Ole hyvä ja anna "+(n.minimum-n.input.length)+" merkkiä lisää"},loadingMore:function(){return"Ladataan lisää tuloksia…"},maximumSelected:function(n){return"Voit valita ainoastaan "+n.maximum+" kpl"},noResults:function(){return"Ei tuloksia"},searching:function(){return"Haetaan…"},removeAllItems:function(){return"Poista kaikki kohteet"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/fr.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/fr.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/fr.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/fr.js
index 5c7c285f9..dd02f973f 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/fr.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/fr.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/fr",[],function(){return{errorLoading:function(){return"Les résultats ne peuvent pas être chargés."},inputTooLong:function(e){var n=e.input.length-e.maximum;return"Supprimez "+n+" caractère"+(n>1?"s":"")},inputTooShort:function(e){var n=e.minimum-e.input.length;return"Saisissez au moins "+n+" caractère"+(n>1?"s":"")},loadingMore:function(){return"Chargement de résultats supplémentaires…"},maximumSelected:function(e){return"Vous pouvez seulement sélectionner "+e.maximum+" élément"+(e.maximum>1?"s":"")},noResults:function(){return"Aucun résultat trouvé"},searching:function(){return"Recherche en cours…"},removeAllItems:function(){return"Supprimer tous les éléments"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/gl.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/gl.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/gl.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/gl.js
index 6a78d84c9..208a00570 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/gl.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/gl.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/gl",[],function(){return{errorLoading:function(){return"Non foi posíbel cargar os resultados."},inputTooLong:function(e){var n=e.input.length-e.maximum;return 1===n?"Elimine un carácter":"Elimine "+n+" caracteres"},inputTooShort:function(e){var n=e.minimum-e.input.length;return 1===n?"Engada un carácter":"Engada "+n+" caracteres"},loadingMore:function(){return"Cargando máis resultados…"},maximumSelected:function(e){return 1===e.maximum?"Só pode seleccionar un elemento":"Só pode seleccionar "+e.maximum+" elementos"},noResults:function(){return"Non se atoparon resultados"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Elimina todos os elementos"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/he.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/he.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/he.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/he.js
index 2904dd221..25a8805aa 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/he.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/he.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/he",[],function(){return{errorLoading:function(){return"שגיאה בטעינת התוצאות"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="נא למחוק ";return r+=1===e?"תו אחד":e+" תווים"},inputTooShort:function(n){var e=n.minimum-n.input.length,r="נא להכניס ";return r+=1===e?"תו אחד":e+" תווים",r+=" או יותר"},loadingMore:function(){return"טוען תוצאות נוספות…"},maximumSelected:function(n){var e="באפשרותך לבחור עד ";return 1===n.maximum?e+="פריט אחד":e+=n.maximum+" פריטים",e},noResults:function(){return"לא נמצאו תוצאות"},searching:function(){return"מחפש…"},removeAllItems:function(){return"הסר את כל הפריטים"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/hi.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/hi.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/hi.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/hi.js
index 9428c29cf..f3ed79843 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/hi.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/hi.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hi",[],function(){return{errorLoading:function(){return"परिणामों को लोड नहीं किया जा सका।"},inputTooLong:function(n){var e=n.input.length-n.maximum,r=e+" अक्षर को हटा दें";return e>1&&(r=e+" अक्षरों को हटा दें "),r},inputTooShort:function(n){return"कृपया "+(n.minimum-n.input.length)+" या अधिक अक्षर दर्ज करें"},loadingMore:function(){return"अधिक परिणाम लोड हो रहे है..."},maximumSelected:function(n){return"आप केवल "+n.maximum+" आइटम का चयन कर सकते हैं"},noResults:function(){return"कोई परिणाम नहीं मिला"},searching:function(){return"खोज रहा है..."},removeAllItems:function(){return"सभी वस्तुओं को हटा दें"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/hr.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/hr.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/hr.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/hr.js
index 3a5ede48f..cb3268db1 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/hr.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/hr.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hr",[],function(){function n(n){var e=" "+n+" znak";return n%10<5&&n%10>0&&(n%100<5||n%100>19)?n%10>1&&(e+="a"):e+="ova",e}return{errorLoading:function(){return"Preuzimanje nije uspjelo."},inputTooLong:function(e){return"Unesite "+n(e.input.length-e.maximum)},inputTooShort:function(e){return"Unesite još "+n(e.minimum-e.input.length)},loadingMore:function(){return"Učitavanje rezultata…"},maximumSelected:function(n){return"Maksimalan broj odabranih stavki je "+n.maximum},noResults:function(){return"Nema rezultata"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Ukloni sve stavke"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/hsb.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/hsb.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/hsb.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/hsb.js
index 160318e8e..3d5bf09db 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/hsb.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/hsb.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hsb",[],function(){var n=["znamješko","znamješce","znamješka","znamješkow"],e=["zapisk","zapiskaj","zapiski","zapiskow"],u=function(n,e){return 1===n?e[0]:2===n?e[1]:n>2&&n<=4?e[2]:n>=5?e[3]:void 0};return{errorLoading:function(){return"Wuslědki njedachu so začitać."},inputTooLong:function(e){var a=e.input.length-e.maximum;return"Prošu zhašej "+a+" "+u(a,n)},inputTooShort:function(e){var a=e.minimum-e.input.length;return"Prošu zapodaj znajmjeńša "+a+" "+u(a,n)},loadingMore:function(){return"Dalše wuslědki so začitaja…"},maximumSelected:function(n){return"Móžeš jenož "+n.maximum+" "+u(n.maximum,e)+"wubrać"},noResults:function(){return"Žane wuslědki namakane"},searching:function(){return"Pyta so…"},removeAllItems:function(){return"Remove all items"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/hu.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/hu.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/hu.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/hu.js
index 73debe098..4893aa2f7 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/hu.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/hu.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/hu",[],function(){return{errorLoading:function(){return"Az eredmények betöltése nem sikerült."},inputTooLong:function(e){return"Túl hosszú. "+(e.input.length-e.maximum)+" karakterrel több, mint kellene."},inputTooShort:function(e){return"Túl rövid. Még "+(e.minimum-e.input.length)+" karakter hiányzik."},loadingMore:function(){return"Töltés…"},maximumSelected:function(e){return"Csak "+e.maximum+" elemet lehet kiválasztani."},noResults:function(){return"Nincs találat."},searching:function(){return"Keresés…"},removeAllItems:function(){return"Távolítson el minden elemet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/hy.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/hy.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/hy.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/hy.js
index d7f11dcd0..823000714 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/hy.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/hy.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/hy",[],function(){return{errorLoading:function(){return"Արդյունքները հնարավոր չէ բեռնել։"},inputTooLong:function(n){return"Խնդրում ենք հեռացնել "+(n.input.length-n.maximum)+" նշան"},inputTooShort:function(n){return"Խնդրում ենք մուտքագրել "+(n.minimum-n.input.length)+" կամ ավել նշաններ"},loadingMore:function(){return"Բեռնվում են նոր արդյունքներ․․․"},maximumSelected:function(n){return"Դուք կարող եք ընտրել առավելագույնը "+n.maximum+" կետ"},noResults:function(){return"Արդյունքներ չեն գտնվել"},searching:function(){return"Որոնում․․․"},removeAllItems:function(){return"Հեռացնել բոլոր տարրերը"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/id.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/id.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/id.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/id.js
index f9479b602..4a0b3bf00 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/id.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/id.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/id",[],function(){return{errorLoading:function(){return"Data tidak boleh diambil."},inputTooLong:function(n){return"Hapuskan "+(n.input.length-n.maximum)+" huruf"},inputTooShort:function(n){return"Masukkan "+(n.minimum-n.input.length)+" huruf lagi"},loadingMore:function(){return"Mengambil data…"},maximumSelected:function(n){return"Anda hanya dapat memilih "+n.maximum+" pilihan"},noResults:function(){return"Tidak ada data yang sesuai"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Hapus semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/is.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/is.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/is.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/is.js
index b6770703e..cca5bbecf 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/is.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/is.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/is",[],function(){return{inputTooLong:function(n){var t=n.input.length-n.maximum,e="Vinsamlegast styttið texta um "+t+" staf";return t<=1?e:e+"i"},inputTooShort:function(n){var t=n.minimum-n.input.length,e="Vinsamlegast skrifið "+t+" staf";return t>1&&(e+="i"),e+=" í viðbót"},loadingMore:function(){return"Sæki fleiri niðurstöður…"},maximumSelected:function(n){return"Þú getur aðeins valið "+n.maximum+" atriði"},noResults:function(){return"Ekkert fannst"},searching:function(){return"Leita…"},removeAllItems:function(){return"Fjarlægðu öll atriði"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/it.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/it.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/it.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/it.js
index 05f87cf04..507c7d9f2 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/it.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/it.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/it",[],function(){return{errorLoading:function(){return"I risultati non possono essere caricati."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Per favore cancella "+n+" caratter";return t+=1!==n?"i":"e"},inputTooShort:function(e){return"Per favore inserisci "+(e.minimum-e.input.length)+" o più caratteri"},loadingMore:function(){return"Caricando più risultati…"},maximumSelected:function(e){var n="Puoi selezionare solo "+e.maximum+" element";return 1!==e.maximum?n+="i":n+="o",n},noResults:function(){return"Nessun risultato trovato"},searching:function(){return"Sto cercando…"},removeAllItems:function(){return"Rimuovi tutti gli oggetti"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ja.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ja.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ja.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ja.js
index 3f546061e..451025e2c 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ja.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ja.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ja",[],function(){return{errorLoading:function(){return"結果が読み込まれませんでした"},inputTooLong:function(n){return n.input.length-n.maximum+" 文字を削除してください"},inputTooShort:function(n){return"少なくとも "+(n.minimum-n.input.length)+" 文字を入力してください"},loadingMore:function(){return"読み込み中…"},maximumSelected:function(n){return n.maximum+" 件しか選択できません"},noResults:function(){return"対象が見つかりません"},searching:function(){return"検索しています…"},removeAllItems:function(){return"すべてのアイテムを削除"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ka.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ka.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ka.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ka.js
index 5d3ca4acc..60c593b70 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ka.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ka.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ka",[],function(){return{errorLoading:function(){return"მონაცემების ჩატვირთვა შეუძლებელია."},inputTooLong:function(n){return"გთხოვთ აკრიფეთ "+(n.input.length-n.maximum)+" სიმბოლოთი ნაკლები"},inputTooShort:function(n){return"გთხოვთ აკრიფეთ "+(n.minimum-n.input.length)+" სიმბოლო ან მეტი"},loadingMore:function(){return"მონაცემების ჩატვირთვა…"},maximumSelected:function(n){return"თქვენ შეგიძლიათ აირჩიოთ არაუმეტეს "+n.maximum+" ელემენტი"},noResults:function(){return"რეზულტატი არ მოიძებნა"},searching:function(){return"ძიება…"},removeAllItems:function(){return"ამოიღე ყველა ელემენტი"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/km.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/km.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/km.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/km.js
index bd78a0d3e..4dca94f41 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/km.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/km.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/km",[],function(){return{errorLoading:function(){return"មិនអាចទាញយកទិន្នន័យ"},inputTooLong:function(n){return"សូមលុបចេញ  "+(n.input.length-n.maximum)+" អក្សរ"},inputTooShort:function(n){return"សូមបញ្ចូល"+(n.minimum-n.input.length)+" អក្សរ រឺ ច្រើនជាងនេះ"},loadingMore:function(){return"កំពុងទាញយកទិន្នន័យបន្ថែម..."},maximumSelected:function(n){return"អ្នកអាចជ្រើសរើសបានតែ "+n.maximum+" ជម្រើសប៉ុណ្ណោះ"},noResults:function(){return"មិនមានលទ្ធផល"},searching:function(){return"កំពុងស្វែងរក..."},removeAllItems:function(){return"លុបធាតុទាំងអស់"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ko.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ko.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ko.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ko.js
index 91a470aa6..f2880fb00 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ko.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ko.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 깁니다. "+(n.input.length-n.maximum)+" 글자 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글자 더 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선택 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/lt.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/lt.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/lt.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/lt.js
index ece6f6927..f6a42155a 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/lt.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/lt.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/lt",[],function(){function n(n,e,i,t){return n%10==1&&(n%100<11||n%100>19)?e:n%10>=2&&n%10<=9&&(n%100<11||n%100>19)?i:t}return{inputTooLong:function(e){var i=e.input.length-e.maximum,t="Pašalinkite "+i+" simbol";return t+=n(i,"į","ius","ių")},inputTooShort:function(e){var i=e.minimum-e.input.length,t="Įrašykite dar "+i+" simbol";return t+=n(i,"į","ius","ių")},loadingMore:function(){return"Kraunama daugiau rezultatų…"},maximumSelected:function(e){var i="Jūs galite pasirinkti tik "+e.maximum+" element";return i+=n(e.maximum,"ą","us","ų")},noResults:function(){return"Atitikmenų nerasta"},searching:function(){return"Ieškoma…"},removeAllItems:function(){return"Pašalinti visus elementus"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/lv.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/lv.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/lv.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/lv.js
index 815d799b0..806dc5c43 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/lv.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/lv.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/lv",[],function(){function e(e,n,u,i){return 11===e?n:e%10==1?u:i}return{inputTooLong:function(n){var u=n.input.length-n.maximum,i="Lūdzu ievadiet par  "+u;return(i+=" simbol"+e(u,"iem","u","iem"))+" mazāk"},inputTooShort:function(n){var u=n.minimum-n.input.length,i="Lūdzu ievadiet vēl "+u;return i+=" simbol"+e(u,"us","u","us")},loadingMore:function(){return"Datu ielāde…"},maximumSelected:function(n){var u="Jūs varat izvēlēties ne vairāk kā "+n.maximum;return u+=" element"+e(n.maximum,"us","u","us")},noResults:function(){return"Sakritību nav"},searching:function(){return"Meklēšana…"},removeAllItems:function(){return"Noņemt visus vienumus"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/mk.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/mk.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/mk.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/mk.js
index 79e870e4f..cb7b84a26 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/mk.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/mk.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/mk",[],function(){return{inputTooLong:function(n){var e=(n.input.length,n.maximum,"Ве молиме внесете "+n.maximum+" помалку карактер");return 1!==n.maximum&&(e+="и"),e},inputTooShort:function(n){var e=(n.minimum,n.input.length,"Ве молиме внесете уште "+n.maximum+" карактер");return 1!==n.maximum&&(e+="и"),e},loadingMore:function(){return"Вчитување резултати…"},maximumSelected:function(n){var e="Можете да изберете само "+n.maximum+" ставк";return 1===n.maximum?e+="а":e+="и",e},noResults:function(){return"Нема пронајдено совпаѓања"},searching:function(){return"Пребарување…"},removeAllItems:function(){return"Отстрани ги сите предмети"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ms.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ms.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ms.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ms.js
index d3feef2b5..6bd7eaa3e 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ms.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ms.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ms",[],function(){return{errorLoading:function(){return"Keputusan tidak berjaya dimuatkan."},inputTooLong:function(n){return"Sila hapuskan "+(n.input.length-n.maximum)+" aksara"},inputTooShort:function(n){return"Sila masukkan "+(n.minimum-n.input.length)+" atau lebih aksara"},loadingMore:function(){return"Sedang memuatkan keputusan…"},maximumSelected:function(n){return"Anda hanya boleh memilih "+n.maximum+" pilihan"},noResults:function(){return"Tiada padanan yang ditemui"},searching:function(){return"Mencari…"},removeAllItems:function(){return"Keluarkan semua item"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/nb.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/nb.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/nb.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/nb.js
index 953ff21e4..25d89c687 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/nb.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/nb.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nb",[],function(){return{errorLoading:function(){return"Kunne ikke hente resultater."},inputTooLong:function(e){return"Vennligst fjern "+(e.input.length-e.maximum)+" tegn"},inputTooShort:function(e){return"Vennligst skriv inn "+(e.minimum-e.input.length)+" tegn til"},loadingMore:function(){return"Laster flere resultater…"},maximumSelected:function(e){return"Du kan velge maks "+e.maximum+" elementer"},noResults:function(){return"Ingen treff"},searching:function(){return"Søker…"},removeAllItems:function(){return"Fjern alle elementer"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ne.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ne.js
similarity index 95%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ne.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ne.js
index 536fbab84..1c39f6721 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ne.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ne.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ne",[],function(){return{errorLoading:function(){return"नतिजाहरु देखाउन सकिएन।"},inputTooLong:function(n){var e=n.input.length-n.maximum,u="कृपया "+e+" अक्षर मेटाउनुहोस्।";return 1!=e&&(u+="कृपया "+e+" अक्षरहरु मेटाउनुहोस्।"),u},inputTooShort:function(n){return"कृपया बाँकी रहेका "+(n.minimum-n.input.length)+" वा अरु धेरै अक्षरहरु भर्नुहोस्।"},loadingMore:function(){return"अरु नतिजाहरु भरिँदैछन् …"},maximumSelected:function(n){var e="तँपाई "+n.maximum+" वस्तु मात्र छान्न पाउँनुहुन्छ।";return 1!=n.maximum&&(e="तँपाई "+n.maximum+" वस्तुहरु मात्र छान्न पाउँनुहुन्छ।"),e},noResults:function(){return"कुनै पनि नतिजा भेटिएन।"},searching:function(){return"खोजि हुँदैछ…"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/nl.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/nl.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/nl.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/nl.js
index 776c2df6a..2b74058d2 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/nl.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/nl.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/nl",[],function(){return{errorLoading:function(){return"De resultaten konden niet worden geladen."},inputTooLong:function(e){return"Gelieve "+(e.input.length-e.maximum)+" karakters te verwijderen"},inputTooShort:function(e){return"Gelieve "+(e.minimum-e.input.length)+" of meer karakters in te voeren"},loadingMore:function(){return"Meer resultaten laden…"},maximumSelected:function(e){var n=1==e.maximum?"kan":"kunnen",r="Er "+n+" maar "+e.maximum+" item";return 1!=e.maximum&&(r+="s"),r+=" worden geselecteerd"},noResults:function(){return"Geen resultaten gevonden…"},searching:function(){return"Zoeken…"},removeAllItems:function(){return"Verwijder alle items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/pl.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/pl.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/pl.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/pl.js
index 7790a50c3..4ca5748c3 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/pl.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/pl.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/pl",[],function(){var n=["znak","znaki","znaków"],e=["element","elementy","elementów"],r=function(n,e){return 1===n?e[0]:n>1&&n<=4?e[1]:n>=5?e[2]:void 0};return{errorLoading:function(){return"Nie można załadować wyników."},inputTooLong:function(e){var t=e.input.length-e.maximum;return"Usuń "+t+" "+r(t,n)},inputTooShort:function(e){var t=e.minimum-e.input.length;return"Podaj przynajmniej "+t+" "+r(t,n)},loadingMore:function(){return"Trwa ładowanie…"},maximumSelected:function(n){return"Możesz zaznaczyć tylko "+n.maximum+" "+r(n.maximum,e)},noResults:function(){return"Brak wyników"},searching:function(){return"Trwa wyszukiwanie…"},removeAllItems:function(){return"Usuń wszystkie przedmioty"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ps.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ps.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ps.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ps.js
index 9d2cd8ca9..9b008e4c1 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ps.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ps.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ps",[],function(){return{errorLoading:function(){return"پايلي نه سي ترلاسه کېدای"},inputTooLong:function(n){var e=n.input.length-n.maximum,r="د مهربانۍ لمخي "+e+" توری ړنګ کړئ";return 1!=e&&(r=r.replace("توری","توري")),r},inputTooShort:function(n){return"لږ تر لږه "+(n.minimum-n.input.length)+" يا ډېر توري وليکئ"},loadingMore:function(){return"نوري پايلي ترلاسه کيږي..."},maximumSelected:function(n){var e="تاسو يوازي "+n.maximum+" قلم په نښه کولای سی";return 1!=n.maximum&&(e=e.replace("قلم","قلمونه")),e},noResults:function(){return"پايلي و نه موندل سوې"},searching:function(){return"لټول کيږي..."},removeAllItems:function(){return"ټول توکي لرې کړئ"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/pt-BR.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/pt-BR.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/pt-BR.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/pt-BR.js
index f26c8133f..c991e2550 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/pt-BR.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/pt-BR.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt-BR",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var n=e.input.length-e.maximum,r="Apague "+n+" caracter";return 1!=n&&(r+="es"),r},inputTooShort:function(e){return"Digite "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"Carregando mais resultados…"},maximumSelected:function(e){var n="Você só pode selecionar "+e.maximum+" ite";return 1==e.maximum?n+="m":n+="ns",n},noResults:function(){return"Nenhum resultado encontrado"},searching:function(){return"Buscando…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/pt.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/pt.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/pt.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/pt.js
index 2068a7c28..b5da1a6b4 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/pt.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/pt.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/pt",[],function(){return{errorLoading:function(){return"Os resultados não puderam ser carregados."},inputTooLong:function(e){var r=e.input.length-e.maximum,n="Por favor apague "+r+" ";return n+=1!=r?"caracteres":"caractere"},inputTooShort:function(e){return"Introduza "+(e.minimum-e.input.length)+" ou mais caracteres"},loadingMore:function(){return"A carregar mais resultados…"},maximumSelected:function(e){var r="Apenas pode seleccionar "+e.maximum+" ";return r+=1!=e.maximum?"itens":"item"},noResults:function(){return"Sem resultados"},searching:function(){return"A procurar…"},removeAllItems:function(){return"Remover todos os itens"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ro.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ro.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ro.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ro.js
index 4bff1c64b..1ba7b40be 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ro.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ro.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/ro",[],function(){return{errorLoading:function(){return"Rezultatele nu au putut fi incărcate."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Vă rugăm să ștergeți"+t+" caracter";return 1!==t&&(n+="e"),n},inputTooShort:function(e){return"Vă rugăm să introduceți "+(e.minimum-e.input.length)+" sau mai multe caractere"},loadingMore:function(){return"Se încarcă mai multe rezultate…"},maximumSelected:function(e){var t="Aveți voie să selectați cel mult "+e.maximum;return t+=" element",1!==e.maximum&&(t+="e"),t},noResults:function(){return"Nu au fost găsite rezultate"},searching:function(){return"Căutare…"},removeAllItems:function(){return"Eliminați toate elementele"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/ru.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/ru.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/ru.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/ru.js
index 267b995ff..63a7d66c3 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/ru.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/ru.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ru",[],function(){function n(n,e,r,u){return n%10<5&&n%10>0&&n%100<5||n%100>20?n%10>1?r:e:u}return{errorLoading:function(){return"Невозможно загрузить результаты"},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Пожалуйста, введите на "+r+" символ";return u+=n(r,"","a","ов"),u+=" меньше"},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Пожалуйста, введите ещё хотя бы "+r+" символ";return u+=n(r,"","a","ов")},loadingMore:function(){return"Загрузка данных…"},maximumSelected:function(e){var r="Вы можете выбрать не более "+e.maximum+" элемент";return r+=n(e.maximum,"","a","ов")},noResults:function(){return"Совпадений не найдено"},searching:function(){return"Поиск…"},removeAllItems:function(){return"Удалить все элементы"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sk.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sk.js
similarity index 95%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sk.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sk.js
index 64346a7a3..5049528ad 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sk.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sk.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sk",[],function(){var e={2:function(e){return e?"dva":"dve"},3:function(){return"tri"},4:function(){return"štyri"}};return{errorLoading:function(){return"Výsledky sa nepodarilo načítať."},inputTooLong:function(n){var t=n.input.length-n.maximum;return 1==t?"Prosím, zadajte o jeden znak menej":t>=2&&t<=4?"Prosím, zadajte o "+e[t](!0)+" znaky menej":"Prosím, zadajte o "+t+" znakov menej"},inputTooShort:function(n){var t=n.minimum-n.input.length;return 1==t?"Prosím, zadajte ešte jeden znak":t<=4?"Prosím, zadajte ešte ďalšie "+e[t](!0)+" znaky":"Prosím, zadajte ešte ďalších "+t+" znakov"},loadingMore:function(){return"Načítanie ďalších výsledkov…"},maximumSelected:function(n){return 1==n.maximum?"Môžete zvoliť len jednu položku":n.maximum>=2&&n.maximum<=4?"Môžete zvoliť najviac "+e[n.maximum](!1)+" položky":"Môžete zvoliť najviac "+n.maximum+" položiek"},noResults:function(){return"Nenašli sa žiadne položky"},searching:function(){return"Vyhľadávanie…"},removeAllItems:function(){return"Odstráňte všetky položky"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sl.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sl.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sl.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sl.js
index 9b26c39ad..4d0b7d3e3 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sl.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sl.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sl",[],function(){return{errorLoading:function(){return"Zadetkov iskanja ni bilo mogoče naložiti."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Prosim zbrišite "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},inputTooShort:function(e){var n=e.minimum-e.input.length,t="Prosim vpišite še "+n+" znak";return 2==n?t+="a":1!=n&&(t+="e"),t},loadingMore:function(){return"Nalagam več zadetkov…"},maximumSelected:function(e){var n="Označite lahko največ "+e.maximum+" predmet";return 2==e.maximum?n+="a":1!=e.maximum&&(n+="e"),n},noResults:function(){return"Ni zadetkov."},searching:function(){return"Iščem…"},removeAllItems:function(){return"Odstranite vse elemente"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sq.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sq.js
similarity index 92%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sq.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sq.js
index 4999d21f8..59162024e 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sq.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sq.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/sq",[],function(){return{errorLoading:function(){return"Rezultatet nuk mund të ngarkoheshin."},inputTooLong:function(e){var n=e.input.length-e.maximum,t="Të lutem fshi "+n+" karakter";return 1!=n&&(t+="e"),t},inputTooShort:function(e){return"Të lutem shkruaj "+(e.minimum-e.input.length)+" ose më shumë karaktere"},loadingMore:function(){return"Duke ngarkuar më shumë rezultate…"},maximumSelected:function(e){var n="Mund të zgjedhësh vetëm "+e.maximum+" element";return 1!=e.maximum&&(n+="e"),n},noResults:function(){return"Nuk u gjet asnjë rezultat"},searching:function(){return"Duke kërkuar…"},removeAllItems:function(){return"Hiq të gjitha sendet"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sr-Cyrl.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sr-Cyrl.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sr-Cyrl.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sr-Cyrl.js
index 34fb00599..ce13ce8f9 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sr-Cyrl.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sr-Cyrl.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr-Cyrl",[],function(){function n(n,e,r,u){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:u}return{errorLoading:function(){return"Преузимање није успело."},inputTooLong:function(e){var r=e.input.length-e.maximum,u="Обришите "+r+" симбол";return u+=n(r,"","а","а")},inputTooShort:function(e){var r=e.minimum-e.input.length,u="Укуцајте бар још "+r+" симбол";return u+=n(r,"","а","а")},loadingMore:function(){return"Преузимање још резултата…"},maximumSelected:function(e){var r="Можете изабрати само "+e.maximum+" ставк";return r+=n(e.maximum,"у","е","и")},noResults:function(){return"Ништа није пронађено"},searching:function(){return"Претрага…"},removeAllItems:function(){return"Уклоните све ставке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sr.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sr.js
similarity index 93%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sr.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sr.js
index 2293b5875..dd407a06d 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sr.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sr.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sr",[],function(){function n(n,e,r,t){return n%10==1&&n%100!=11?e:n%10>=2&&n%10<=4&&(n%100<12||n%100>14)?r:t}return{errorLoading:function(){return"Preuzimanje nije uspelo."},inputTooLong:function(e){var r=e.input.length-e.maximum,t="Obrišite "+r+" simbol";return t+=n(r,"","a","a")},inputTooShort:function(e){var r=e.minimum-e.input.length,t="Ukucajte bar još "+r+" simbol";return t+=n(r,"","a","a")},loadingMore:function(){return"Preuzimanje još rezultata…"},maximumSelected:function(e){var r="Možete izabrati samo "+e.maximum+" stavk";return r+=n(e.maximum,"u","e","i")},noResults:function(){return"Ništa nije pronađeno"},searching:function(){return"Pretraga…"},removeAllItems:function(){return"Уклоните све ставке"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/sv.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/sv.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/sv.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/sv.js
index ab5cd50c3..1bc8724a7 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/sv.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/sv.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/sv",[],function(){return{errorLoading:function(){return"Resultat kunde inte laddas."},inputTooLong:function(n){return"Vänligen sudda ut "+(n.input.length-n.maximum)+" tecken"},inputTooShort:function(n){return"Vänligen skriv in "+(n.minimum-n.input.length)+" eller fler tecken"},loadingMore:function(){return"Laddar fler resultat…"},maximumSelected:function(n){return"Du kan max välja "+n.maximum+" element"},noResults:function(){return"Inga träffar"},searching:function(){return"Söker…"},removeAllItems:function(){return"Ta bort alla objekt"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/th.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/th.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/th.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/th.js
index 5458cc09d..63eab7114 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/th.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/th.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/th",[],function(){return{errorLoading:function(){return"ไม่สามารถค้นข้อมูลได้"},inputTooLong:function(n){return"โปรดลบออก "+(n.input.length-n.maximum)+" ตัวอักษร"},inputTooShort:function(n){return"โปรดพิมพ์เพิ่มอีก "+(n.minimum-n.input.length)+" ตัวอักษร"},loadingMore:function(){return"กำลังค้นข้อมูลเพิ่ม…"},maximumSelected:function(n){return"คุณสามารถเลือกได้ไม่เกิน "+n.maximum+" รายการ"},noResults:function(){return"ไม่พบข้อมูล"},searching:function(){return"กำลังค้นข้อมูล…"},removeAllItems:function(){return"ลบรายการทั้งหมด"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/tk.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/tk.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/tk.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/tk.js
index 2c8274d00..30255ff37 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/tk.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/tk.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;e.define("select2/i18n/tk",[],function(){return{errorLoading:function(){return"Netije ýüklenmedi."},inputTooLong:function(e){return e.input.length-e.maximum+" harp bozuň."},inputTooShort:function(e){return"Ýene-de iň az "+(e.minimum-e.input.length)+" harp ýazyň."},loadingMore:function(){return"Köpräk netije görkezilýär…"},maximumSelected:function(e){return"Diňe "+e.maximum+" sanysyny saýlaň."},noResults:function(){return"Netije tapylmady."},searching:function(){return"Gözlenýär…"},removeAllItems:function(){return"Remove all items"}}}),e.define,e.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/tr.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/tr.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/tr.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/tr.js
index 5ab03b9be..fc4c0bf05 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/tr.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/tr.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/tr",[],function(){return{errorLoading:function(){return"Sonuç yüklenemedi"},inputTooLong:function(n){return n.input.length-n.maximum+" karakter daha girmelisiniz"},inputTooShort:function(n){return"En az "+(n.minimum-n.input.length)+" karakter daha girmelisiniz"},loadingMore:function(){return"Daha fazla…"},maximumSelected:function(n){return"Sadece "+n.maximum+" seçim yapabilirsiniz"},noResults:function(){return"Sonuç bulunamadı"},searching:function(){return"Aranıyor…"},removeAllItems:function(){return"Tüm öğeleri kaldır"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/uk.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/uk.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/uk.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/uk.js
index cf3febb2b..63697e388 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/uk.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/uk.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/uk",[],function(){function n(n,e,u,r){return n%100>10&&n%100<15?r:n%10==1?e:n%10>1&&n%10<5?u:r}return{errorLoading:function(){return"Неможливо завантажити результати"},inputTooLong:function(e){return"Будь ласка, видаліть "+(e.input.length-e.maximum)+" "+n(e.maximum,"літеру","літери","літер")},inputTooShort:function(n){return"Будь ласка, введіть "+(n.minimum-n.input.length)+" або більше літер"},loadingMore:function(){return"Завантаження інших результатів…"},maximumSelected:function(e){return"Ви можете вибрати лише "+e.maximum+" "+n(e.maximum,"пункт","пункти","пунктів")},noResults:function(){return"Нічого не знайдено"},searching:function(){return"Пошук…"},removeAllItems:function(){return"Видалити всі елементи"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/vi.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/vi.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/vi.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/vi.js
index 90848f324..24f3bc2d6 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/vi.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/vi.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/vi",[],function(){return{inputTooLong:function(n){return"Vui lòng xóa bớt "+(n.input.length-n.maximum)+" ký tự"},inputTooShort:function(n){return"Vui lòng nhập thêm từ "+(n.minimum-n.input.length)+" ký tự trở lên"},loadingMore:function(){return"Đang lấy thêm kết quả…"},maximumSelected:function(n){return"Chỉ có thể chọn được "+n.maximum+" lựa chọn"},noResults:function(){return"Không tìm thấy kết quả"},searching:function(){return"Đang tìm…"},removeAllItems:function(){return"Xóa tất cả các mục"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/zh-CN.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/zh-CN.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/zh-CN.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/zh-CN.js
index 4b98e42e9..2c5649d31 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/zh-CN.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/zh-CN.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-CN",[],function(){return{errorLoading:function(){return"无法载入结果。"},inputTooLong:function(n){return"请删除"+(n.input.length-n.maximum)+"个字符"},inputTooShort:function(n){return"请再输入至少"+(n.minimum-n.input.length)+"个字符"},loadingMore:function(){return"载入更多结果…"},maximumSelected:function(n){return"最多只能选择"+n.maximum+"个项目"},noResults:function(){return"未找到结果"},searching:function(){return"搜索中…"},removeAllItems:function(){return"删除所有项目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/i18n/zh-TW.js b/netbox/project-static/select2-4.0.13/dist/js/i18n/zh-TW.js
similarity index 90%
rename from netbox/project-static/select2-4.0.12/dist/js/i18n/zh-TW.js
rename to netbox/project-static/select2-4.0.13/dist/js/i18n/zh-TW.js
index 39b1a4e85..570a56693 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/i18n/zh-TW.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/i18n/zh-TW.js
@@ -1,3 +1,3 @@
-/*! Select2 4.0.12 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
 !function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/zh-TW",[],function(){return{inputTooLong:function(n){return"請刪掉"+(n.input.length-n.maximum)+"個字元"},inputTooShort:function(n){return"請再輸入"+(n.minimum-n.input.length)+"個字元"},loadingMore:function(){return"載入中…"},maximumSelected:function(n){return"你只能選擇最多"+n.maximum+"項"},noResults:function(){return"沒有找到相符的項目"},searching:function(){return"搜尋中…"},removeAllItems:function(){return"刪除所有項目"}}}),n.define,n.require}();
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/select2.full.js b/netbox/project-static/select2-4.0.13/dist/js/select2.full.js
similarity index 98%
rename from netbox/project-static/select2-4.0.12/dist/js/select2.full.js
rename to netbox/project-static/select2-4.0.13/dist/js/select2.full.js
index 53b326b6a..358572a65 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/select2.full.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/select2.full.js
@@ -1,5 +1,5 @@
 /*!
- * Select2 4.0.12
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
@@ -1556,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1706,7 +1727,7 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
@@ -1867,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1910,7 +1931,7 @@ S2.define('select2/selection/allowClear',[
       }
     }
 
-    this.$element.trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1933,7 +1954,7 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
-    var removeAll = this.options.get('translations').get('removeAllItems');   
+    var removeAll = this.options.get('translations').get('removeAllItems');
 
     var $remove = $(
       '<span class="select2-selection__clear" title="' + removeAll() +'">' +
@@ -3201,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3222,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3244,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3262,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -5545,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5668,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5702,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5713,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5741,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5792,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5808,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5893,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -6228,13 +6289,13 @@ S2.define('select2/compat/inputData',[
       });
 
       this.$element.val(data.id);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     } else {
       var value = this.$element.val();
       value += this._valueSeparator + data.id;
 
       this.$element.val(value);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -6257,7 +6318,7 @@ S2.define('select2/compat/inputData',[
       }
 
       self.$element.val(values.join(self._valueSeparator));
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
diff --git a/netbox/project-static/select2-4.0.13/dist/js/select2.full.min.js b/netbox/project-static/select2-4.0.13/dist/js/select2.full.min.js
new file mode 100644
index 000000000..fa781916e
--- /dev/null
+++ b/netbox/project-static/select2-4.0.13/dist/js/select2.full.min.js
@@ -0,0 +1,2 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(d){var e=function(){if(d&&d.fn&&d.fn.select2&&d.fn.select2.amd)var e=d.fn.select2.amd;var t,n,i,h,o,s,f,g,m,v,y,_,r,a,w,l;function b(e,t){return r.call(e,t)}function c(e,t){var n,i,r,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&w.test(e[s])&&(e[s]=e[s].replace(w,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(i=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(r=(r=f[h.slice(0,d).join("/")])&&r[i]){o=r,a=u;break}if(o)break;!l&&g&&g[i]&&(l=g[i],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(b(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!b(m,e)&&!b(_,e))throw new Error("No "+e);return m[e]}function u(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?u(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},r=Object.prototype.hasOwnProperty,a=[].slice,w=/\.js$/,f=function(e,t){var n,i=u(e),r=i[0],o=t[1];return e=i[1],r&&(n=D(r=c(r,o))),r?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return c(e,t)}}(o)):c(e,o):(r=(i=u(e=c(e,o)))[0],e=i[1],r&&(n=D(r))),{f:r?r+"!"+e:e,n:e,pr:r,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,i){var r,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(i=i||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)r=d[l]=g.module(e);else if(b(m,o)||b(v,o)||b(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(i,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(r&&r.exports!==h&&r.exports!==m[e]?m[e]=r.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,i,r){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=i,i=r),i?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(i=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(m,e)||b(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=i),e.define("almond",function(){}),e.define("jquery",[],function(){var e=d||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var r={};function u(e){var t=e.prototype,n=[];for(var i in t){"function"==typeof t[i]&&"constructor"!==i&&n.push(i)}return n}r.Extend=function(e,t){var n={}.hasOwnProperty;function i(){this.constructor=e}for(var r in t)n.call(t,r)&&(e[r]=t[r]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},r.Decorate=function(i,r){var e=u(r),t=u(i);function o(){var e=Array.prototype.unshift,t=r.prototype.constructor.length,n=i.prototype.constructor;0<t&&(e.call(arguments,i.prototype.constructor),n=r.prototype.constructor),n.apply(this,arguments)}r.displayName=i.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=i.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=r.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,i=e.length;n<i;n++)e[n].apply(this,t)},r.Observable=e,r.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},r.bind=function(e,t){return function(){e.apply(t,arguments)}},r._convertData=function(e){for(var t in e){var n=t.split("-"),i=e;if(1!==n.length){for(var r=0;r<n.length;r++){var o=n[r];(o=o.substring(0,1).toLowerCase()+o.substring(1))in i||(i[o]={}),r==n.length-1&&(i[o]=e[t]),i=i[o]}delete e[t]}}return e},r.hasScroll=function(e,t){var n=o(t),i=t.style.overflowX,r=t.style.overflowY;return(i!==r||"hidden"!==r&&"visible"!==r)&&("scroll"===i||"scroll"===r||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},r.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},r.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},r.__cache={};var n=0;return r.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},r.StoreData=function(e,t,n){var i=r.GetUniqueElementId(e);r.__cache[i]||(r.__cache[i]={}),r.__cache[i][t]=n},r.GetData=function(e,t){var n=r.GetUniqueElementId(e);return t?r.__cache[n]&&null!=r.__cache[n][t]?r.__cache[n][t]:o(e).data(t):r.__cache[n]},r.RemoveData=function(e){var t=r.GetUniqueElementId(e);null!=r.__cache[t]&&delete r.__cache[t],e.removeAttribute("data-select2-id")},r}),e.define("select2/results",["jquery","./utils"],function(h,f){function i(e,t,n){this.$element=e,this.data=n,this.options=t,i.__super__.constructor.call(this)}return f.Extend(i,f.Observable),i.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},i.prototype.clear=function(){this.$results.empty()},i.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),i=this.options.get("translations").get(e.message);n.append(t(i(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},i.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},i.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var i=e.results[n],r=this.option(i);t.push(r)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},i.prototype.position=function(e,t){t.find(".select2-results").append(e)},i.prototype.sort=function(e){return this.options.get("sorter")(e)},i.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},i.prototype.setClasses=function(){var t=this;this.data.current(function(e){var i=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,i)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},i.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},i.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},i.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var r in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[r];t.setAttribute(r,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},i.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var i=n-1;0===e.length&&(i=0);var r=t.eq(i);r.trigger("mouseenter");var o=l.$results.offset().top,s=r.offset().top,a=l.$results.scrollTop()+(s-o);0===i?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var i=t.eq(n);i.trigger("mouseenter");var r=l.$results.offset().top+l.$results.outerHeight(!1),o=i.offset().top+i.outerHeight(!1),s=l.$results.scrollTop()+o-r;0===n?l.$results.scrollTop(0):r<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,i=0<e.deltaY&&t-e.deltaY<=0,r=e.deltaY<0&&n<=l.$results.height();i?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):r&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},i.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},i.prototype.destroy=function(){this.$results.remove()},i.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,i=e.offset().top,r=this.$results.scrollTop()+(i-n),o=i-n;r-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(r)}},i.prototype.template=function(e,t){var n=this.options.get("templateResult"),i=this.options.get("escapeMarkup"),r=n(e,t);null==r?t.style.display="none":"string"==typeof r?t.innerHTML=i(r):h(t).append(r)},i}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,i,r){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return i.Extend(o,i.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=i.GetData(this.$element[0],"old-tabindex")?this._tabindex=i.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,i=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===r.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",i),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&i.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,i){function r(){r.__super__.constructor.apply(this,arguments)}return n.Extend(r,t),r.prototype.render=function(){var e=r.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},r.prototype.bind=function(t,e){var n=this;r.__super__.bind.apply(this,arguments);var i=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",i).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",i),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},r.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},r.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},r.prototype.selectionContainer=function(){return e("<span></span>")},r.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),i=this.display(t,n);n.empty().append(i);var r=t.title||t.text;r?n.attr("title",r):n.removeAttr("title")}else this.clear()},r}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(r,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var i=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){i.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!i.isDisabled()){var t=r(this).parent(),n=l.GetData(t[0],"data");i.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return r('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var i=e[n],r=this.selectionContainer(),o=this.display(i,r);r.append(o);var s=i.title||i.text;s&&r.attr("title",s),l.StoreData(r[0],"data",i),t.push(r)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var i=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(i)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(r,i,a){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){i._handleClear(e)}),t.on("keypress",function(e){i._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var i=a.GetData(n[0],"data"),r=this.$element.val();this.$element.val(this.placeholder.id);var o={data:i};if(this.trigger("clear",o),o.prevented)this.$element.val(r);else{for(var s=0;s<i.length;s++)if(o={data:i[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(r);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=i.DELETE&&t.which!=i.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),i=r('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(i[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(i)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(i,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=i('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),t.on("open",function(){i.$search.attr("aria-controls",r),i.$search.trigger("focus")}),t.on("close",function(){i.$search.val(""),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.trigger("focus")}),t.on("enable",function(){i.$search.prop("disabled",!1),i._transferTabIndex()}),t.on("disable",function(){i.$search.prop("disabled",!0)}),t.on("focus",function(e){i.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){i.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){i._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===i.$search.val()){var t=i.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");i.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){i.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?i.$selection.off("input.search input.searchcheck"):i.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)i.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&i.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var i=this,r=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,r)){t=t||{};var n=s.Event("select2:"+e,{params:t});i.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function i(e){this.dict=e||{}}return i.prototype.all=function(){return this.dict},i.prototype.get=function(e){return this.dict[e]},i.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},i._cache={},i.loadPath=function(e){if(!(e in i._cache)){var t=n(e);i._cache[e]=t}return new i(i._cache[e])},i}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(i){function n(e,t){n.__super__.constructor.call(this)}return i.Extend(n,i.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=i.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+i.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],i=this;this.$element.find(":selected").each(function(){var e=l(this),t=i.item(e);n.push(t)}),e(n)},n.prototype.select=function(r){var o=this;if(r.selected=!0,l(r.element).is("option"))return r.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(r=[r]).push.apply(r,e);for(var n=0;n<r.length;n++){var i=r[n].id;-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=r.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(r){var o=this;if(this.$element.prop("multiple")){if(r.selected=!1,l(r.element).is("option"))return r.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n].id;i!==r.id&&-1===l.inArray(i,t)&&t.push(i)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(i,e){var r=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(i,t);null!==n&&r.push(n)}}),e({results:r})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),i=this._normalizeItem(e);return i.element=t,a.StoreData(t,"data",i),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),i=[],r=0;r<n.length;r++){var o=l(n[r]),s=this.item(o);i.push(s)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function i(e,t){this._dataToConvert=t.get("data")||[],i.__super__.constructor.call(this,e,t)}return f.Extend(i,e),i.prototype.bind=function(e,t){i.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},i.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),i.__super__.select.call(this,n)},i.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),i=n.map(function(){return t.item(g(this)).id}).get(),r=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,i)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}r.push(p)}}return r},i}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var i=o.ajax(e);return i.then(t),i.fail(n),i}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,i){var r=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=r.processResults(e,n);r.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),i(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||r.trigger("results:message",{message:"errorLoading"})});r._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var i=n.get("tags"),r=n.get("createTag");void 0!==r&&(this.createTag=r);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(i))for(var s=0;s<i.length;s++){var a=i[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var i=t.results,r=0;r<i.length;r++){var o=i[r],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=i,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(i,a)}t.results=i,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var i=n.get("tokenizer");void 0!==i&&(this.tokenizer=i),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var i=this;t.term=t.term||"";var r=this.tokenizer(t,this.options,function(e){var t=i._normalizeItem(e);if(!i.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=i.option(t);n.attr("data-select2-tag",!0),i._removeOldTags(),i.addOptions([n])}!function(e){i.trigger("select",{data:e})}(t)});r.term!==t.term&&(this.$search.length&&(this.$search.val(r.term),this.$search.trigger("focus")),t.term=r.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,i){for(var r=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,r)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(i(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(){i._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var i=this;this._checkIfMaximumSelected(function(){e.call(i,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var i=this;this.current(function(e){var t=null!=e?e.length:0;0<i.maximumSelectionLength&&t>=i.maximumSelectionLength?i.trigger("results:message",{message:"maximumSelected",args:{maximum:i.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var i=this,r=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){i.trigger("keypress",e),i._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){i.handleSearch(e)}),t.on("open",function(){i.$search.attr("tabindex",0),i.$search.attr("aria-controls",r),i.$search.trigger("focus"),window.setTimeout(function(){i.$search.trigger("focus")},0)}),t.on("close",function(){i.$search.attr("tabindex",-1),i.$search.removeAttr("aria-controls"),i.$search.removeAttr("aria-activedescendant"),i.$search.val(""),i.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||i.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(i.showSearch(e)?i.$searchContainer.removeClass("select2-search--hide"):i.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?i.$search.attr("aria-activedescendant",e.data._resultId):i.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,i){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,i)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),i=t.length-1;0<=i;i--){var r=t[i];this.placeholder.id===r.id&&n.splice(i,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,i){this.lastParams={},e.call(this,t,n,i),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("query",function(e){i.lastParams=e,i.loading=!0}),t.on("query:append",function(e){i.lastParams=e,i.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("open",function(){i._showDropdown(),i._attachPositioningHandler(t),i._bindContainerResultHandlers(t)}),t.on("close",function(){i._hideDropdown(),i._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,i="scroll.select2."+t.id,r="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(i,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(i+" "+r+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,i="resize.select2."+t.id,r="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+i+" "+r)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),i=null,r=this.$container.offset();r.bottom=r.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=r.top,o.bottom=r.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<r.top-s,u=l>r.bottom+s,d={left:r.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(i="below"),u||!c||t?!c&&u&&t&&(i="below"):i="above",("above"==i||t&&"below"!==i)&&(d.top=o.top-h.top-s),null!=i&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+i),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+i)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,i){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,i)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,i=0;i<t.length;i++){var r=t[i];r.children?n+=e(r.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("close",function(e){i._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var i=this.getHighlightedResults();if(!(i.length<1)){var r=o.GetData(i[0],"data");null!=r.element&&r.element.selected||null==r.element&&r.selected||this.trigger("select",{data:r})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var i=this;e.call(this,t,n),t.on("select",function(e){i._selectTriggered(e)}),t.on("unselect",function(e){i._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,w,$,b,A,x,D,S,C,E,O,T,q,j,L,I,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=$:null!=e.data?e.dataAdapter=w:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,b)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,L))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=C;else{var i=y.Decorate(C,E);e.dropdownAdapter=i}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,I)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var r=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,r)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var i=c.extend(!0,{},n),r=n.children.length-1;0<=r;r--)null==e(t,n.children[r])&&i.children.splice(r,1);return 0<i.children.length?i:e(t,i)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,i=this.defaults.language,r=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(r),this._resolveLanguage(n),this._resolveLanguage(i),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],i=0;i<t.length;i++)if(n.push(t[i]),"string"==typeof t[i]&&0<t[i].indexOf("-")){var r=t[i].split("-")[0];n.push(r)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,i=0;i<e.length;i++){var r=new s,o=e[i];if("string"==typeof o)try{r=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,r=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else r=c.isPlainObject(o)?new s(o):o;n.extend(r)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var i=y._convertData(n);c.extend(!0,this.defaults,i)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(i,d,r,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=r.applyFromElement(this.options,t)),this.options=r.apply(this.options),t&&t.is("input")){var n=i(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function i(e,t){return t.toUpperCase()}for(var r=0;r<e[0].attributes.length;r++){var o=e[0].attributes[r].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,i)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,i){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var i=this.options.get("dataAdapter");this.dataAdapter=new i(e,this.options);var r=this.render();this._placeContainer(r);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,r);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,r);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var i=this._resolveWidth(e,"style");return null!=i?i:this._resolveWidth(e,"element")}if("element"==t){var r=e.outerWidth(!1);return r<=0?"auto":r+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,i=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,i)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===i.ESC||t===i.TAB||t===i.UP&&e.altKey?(n.close(e),e.preventDefault()):t===i.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===i.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===i.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===i.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===i.ENTER||t===i.SPACE||t===i.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,i=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var r=0;r<t.addedNodes.length;r++){t.addedNodes[r].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(i._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),i=this;n&&this.dataAdapter.current(function(e){i.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,i={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in i){var r=i[e],o={prevented:!1,name:e,args:t};if(n.call(this,r,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("select2/compat/utils",["jquery"],function(s){return{syncCssClasses:function(e,t,n){var i,r,o=[];(i=s.trim(e.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0===this.indexOf("select2-")&&o.push(this)}),(i=s.trim(t.attr("class")))&&s((i=""+i).split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&null!=(r=n(this))&&o.push(r)}),e.attr("class",o.join(" "))}}}),e.define("select2/compat/containerCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("containerCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptContainerCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("containerCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/dropdownCss",["jquery","./utils"],function(s,a){function l(e){return null}function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("dropdownCssClass")||"";s.isFunction(n)&&(n=n(this.$element));var i=this.options.get("adaptDropdownCssClass");if(i=i||l,-1!==n.indexOf(":all:")){n=n.replace(":all:","");var r=i;i=function(e){var t=r(e);return null!=t?t+" "+e:e}}var o=this.options.get("dropdownCss")||{};return s.isFunction(o)&&(o=o(this.$element)),a.syncCssClasses(t,this.$element,i),t.css(o),t.addClass(n),t},e}),e.define("select2/compat/initSelection",["jquery"],function(i){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=n.get("initSelection"),this._isInitialized=!1,e.call(this,t,n)}return e.prototype.current=function(e,t){var n=this;this._isInitialized?e.call(this,t):this.initSelection.call(null,this.$element,function(e){n._isInitialized=!0,i.isArray(e)||(e=[e]),t(e)})},e}),e.define("select2/compat/inputData",["jquery","../utils"],function(s,i){function e(e,t,n){this._currentData=[],this._valueSeparator=n.get("valueSeparator")||",","hidden"===t.prop("type")&&n.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),e.call(this,t,n)}return e.prototype.current=function(e,t){function i(e,t){var n=[];return e.selected||-1!==s.inArray(e.id,t)?(e.selected=!0,n.push(e)):e.selected=!1,e.children&&n.push.apply(n,i(e.children,t)),n}for(var n=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r];n.push.apply(n,i(o,this.$element.val().split(this._valueSeparator)))}t(n)},e.prototype.select=function(e,t){if(this.options.get("multiple")){var n=this.$element.val();n+=this._valueSeparator+t.id,this.$element.val(n),this.$element.trigger("input").trigger("change")}else this.current(function(e){s.map(e,function(e){e.selected=!1})}),this.$element.val(t.id),this.$element.trigger("input").trigger("change")},e.prototype.unselect=function(e,r){var o=this;r.selected=!1,this.current(function(e){for(var t=[],n=0;n<e.length;n++){var i=e[n];r.id!=i.id&&t.push(i.id)}o.$element.val(t.join(o._valueSeparator)),o.$element.trigger("input").trigger("change")})},e.prototype.query=function(e,t,n){for(var i=[],r=0;r<this._currentData.length;r++){var o=this._currentData[r],s=this.matches(t,o);null!==s&&i.push(s)}n({results:i})},e.prototype.addOptions=function(e,t){var n=s.map(t,function(e){return i.GetData(e[0],"data")});this._currentData.push.apply(this._currentData,n)},e}),e.define("select2/compat/matcher",["jquery"],function(s){return function(o){return function(e,t){var n=s.extend(!0,{},t);if(null==e.term||""===s.trim(e.term))return n;if(t.children){for(var i=t.children.length-1;0<=i;i--){var r=t.children[i];o(e.term,r.text,r)||n.children.splice(i,1)}if(0<n.children.length)return n}return o(e.term,t.text,t)?n:null}}}),e.define("select2/compat/query",[],function(){function e(e,t,n){n.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.callback=n,this.options.get("query").call(null,t)},e}),e.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t.addClass("select2-dropdown--below"),n.addClass("select2-container--below")},e}),e.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),e.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),l=function(p){var h,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],g=Array.prototype.slice;if(p.event.fixHooks)for(var n=e.length;n;)p.event.fixHooks[e[--n]]=p.event.mouseHooks;var m=p.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,!1);else this.onmousewheel=i;p.data(this,"mousewheel-line-height",m.getLineHeight(this)),p.data(this,"mousewheel-page-height",m.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],i,!1);else this.onmousewheel=null;p.removeData(this,"mousewheel-line-height"),p.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=p(e),n=t["offsetParent"in p.fn?"offsetParent":"parent"]();return n.length||(n=p("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return p(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n=e||window.event,i=g.call(arguments,1),r=0,o=0,s=0,a=0,l=0;if((e=p.event.fix(n)).type="mousewheel","detail"in n&&(s=-1*n.detail),"wheelDelta"in n&&(s=n.wheelDelta),"wheelDeltaY"in n&&(s=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*s,s=0),r=0===s?o:s,"deltaY"in n&&(r=s=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===s&&(r=-1*o)),0!==s||0!==o){if(1===n.deltaMode){var c=p.data(this,"mousewheel-line-height");r*=c,s*=c,o*=c}else if(2===n.deltaMode){var u=p.data(this,"mousewheel-page-height");r*=u,s*=u,o*=u}if(t=Math.max(Math.abs(s),Math.abs(o)),(!f||t<f)&&y(n,f=t)&&(f/=40),y(n,t)&&(r/=40,o/=40,s/=40),r=Math[1<=r?"floor":"ceil"](r/f),o=Math[1<=o?"floor":"ceil"](o/f),s=Math[1<=s?"floor":"ceil"](s/f),m.settings.normalizeOffset&&this.getBoundingClientRect){var d=this.getBoundingClientRect();a=e.clientX-d.left,l=e.clientY-d.top}return e.deltaX=o,e.deltaY=s,e.deltaFactor=f,e.offsetX=a,e.offsetY=l,e.deltaMode=0,i.unshift(e,r,o,s),h&&clearTimeout(h),h=setTimeout(v,200),(p.event.dispatch||p.event.handle).apply(this,i)}}function v(){f=null}function y(e,t){return m.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}p.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof e.define&&e.define.amd?e.define("jquery-mousewheel",["jquery"],l):"object"==typeof exports?module.exports=l:l(d),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(r,e,o,t,s){if(null==r.fn.select2){var a=["open","close","destroy"];r.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=r.extend(!0,{},t);new o(r(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,i=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,i)}),-1<r.inArray(t,a)?this:n}}return null==r.fn.select2.defaults&&(r.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return d.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/dist/js/select2.js b/netbox/project-static/select2-4.0.13/dist/js/select2.js
similarity index 98%
rename from netbox/project-static/select2-4.0.12/dist/js/select2.js
rename to netbox/project-static/select2-4.0.13/dist/js/select2.js
index a2166f717..fcfb5ab49 100644
--- a/netbox/project-static/select2-4.0.12/dist/js/select2.js
+++ b/netbox/project-static/select2-4.0.13/dist/js/select2.js
@@ -1,5 +1,5 @@
 /*!
- * Select2 4.0.12
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
@@ -1556,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1706,7 +1727,7 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
@@ -1867,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1910,7 +1931,7 @@ S2.define('select2/selection/allowClear',[
       }
     }
 
-    this.$element.trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1933,7 +1954,7 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
-    var removeAll = this.options.get('translations').get('removeAllItems');   
+    var removeAll = this.options.get('translations').get('removeAllItems');
 
     var $remove = $(
       '<span class="select2-selection__clear" title="' + removeAll() +'">' +
@@ -3201,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3222,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3244,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3262,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -5545,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5668,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5702,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5713,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5741,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5792,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5808,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5893,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
diff --git a/netbox/project-static/select2-4.0.13/dist/js/select2.min.js b/netbox/project-static/select2-4.0.13/dist/js/select2.min.js
new file mode 100644
index 000000000..e42142643
--- /dev/null
+++ b/netbox/project-static/select2-4.0.13/dist/js/select2.min.js
@@ -0,0 +1,2 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(u){var e=function(){if(u&&u.fn&&u.fn.select2&&u.fn.select2.amd)var e=u.fn.select2.amd;var t,n,r,h,o,s,f,g,m,v,y,_,i,a,b;function w(e,t){return i.call(e,t)}function l(e,t){var n,r,i,o,s,a,l,c,u,d,p,h=t&&t.split("/"),f=y.map,g=f&&f["*"]||{};if(e){for(s=(e=e.split("/")).length-1,y.nodeIdCompat&&b.test(e[s])&&(e[s]=e[s].replace(b,"")),"."===e[0].charAt(0)&&h&&(e=h.slice(0,h.length-1).concat(e)),u=0;u<e.length;u++)if("."===(p=e[u]))e.splice(u,1),u-=1;else if(".."===p){if(0===u||1===u&&".."===e[2]||".."===e[u-1])continue;0<u&&(e.splice(u-1,2),u-=2)}e=e.join("/")}if((h||g)&&f){for(u=(n=e.split("/")).length;0<u;u-=1){if(r=n.slice(0,u).join("/"),h)for(d=h.length;0<d;d-=1)if(i=(i=f[h.slice(0,d).join("/")])&&i[r]){o=i,a=u;break}if(o)break;!l&&g&&g[r]&&(l=g[r],c=u)}!o&&l&&(o=l,a=c),o&&(n.splice(0,a,o),e=n.join("/"))}return e}function A(t,n){return function(){var e=a.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),s.apply(h,e.concat([t,n]))}}function x(t){return function(e){m[t]=e}}function D(e){if(w(v,e)){var t=v[e];delete v[e],_[e]=!0,o.apply(h,t)}if(!w(m,e)&&!w(_,e))throw new Error("No "+e);return m[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function S(e){return e?c(e):[]}return e&&e.requirejs||(e?n=e:e={},m={},v={},y={},_={},i=Object.prototype.hasOwnProperty,a=[].slice,b=/\.js$/,f=function(e,t){var n,r=c(e),i=r[0],o=t[1];return e=r[1],i&&(n=D(i=l(i,o))),i?e=n&&n.normalize?n.normalize(e,function(t){return function(e){return l(e,t)}}(o)):l(e,o):(i=(r=c(e=l(e,o)))[0],e=r[1],i&&(n=D(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},g={require:function(e){return A(e)},exports:function(e){var t=m[e];return void 0!==t?t:m[e]={}},module:function(e){return{id:e,uri:"",exports:m[e],config:function(e){return function(){return y&&y.config&&y.config[e]||{}}}(e)}}},o=function(e,t,n,r){var i,o,s,a,l,c,u,d=[],p=typeof n;if(c=S(r=r||e),"undefined"==p||"function"==p){for(t=!t.length&&n.length?["require","exports","module"]:t,l=0;l<t.length;l+=1)if("require"===(o=(a=f(t[l],c)).f))d[l]=g.require(e);else if("exports"===o)d[l]=g.exports(e),u=!0;else if("module"===o)i=d[l]=g.module(e);else if(w(m,o)||w(v,o)||w(_,o))d[l]=D(o);else{if(!a.p)throw new Error(e+" missing "+o);a.p.load(a.n,A(r,!0),x(o),{}),d[l]=m[o]}s=n?n.apply(m[e],d):void 0,e&&(i&&i.exports!==h&&i.exports!==m[e]?m[e]=i.exports:s===h&&u||(m[e]=s))}else e&&(m[e]=n)},t=n=s=function(e,t,n,r,i){if("string"==typeof e)return g[e]?g[e](t):D(f(e,S(t)).f);if(!e.splice){if((y=e).deps&&s(y.deps,y.callback),!t)return;t.splice?(e=t,t=n,n=null):e=h}return t=t||function(){},"function"==typeof n&&(n=r,r=i),r?o(h,e,t,n):setTimeout(function(){o(h,e,t,n)},4),s},s.config=function(e){return s(e)},t._defined=m,(r=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),w(m,e)||w(v,e)||(v[e]=[e,t,n])}).amd={jQuery:!0},e.requirejs=t,e.require=n,e.define=r),e.define("almond",function(){}),e.define("jquery",[],function(){var e=u||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),e.define("select2/utils",["jquery"],function(o){var i={};function u(e){var t=e.prototype,n=[];for(var r in t){"function"==typeof t[r]&&"constructor"!==r&&n.push(r)}return n}i.Extend=function(e,t){var n={}.hasOwnProperty;function r(){this.constructor=e}for(var i in t)n.call(t,i)&&(e[i]=t[i]);return r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype,e},i.Decorate=function(r,i){var e=u(i),t=u(r);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=r.prototype.constructor;0<t&&(e.call(arguments,r.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=r.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var s=t[n];o.prototype[s]=r.prototype[s]}function a(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}for(var l=0;l<e.length;l++){var c=e[l];o.prototype[c]=a(c)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,r=e.length;n<r;n++)e[n].apply(this,t)},i.Observable=e,i.generateChars=function(e){for(var t="",n=0;n<e;n++){t+=Math.floor(36*Math.random()).toString(36)}return t},i.bind=function(e,t){return function(){e.apply(t,arguments)}},i._convertData=function(e){for(var t in e){var n=t.split("-"),r=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in r||(r[o]={}),i==n.length-1&&(r[o]=e[t]),r=r[o]}delete e[t]}}return e},i.hasScroll=function(e,t){var n=o(t),r=t.style.overflowX,i=t.style.overflowY;return(r!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===r||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},i.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},i.appendMany=function(e,t){if("1.7"===o.fn.jquery.substr(0,3)){var n=o();o.map(t,function(e){n=n.add(e)}),t=n}e.append(t)},i.__cache={};var n=0;return i.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null==t&&(e.id?(t=e.id,e.setAttribute("data-select2-id",t)):(e.setAttribute("data-select2-id",++n),t=n.toString())),t},i.StoreData=function(e,t,n){var r=i.GetUniqueElementId(e);i.__cache[r]||(i.__cache[r]={}),i.__cache[r][t]=n},i.GetData=function(e,t){var n=i.GetUniqueElementId(e);return t?i.__cache[n]&&null!=i.__cache[n][t]?i.__cache[n][t]:o(e).data(t):i.__cache[n]},i.RemoveData=function(e){var t=i.GetUniqueElementId(e);null!=i.__cache[t]&&delete i.__cache[t],e.removeAttribute("data-select2-id")},i}),e.define("select2/results",["jquery","./utils"],function(h,f){function r(e,t,n){this.$element=e,this.data=n,this.options=t,r.__super__.constructor.call(this)}return f.Extend(r,f.Observable),r.prototype.render=function(){var e=h('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},r.prototype.clear=function(){this.$results.empty()},r.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=h('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),r=this.options.get("translations").get(e.message);n.append(t(r(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},r.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},r.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var r=e.results[n],i=this.option(r);t.push(i)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},r.prototype.position=function(e,t){t.find(".select2-results").append(e)},r.prototype.sort=function(e){return this.options.get("sorter")(e)},r.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option[aria-selected]"),t=e.filter("[aria-selected=true]");0<t.length?t.first().trigger("mouseenter"):e.first().trigger("mouseenter"),this.ensureHighlightVisible()},r.prototype.setClasses=function(){var t=this;this.data.current(function(e){var r=h.map(e,function(e){return e.id.toString()});t.$results.find(".select2-results__option[aria-selected]").each(function(){var e=h(this),t=f.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<h.inArray(n,r)?e.attr("aria-selected","true"):e.attr("aria-selected","false")})})},r.prototype.showLoading=function(e){this.hideLoading();var t={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},n=this.option(t);n.className+=" loading-results",this.$results.prepend(n)},r.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},r.prototype.option=function(e){var t=document.createElement("li");t.className="select2-results__option";var n={role:"option","aria-selected":"false"},r=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(var i in(null!=e.element&&r.call(e.element,":disabled")||null==e.element&&e.disabled)&&(delete n["aria-selected"],n["aria-disabled"]="true"),null==e.id&&delete n["aria-selected"],null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(n.role="group",n["aria-label"]=e.text,delete n["aria-selected"]),n){var o=n[i];t.setAttribute(i,o)}if(e.children){var s=h(t),a=document.createElement("strong");a.className="select2-results__group";h(a);this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],d=this.option(u);l.push(d)}var p=h("<ul></ul>",{class:"select2-results__options select2-results__options--nested"});p.append(l),s.append(a),s.append(p)}else this.template(e,t);return f.StoreData(t,"data",e),t},r.prototype.bind=function(t,e){var l=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){l.clear(),l.append(e.data),t.isOpen()&&(l.setClasses(),l.highlightFirstItem())}),t.on("results:append",function(e){l.append(e.data),t.isOpen()&&l.setClasses()}),t.on("query",function(e){l.hideMessages(),l.showLoading(e)}),t.on("select",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(l.setClasses(),l.options.get("scrollAfterSelect")&&l.highlightFirstItem())}),t.on("open",function(){l.$results.attr("aria-expanded","true"),l.$results.attr("aria-hidden","false"),l.setClasses(),l.ensureHighlightVisible()}),t.on("close",function(){l.$results.attr("aria-expanded","false"),l.$results.attr("aria-hidden","true"),l.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=l.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e=l.getHighlightedResults();if(0!==e.length){var t=f.GetData(e[0],"data");"true"==e.attr("aria-selected")?l.trigger("close",{}):l.trigger("select",{data:t})}}),t.on("results:previous",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e);if(!(n<=0)){var r=n-1;0===e.length&&(r=0);var i=t.eq(r);i.trigger("mouseenter");var o=l.$results.offset().top,s=i.offset().top,a=l.$results.scrollTop()+(s-o);0===r?l.$results.scrollTop(0):s-o<0&&l.$results.scrollTop(a)}}),t.on("results:next",function(){var e=l.getHighlightedResults(),t=l.$results.find("[aria-selected]"),n=t.index(e)+1;if(!(n>=t.length)){var r=t.eq(n);r.trigger("mouseenter");var i=l.$results.offset().top+l.$results.outerHeight(!1),o=r.offset().top+r.outerHeight(!1),s=l.$results.scrollTop()+o-i;0===n?l.$results.scrollTop(0):i<o&&l.$results.scrollTop(s)}}),t.on("results:focus",function(e){e.element.addClass("select2-results__option--highlighted")}),t.on("results:message",function(e){l.displayMessage(e)}),h.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=l.$results.scrollTop(),n=l.$results.get(0).scrollHeight-t+e.deltaY,r=0<e.deltaY&&t-e.deltaY<=0,i=e.deltaY<0&&n<=l.$results.height();r?(l.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):i&&(l.$results.scrollTop(l.$results.get(0).scrollHeight-l.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(e){var t=h(this),n=f.GetData(this,"data");"true"!==t.attr("aria-selected")?l.trigger("select",{originalEvent:e,data:n}):l.options.get("multiple")?l.trigger("unselect",{originalEvent:e,data:n}):l.trigger("close",{})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(e){var t=f.GetData(this,"data");l.getHighlightedResults().removeClass("select2-results__option--highlighted"),l.trigger("results:focus",{data:t,element:h(this)})})},r.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},r.prototype.destroy=function(){this.$results.remove()},r.prototype.ensureHighlightVisible=function(){var e=this.getHighlightedResults();if(0!==e.length){var t=this.$results.find("[aria-selected]").index(e),n=this.$results.offset().top,r=e.offset().top,i=this.$results.scrollTop()+(r-n),o=r-n;i-=2*e.outerHeight(!1),t<=2?this.$results.scrollTop(0):(o>this.$results.outerHeight()||o<0)&&this.$results.scrollTop(i)}},r.prototype.template=function(e,t){var n=this.options.get("templateResult"),r=this.options.get("escapeMarkup"),i=n(e,t);null==i?t.style.display="none":"string"==typeof i?t.innerHTML=r(i):h(t).append(i)},r}),e.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),e.define("select2/selection/base",["jquery","../utils","../keys"],function(n,r,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return r.Extend(o,r.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=r.GetData(this.$element[0],"old-tabindex")?this._tabindex=r.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,r=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",r),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&r.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),e.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,r){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e.addClass("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var r=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",r).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",r),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){if(0!==e.length){var t=e[0],n=this.$selection.find(".select2-selection__rendered"),r=this.display(t,n);n.empty().append(r);var i=t.title||t.text;i?n.attr("title",i):n.removeAttr("title")}else this.clear()},i}),e.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,l){function n(e,t){n.__super__.constructor.apply(this,arguments)}return l.Extend(n,e),n.prototype.render=function(){var e=n.__super__.render.call(this);return e.addClass("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},n.prototype.bind=function(e,t){var r=this;n.__super__.bind.apply(this,arguments),this.$selection.on("click",function(e){r.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){if(!r.isDisabled()){var t=i(this).parent(),n=l.GetData(t[0],"data");r.trigger("unselect",{originalEvent:e,data:n})}})},n.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},n.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},n.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>')},n.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=0;n<e.length;n++){var r=e[n],i=this.selectionContainer(),o=this.display(r,i);i.append(o);var s=r.title||r.text;s&&i.attr("title",s),l.StoreData(i[0],"data",r),t.push(i)}var a=this.$selection.find(".select2-selection__rendered");l.appendMany(a,t)}},n}),e.define("select2/selection/placeholder",["../utils"],function(e){function t(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return t.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},t.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();return n.html(this.display(t)),n.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),n},t.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();var r=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(r)},t}),e.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,r,a){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){r._handleClear(e)}),t.on("keypress",function(e){r._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var r=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:r};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var s=0;s<r.length;s++)if(o={data:r[s]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=r.DELETE&&t.which!=r.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){if(e.call(this,t),!(0<this.$selection.find(".select2-selection__placeholder").length||0===t.length)){var n=this.options.get("translations").get("removeAllItems"),r=i('<span class="select2-selection__clear" title="'+n()+'">&times;</span>');a.StoreData(r[0],"data",t),this.$selection.find(".select2-selection__rendered").prepend(r)}},e}),e.define("select2/selection/search",["jquery","../utils","../keys"],function(r,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=r('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></li>');this.$searchContainer=t,this.$search=t.find("input");var n=e.call(this);return this._transferTabIndex(),n},e.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),t.on("open",function(){r.$search.attr("aria-controls",i),r.$search.trigger("focus")}),t.on("close",function(){r.$search.val(""),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.trigger("focus")}),t.on("enable",function(){r.$search.prop("disabled",!1),r._transferTabIndex()}),t.on("disable",function(){r.$search.prop("disabled",!0)}),t.on("focus",function(e){r.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){r.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){r._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){if(e.stopPropagation(),r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented(),e.which===l.BACKSPACE&&""===r.$search.val()){var t=r.$searchContainer.prev(".select2-selection__choice");if(0<t.length){var n=a.GetData(t[0],"data");r.searchRemoveChoice(n),e.preventDefault()}}}),this.$selection.on("click",".select2-search--inline",function(e){r.$search.val()&&e.stopPropagation()});var o=document.documentMode,s=o&&o<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){s?r.$selection.off("input.search input.searchcheck"):r.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){if(s&&"input"===e.type)r.$selection.off("input.search input.searchcheck");else{var t=e.which;t!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&r.handleSearch(e)}})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var e=this.$search.val();this.trigger("query",{term:e})}this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="";""!==this.$search.attr("placeholder")?e=this.$selection.find(".select2-selection__rendered").width():e=.75*(this.$search.val().length+1)+"em";this.$search.css("width",e)},e}),e.define("select2/selection/eventRelay",["jquery"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var r=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){if(-1!==s.inArray(e,i)){t=t||{};var n=s.Event("select2:"+e,{params:t});r.$element.trigger(n),-1!==s.inArray(e,o)&&(t.prevented=n.isDefaultPrevented())}})},e}),e.define("select2/translation",["jquery","require"],function(t,n){function r(e){this.dict=e||{}}return r.prototype.all=function(){return this.dict},r.prototype.get=function(e){return this.dict[e]},r.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},r._cache={},r.loadPath=function(e){if(!(e in r._cache)){var t=n(e);r._cache[e]=t}return new r(r._cache[e])},r}),e.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),e.define("select2/data/base",["../utils"],function(r){function n(e,t){n.__super__.constructor.call(this)}return r.Extend(n,r.Observable),n.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},n.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},n.prototype.bind=function(e,t){},n.prototype.destroy=function(){},n.prototype.generateResultId=function(e,t){var n=e.id+"-result-";return n+=r.generateChars(4),null!=t.id?n+="-"+t.id.toString():n+="-"+r.generateChars(4),n},n}),e.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var n=[],r=this;this.$element.find(":selected").each(function(){var e=l(this),t=r.item(e);n.push(t)}),e(n)},n.prototype.select=function(i){var o=this;if(i.selected=!0,l(i.element).is("option"))return i.element.selected=!0,void this.$element.trigger("input").trigger("change");if(this.$element.prop("multiple"))this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var r=i[n].id;-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")});else{var e=i.id;this.$element.val(e),this.$element.trigger("input").trigger("change")}},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,l(i.element).is("option"))return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var r=e[n].id;r!==i.id&&-1===l.inArray(r,t)&&t.push(r)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(r,e){var i=[],o=this;this.$element.children().each(function(){var e=l(this);if(e.is("option")||e.is("optgroup")){var t=o.item(e),n=o.matches(r,t);null!==n&&i.push(n)}}),e({results:i})},n.prototype.addOptions=function(e){a.appendMany(this.$element,e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);var n=l(t),r=this._normalizeItem(e);return r.element=t,a.StoreData(t,"data",r),n},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;if(e.is("option"))t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if(e.is("optgroup")){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var n=e.children("option"),r=[],i=0;i<n.length;i++){var o=l(n[i]),s=this.item(o);r.push(s)}t.children=r}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),e.define("select2/data/array",["./select","../utils","jquery"],function(e,f,g){function r(e,t){this._dataToConvert=t.get("data")||[],r.__super__.constructor.call(this,e,t)}return f.Extend(r,e),r.prototype.bind=function(e,t){r.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},r.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),r.__super__.select.call(this,n)},r.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),r=n.map(function(){return t.item(g(this)).id}).get(),i=[];function o(e){return function(){return g(this).val()==e.id}}for(var s=0;s<e.length;s++){var a=this._normalizeItem(e[s]);if(0<=g.inArray(a.id,r)){var l=n.filter(o(a)),c=this.item(l),u=g.extend(!0,{},a,c),d=this.option(u);l.replaceWith(d)}else{var p=this.option(a);if(a.children){var h=this.convertToOptions(a.children);f.appendMany(p,h)}i.push(p)}}return i},r}),e.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){var r=o.ajax(e);return r.then(t),r.fail(n),r}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(n,r){var i=this;null!=this._request&&(o.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var t=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=t.transport(t,function(e){var t=i.processResults(e,n);i.options.get("debug")&&window.console&&console.error&&(t&&t.results&&o.isArray(t.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),r(t)},function(){"status"in e&&(0===e.status||"0"===e.status)||i.trigger("results:message",{message:"errorLoading"})});i._request=e}"function"==typeof t.url&&(t.url=t.url.call(this.$element,n)),"function"==typeof t.data&&(t.data=t.data.call(this.$element,n)),this.ajaxOptions.delay&&null!=n.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),e.define("select2/data/tags",["jquery"],function(u){function e(e,t,n){var r=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);var o=n.get("insertTag");if(void 0!==o&&(this.insertTag=o),e.call(this,t,n),u.isArray(r))for(var s=0;s<r.length;s++){var a=r[s],l=this._normalizeItem(a),c=this.option(l);this.$element.append(c)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var r=t.results,i=0;i<r.length;i++){var o=r[i],s=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||s)return!n&&(t.data=r,void u(t))}if(n)return!0;var a=d.createTag(c);if(null!=a){var l=d.option(a);l.attr("data-select2-tag",!0),d.addOptions([l]),d.insertTag(r,a)}t.results=r,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){var n=u.trim(t.term);return""===n?null:{id:n,text:n}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||u(this).remove()})},e}),e.define("select2/data/tokenizer",["jquery"],function(d){function e(e,t,n){var r=n.get("tokenizer");void 0!==r&&(this.tokenizer=r),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var r=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t=r._normalizeItem(e);if(!r.$element.find("option").filter(function(){return d(this).val()===t.id}).length){var n=r.option(t);n.attr("data-select2-tag",!0),r._removeOldTags(),r.addOptions([n])}!function(e){r.trigger("select",{data:e})}(t)});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,r){for(var i=n.get("tokenSeparators")||[],o=t.term,s=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};s<o.length;){var l=o[s];if(-1!==d.inArray(l,i)){var c=o.substr(0,s),u=a(d.extend({},t,{term:c}));null!=u?(r(u),o=o.substr(s+1)||"",s=0):s++}else s++}return{term:o}},e}),e.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),e.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(){r._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var r=this;this._checkIfMaximumSelected(function(){e.call(r,t,n)})},e.prototype._checkIfMaximumSelected=function(e,n){var r=this;this.current(function(e){var t=null!=e?e.length:0;0<r.maximumSelectionLength&&t>=r.maximumSelectionLength?r.trigger("results:message",{message:"maximumSelected",args:{maximum:r.maximumSelectionLength}}):n&&n()})},e}),e.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),e.define("select2/dropdown/search",["jquery","../utils"],function(o,e){function t(){}return t.prototype.render=function(e){var t=e.call(this),n=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=n,this.$search=n.find("input"),t.prepend(n),t},t.prototype.bind=function(e,t,n){var r=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){r.trigger("keypress",e),r._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){r.handleSearch(e)}),t.on("open",function(){r.$search.attr("tabindex",0),r.$search.attr("aria-controls",i),r.$search.trigger("focus"),window.setTimeout(function(){r.$search.trigger("focus")},0)}),t.on("close",function(){r.$search.attr("tabindex",-1),r.$search.removeAttr("aria-controls"),r.$search.removeAttr("aria-activedescendant"),r.$search.val(""),r.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||r.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(r.showSearch(e)?r.$searchContainer.removeClass("select2-search--hide"):r.$searchContainer.addClass("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?r.$search.attr("aria-activedescendant",e.data._resultId):r.$search.removeAttr("aria-activedescendant")})},t.prototype.handleSearch=function(e){if(!this._keyUpPrevented){var t=this.$search.val();this.trigger("query",{term:t})}this._keyUpPrevented=!1},t.prototype.showSearch=function(e,t){return!0},t}),e.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,r){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,r)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),r=t.length-1;0<=r;r--){var i=t[r];this.placeholder.id===i.id&&n.splice(r,1)}return n},e}),e.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,r){this.lastParams={},e.call(this,t,n,r),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("query",function(e){r.lastParams=e,r.loading=!0}),t.on("query:append",function(e){r.lastParams=e,r.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);if(!this.loading&&e){var t=this.$results.offset().top+this.$results.outerHeight(!1);this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=t+50&&this.loadMore()}},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),e.define("select2/dropdown/attachBody",["jquery","../utils"],function(f,a){function e(e,t,n){this.$dropdownParent=f(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("open",function(){r._showDropdown(),r._attachPositioningHandler(t),r._bindContainerResultHandlers(t)}),t.on("close",function(){r._hideDropdown(),r._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t.removeClass("select2"),t.addClass("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=f("<span></span>"),n=e.call(this);return t.append(n),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){if(!this._containerResultsHandlersBound){var n=this;t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0}},e.prototype._attachPositioningHandler=function(e,t){var n=this,r="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,s=this.$container.parents().filter(a.hasScroll);s.each(function(){a.StoreData(this,"select2-scroll-position",{x:f(this).scrollLeft(),y:f(this).scrollTop()})}),s.on(r,function(e){var t=a.GetData(this,"select2-scroll-position");f(this).scrollTop(t.y)}),f(window).on(r+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,r="resize.select2."+t.id,i="orientationchange.select2."+t.id;this.$container.parents().filter(a.hasScroll).off(n),f(window).off(n+" "+r+" "+i)},e.prototype._positionDropdown=function(){var e=f(window),t=this.$dropdown.hasClass("select2-dropdown--above"),n=this.$dropdown.hasClass("select2-dropdown--below"),r=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var s=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-s,u=l>i.bottom+s,d={left:i.left,top:o.bottom},p=this.$dropdownParent;"static"===p.css("position")&&(p=p.offsetParent());var h={top:0,left:0};(f.contains(document.body,p[0])||p[0].isConnected)&&(h=p.offset()),d.top-=h.top,d.left-=h.left,t||n||(r="below"),u||!c||t?!c&&u&&t&&(r="below"):r="above",("above"==r||t&&"below"!==r)&&(d.top=o.top-h.top-s),null!=r&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+r),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+r)),this.$dropdownContainer.css(d)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),e.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,r){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,r)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,r=0;r<t.length;r++){var i=t[r];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),e.define("select2/dropdown/selectOnClose",["../utils"],function(o){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("close",function(e){r._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}var r=this.getHighlightedResults();if(!(r.length<1)){var i=o.GetData(r[0],"data");null!=i.element&&i.element.selected||null==i.element&&i.selected||this.trigger("select",{data:i})}},e}),e.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var r=this;e.call(this,t,n),t.on("select",function(e){r._selectTriggered(e)}),t.on("unselect",function(e){r._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),e.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="Please delete "+t+" character";return 1!=t&&(n+="s"),n},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"}}}),e.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(c,u,d,p,h,f,g,m,v,y,s,t,_,$,b,w,A,x,D,S,E,C,O,T,q,L,I,j,e){function n(){this.reset()}return n.prototype.apply=function(e){if(null==(e=c.extend(!0,{},this.defaults,e)).dataAdapter){if(null!=e.ajax?e.dataAdapter=b:null!=e.data?e.dataAdapter=$:e.dataAdapter=_,0<e.minimumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,x)),0<e.maximumInputLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,D)),0<e.maximumSelectionLength&&(e.dataAdapter=y.Decorate(e.dataAdapter,S)),e.tags&&(e.dataAdapter=y.Decorate(e.dataAdapter,w)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=y.Decorate(e.dataAdapter,A)),null!=e.query){var t=u(e.amdBase+"compat/query");e.dataAdapter=y.Decorate(e.dataAdapter,t)}if(null!=e.initSelection){var n=u(e.amdBase+"compat/initSelection");e.dataAdapter=y.Decorate(e.dataAdapter,n)}}if(null==e.resultsAdapter&&(e.resultsAdapter=d,null!=e.ajax&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,T)),null!=e.placeholder&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,O)),e.selectOnClose&&(e.resultsAdapter=y.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter){if(e.multiple)e.dropdownAdapter=E;else{var r=y.Decorate(E,C);e.dropdownAdapter=r}if(0!==e.minimumResultsForSearch&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,L)),e.closeOnSelect&&(e.dropdownAdapter=y.Decorate(e.dropdownAdapter,j)),null!=e.dropdownCssClass||null!=e.dropdownCss||null!=e.adaptDropdownCssClass){var i=u(e.amdBase+"compat/dropdownCss");e.dropdownAdapter=y.Decorate(e.dropdownAdapter,i)}e.dropdownAdapter=y.Decorate(e.dropdownAdapter,q)}if(null==e.selectionAdapter){if(e.multiple?e.selectionAdapter=h:e.selectionAdapter=p,null!=e.placeholder&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,f)),e.allowClear&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,g)),e.multiple&&(e.selectionAdapter=y.Decorate(e.selectionAdapter,m)),null!=e.containerCssClass||null!=e.containerCss||null!=e.adaptContainerCssClass){var o=u(e.amdBase+"compat/containerCss");e.selectionAdapter=y.Decorate(e.selectionAdapter,o)}e.selectionAdapter=y.Decorate(e.selectionAdapter,v)}e.language=this._resolveLanguage(e.language),e.language.push("en");for(var s=[],a=0;a<e.language.length;a++){var l=e.language[a];-1===s.indexOf(l)&&s.push(l)}return e.language=s,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:y.escapeMarkup,language:{},matcher:function e(t,n){if(""===c.trim(t.term))return n;if(n.children&&0<n.children.length){for(var r=c.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&r.children.splice(i,1);return 0<r.children.length?r:e(t,r)}var o=a(n.text).toUpperCase(),s=a(t.term).toUpperCase();return-1<o.indexOf(s)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,r=this.defaults.language,i=t.prop("lang"),o=t.closest("[lang]").prop("lang"),s=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(r),this._resolveLanguage(o));return e.language=s,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(c.isEmptyObject(e))return[];if(c.isPlainObject(e))return[e];var t;t=c.isArray(e)?e:[e];for(var n=[],r=0;r<t.length;r++)if(n.push(t[r]),"string"==typeof t[r]&&0<t[r].indexOf("-")){var i=t[r].split("-")[0];n.push(i)}return n},n.prototype._processTranslations=function(e,t){for(var n=new s,r=0;r<e.length;r++){var i=new s,o=e[r];if("string"==typeof o)try{i=s.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=s.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=c.isPlainObject(o)?new s(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[c.camelCase(e)]=t;var r=y._convertData(n);c.extend(!0,this.defaults,r)},new n}),e.define("select2/options",["require","jquery","./defaults","./utils"],function(r,d,i,p){function e(e,t){if(this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=i.applyFromElement(this.options,t)),this.options=i.apply(this.options),t&&t.is("input")){var n=r(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=p.Decorate(this.options.dataAdapter,n)}}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),p.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),p.StoreData(e[0],"data",p.GetData(e[0],"select2Tags")),p.StoreData(e[0],"tags",!0)),p.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",p.GetData(e[0],"ajaxUrl")),p.StoreData(e[0],"ajax-Url",p.GetData(e[0],"ajaxUrl")));var n={};function r(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,s="data-";if(o.substr(0,s.length)==s){var a=o.substring(s.length),l=p.GetData(e[0],a);n[a.replace(/-([a-z])/g,r)]=l}}d.fn.jquery&&"1."==d.fn.jquery.substr(0,2)&&e[0].dataset&&(n=d.extend(!0,{},e[0].dataset,n));var c=d.extend(!0,{},p.GetData(e[0]),n);for(var u in c=p._convertData(c))-1<d.inArray(u,t)||(d.isPlainObject(this.options[u])?d.extend(this.options[u],c[u]):this.options[u]=c[u]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),e.define("select2/core",["jquery","./options","./utils","./keys"],function(o,c,u,r){var d=function(e,t){null!=u.GetData(e[0],"select2")&&u.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new c(t,e),d.__super__.constructor.call(this);var n=e.attr("tabindex")||0;u.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");var r=this.options.get("dataAdapter");this.dataAdapter=new r(e,this.options);var i=this.render();this._placeContainer(i);var o=this.options.get("selectionAdapter");this.selection=new o(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,i);var s=this.options.get("dropdownAdapter");this.dropdown=new s(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,i);var a=this.options.get("resultsAdapter");this.results=new a(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var l=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){l.trigger("selection:update",{data:e})}),e.addClass("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),u.StoreData(e[0],"select2",this),e.data("select2",this)};return u.Extend(d,u.Observable),d.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+u.generateChars(2):u.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},d.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},d.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var r=this._resolveWidth(e,"style");return null!=r?r:this._resolveWidth(e,"element")}if("element"==t){var i=e.outerWidth(!1);return i<=0?"auto":i+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;var o=e.attr("style");if("string"!=typeof o)return null;for(var s=o.split(";"),a=0,l=s.length;a<l;a+=1){var c=s[a].replace(/\s/g,"").match(n);if(null!==c&&1<=c.length)return c[1]}return null},d.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},d.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=u.bind(this._syncAttributes,this),this._syncS=u.bind(this._syncSubtree,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._syncA);var e=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=e?(this._observer=new e(function(e){t._syncA(),t._syncS(null,e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})):this.$element[0].addEventListener&&(this.$element[0].addEventListener("DOMAttrModified",t._syncA,!1),this.$element[0].addEventListener("DOMNodeInserted",t._syncS,!1),this.$element[0].addEventListener("DOMNodeRemoved",t._syncS,!1))},d.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerSelectionEvents=function(){var n=this,r=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===o.inArray(e,r)&&n.trigger(e,t)})},d.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},d.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container.addClass("select2-container--open")}),this.on("close",function(){n.$container.removeClass("select2-container--open")}),this.on("enable",function(){n.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){n.$container.addClass("select2-container--disabled")}),this.on("blur",function(){n.$container.removeClass("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===r.ESC||t===r.TAB||t===r.UP&&e.altKey?(n.close(e),e.preventDefault()):t===r.ENTER?(n.trigger("results:select",{}),e.preventDefault()):t===r.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===r.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===r.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===r.ENTER||t===r.SPACE||t===r.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},d.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},d.prototype._isChangeMutation=function(e,t){var n=!1,r=this;if(!e||!e.target||"OPTION"===e.target.nodeName||"OPTGROUP"===e.target.nodeName){if(t)if(t.addedNodes&&0<t.addedNodes.length)for(var i=0;i<t.addedNodes.length;i++){t.addedNodes[i].selected&&(n=!0)}else t.removedNodes&&0<t.removedNodes.length?n=!0:o.isArray(t)&&o.each(t,function(e,t){if(r._isChangeMutation(e,t))return!(n=!0)});else n=!0;return n}},d.prototype._syncSubtree=function(e,t){var n=this._isChangeMutation(e,t),r=this;n&&this.dataAdapter.current(function(e){r.trigger("selection:update",{data:e})})},d.prototype.trigger=function(e,t){var n=d.__super__.trigger,r={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in r){var i=r[e],o={prevented:!1,name:e,args:t};if(n.call(this,i,o),o.prevented)return void(t.prevented=!0)}n.call(this,e,t)},d.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},d.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},d.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},d.prototype.isEnabled=function(){return!this.isDisabled()},d.prototype.isDisabled=function(){return this.options.get("disabled")},d.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},d.prototype.hasFocus=function(){return this.$container.hasClass("select2-container--focus")},d.prototype.focus=function(e){this.hasFocus()||(this.$container.addClass("select2-container--focus"),this.trigger("focus",{}))},d.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);var t=!e[0];this.$element.prop("disabled",t)},d.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},d.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();var t=e[0];o.isArray(t)&&(t=o.map(t,function(e){return e.toString()})),this.$element.val(t).trigger("input").trigger("change")},d.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._syncA),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&(this.$element[0].removeEventListener("DOMAttrModified",this._syncA,!1),this.$element[0].removeEventListener("DOMNodeInserted",this._syncS,!1),this.$element[0].removeEventListener("DOMNodeRemoved",this._syncS,!1)),this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",u.GetData(this.$element[0],"old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),u.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},d.prototype.render=function(){var e=o('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container.addClass("select2-container--"+this.options.get("theme")),u.StoreData(e[0],"element",this.$element),e},d}),e.define("jquery-mousewheel",["jquery"],function(e){return e}),e.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,s){if(null==i.fn.select2){var a=["open","close","destroy"];i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,r=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=s.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,r)}),-1<i.inArray(t,a)?this:n}}return null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:e.define,require:e.require}}(),t=e.require("jquery.select2");return u.fn.select2.amd=e,t});
\ No newline at end of file
diff --git a/netbox/project-static/select2-4.0.12/docs/LICENSE.md b/netbox/project-static/select2-4.0.13/docs/LICENSE.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/LICENSE.md
rename to netbox/project-static/select2-4.0.13/docs/LICENSE.md
diff --git a/netbox/project-static/select2-4.0.12/docs/README.md b/netbox/project-static/select2-4.0.13/docs/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/README.md
rename to netbox/project-static/select2-4.0.13/docs/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/accounts/.gitkeep b/netbox/project-static/select2-4.0.13/docs/accounts/.gitkeep
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/accounts/.gitkeep
rename to netbox/project-static/select2-4.0.13/docs/accounts/.gitkeep
diff --git a/netbox/project-static/select2-4.0.12/docs/assets/rtfm-screenshot.png b/netbox/project-static/select2-4.0.13/docs/assets/rtfm-screenshot.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/assets/rtfm-screenshot.png
rename to netbox/project-static/select2-4.0.13/docs/assets/rtfm-screenshot.png
diff --git a/netbox/project-static/select2-4.0.12/docs/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/config/plugins/anchors.yaml b/netbox/project-static/select2-4.0.13/docs/config/plugins/anchors.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/config/plugins/anchors.yaml
rename to netbox/project-static/select2-4.0.13/docs/config/plugins/anchors.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/config/plugins/highlight.yaml b/netbox/project-static/select2-4.0.13/docs/config/plugins/highlight.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/config/plugins/highlight.yaml
rename to netbox/project-static/select2-4.0.13/docs/config/plugins/highlight.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/config/plugins/simplesearch.yaml b/netbox/project-static/select2-4.0.13/docs/config/plugins/simplesearch.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/config/plugins/simplesearch.yaml
rename to netbox/project-static/select2-4.0.13/docs/config/plugins/simplesearch.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/config/site.yaml b/netbox/project-static/select2-4.0.13/docs/config/site.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/config/site.yaml
rename to netbox/project-static/select2-4.0.13/docs/config/site.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/config/system.yaml b/netbox/project-static/select2-4.0.13/docs/config/system.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/config/system.yaml
rename to netbox/project-static/select2-4.0.13/docs/config/system.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/data/.gitkeep b/netbox/project-static/select2-4.0.13/docs/data/.gitkeep
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/data/.gitkeep
rename to netbox/project-static/select2-4.0.13/docs/data/.gitkeep
diff --git a/netbox/project-static/select2-4.0.12/docs/localhost/config/security.yaml b/netbox/project-static/select2-4.0.13/docs/localhost/config/security.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/localhost/config/security.yaml
rename to netbox/project-static/select2-4.0.13/docs/localhost/config/security.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/localhost/config/system.yaml b/netbox/project-static/select2-4.0.13/docs/localhost/config/system.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/localhost/config/system.yaml
rename to netbox/project-static/select2-4.0.13/docs/localhost/config/system.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/01.installation/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/01.installation/docs.md
similarity index 94%
rename from netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/01.installation/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/01.installation/docs.md
index ce26acae4..f691951eb 100644
--- a/netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/01.installation/docs.md
+++ b/netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/01.installation/docs.md
@@ -13,8 +13,8 @@ A CDN (content delivery network) is the fastest way to get up and running with S
 Select2 is hosted on both the [jsDelivr](https://www.jsdelivr.com/package/npm/select2) and [cdnjs](https://cdnjs.com/libraries/select2) CDNs. Simply include the following lines of code in the `<head>` section of your page:
 
 ```
-<link href="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/css/select2.min.css" rel="stylesheet" />
-<script src="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/js/select2.min.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/css/select2.min.css" rel="stylesheet" />
+<script src="https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/select2.min.js"></script>
 ```
 
 >>> <i class="fa fa-info-circle"></i> Immediately following a new release, it takes some time for CDNs to catch up and get the new versions live on the CDN.
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/02.basic-usage/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/02.basic-usage/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/02.basic-usage/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/02.basic-usage/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/03.builds-and-modules/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/03.builds-and-modules/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/03.builds-and-modules/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/03.builds-and-modules/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/01.getting-started/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/01.getting-started/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/01.getting-help/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/01.getting-help/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/01.getting-help/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/01.getting-help/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/02.common-problems/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/02.common-problems/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/02.common-problems/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/02.common-problems/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/02.troubleshooting/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/02.troubleshooting/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/03.configuration/01.options-api/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/03.configuration/01.options-api/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/03.configuration/01.options-api/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/03.configuration/01.options-api/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/03.configuration/02.defaults/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/03.configuration/02.defaults/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/03.configuration/02.defaults/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/03.configuration/02.defaults/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/03.configuration/03.data-attributes/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/03.configuration/03.data-attributes/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/03.configuration/03.data-attributes/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/03.configuration/03.data-attributes/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/03.configuration/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/03.configuration/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/03.configuration/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/03.configuration/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/04.appearance/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/04.appearance/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/04.appearance/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/04.appearance/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/05.options/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/05.options/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/05.options/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/05.options/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/01.formats/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/01.formats/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/01.formats/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/01.formats/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/02.ajax/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/02.ajax/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/02.ajax/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/02.ajax/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/03.arrays/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/03.arrays/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/03.arrays/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/03.arrays/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/06.data-sources/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/06.data-sources/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/07.dropdown/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/07.dropdown/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/07.dropdown/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/07.dropdown/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/08.selections/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/08.selections/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/08.selections/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/08.selections/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/09.tagging/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/09.tagging/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/09.tagging/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/09.tagging/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/10.placeholders/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/10.placeholders/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/10.placeholders/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/10.placeholders/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/11.searching/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/11.searching/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/11.searching/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/11.searching/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/01.add-select-clear-items/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/01.add-select-clear-items/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/01.add-select-clear-items/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/01.add-select-clear-items/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/02.retrieving-selections/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/02.retrieving-selections/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/02.retrieving-selections/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/02.retrieving-selections/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/03.methods/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/03.methods/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/03.methods/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/03.methods/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/04.events/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/04.events/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/04.events/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/04.events/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/12.programmatic-control/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/12.programmatic-control/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/13.i18n/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/13.i18n/docs.md
similarity index 98%
rename from netbox/project-static/select2-4.0.12/docs/pages/13.i18n/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/13.i18n/docs.md
index da9cef4fa..227cc9f34 100644
--- a/netbox/project-static/select2-4.0.12/docs/pages/13.i18n/docs.md
+++ b/netbox/project-static/select2-4.0.13/docs/pages/13.i18n/docs.md
@@ -7,7 +7,7 @@ process:
 never_cache_twig: true
 ---
 
-{% do assets.addJs('https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/js/i18n/es.js', 90) %}
+{% do assets.addJs('https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/i18n/es.js', 90) %}
 
 ## Message translations
 
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/01.adapters-and-decorators/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/01.adapters-and-decorators/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/01.adapters-and-decorators/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/01.adapters-and-decorators/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/01.selection/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/01.selection/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/01.selection/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/01.selection/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/02.array/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/02.array/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/02.array/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/02.array/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/03.ajax/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/03.ajax/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/03.ajax/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/03.ajax/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/04.data/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/04.data/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/04.data/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/04.data/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/05.results/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/05.results/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/05.results/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/05.results/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/06.dropdown/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/06.dropdown/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/06.dropdown/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/06.dropdown/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/02.default-adapters/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/02.default-adapters/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/14.advanced/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/14.advanced/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/14.advanced/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/14.advanced/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/01.new-in-40/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/01.new-in-40/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/01.new-in-40/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/01.new-in-40/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/02.migrating-from-35/docs.md b/netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/02.migrating-from-35/docs.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/02.migrating-from-35/docs.md
rename to netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/02.migrating-from-35/docs.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/chapter.md b/netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/chapter.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/15.upgrading/chapter.md
rename to netbox/project-static/select2-4.0.13/docs/pages/15.upgrading/chapter.md
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ak.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ak.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ak.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ak.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/al.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/al.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/al.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/al.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ar.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ar.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ar.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ar.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/az.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/az.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/az.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/az.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ca.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ca.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ca.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ca.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/co.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/co.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/co.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/co.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ct.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ct.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ct.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ct.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/de.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/de.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/de.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/de.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/fl.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/fl.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/fl.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/fl.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ga.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ga.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ga.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ga.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/hi.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/hi.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/hi.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/hi.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ia.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ia.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ia.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ia.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/id.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/id.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/id.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/id.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/il.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/il.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/il.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/il.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/in.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/in.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/in.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/in.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ks.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ks.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ks.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ks.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ky.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ky.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ky.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ky.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/la.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/la.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/la.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/la.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ma.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ma.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ma.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ma.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/md.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/md.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/md.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/md.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/me.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/me.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/me.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/me.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/mi.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/mi.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/mi.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/mi.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/mn.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/mn.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/mn.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/mn.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/mo.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/mo.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/mo.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/mo.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ms.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ms.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ms.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ms.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/mt.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/mt.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/mt.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/mt.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nc.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nc.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nc.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nc.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nd.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nd.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nd.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nd.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ne.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ne.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ne.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ne.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nh.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nh.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nh.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nh.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nj.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nj.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nj.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nj.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nm.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nm.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nm.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nm.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/nv.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/nv.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/nv.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/nv.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ny.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ny.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ny.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ny.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/oh.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/oh.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/oh.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/oh.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ok.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ok.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ok.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ok.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/or.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/or.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/or.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/or.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/pa.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/pa.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/pa.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/pa.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ri.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ri.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ri.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ri.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/sc.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/sc.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/sc.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/sc.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/sd.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/sd.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/sd.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/sd.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/tn.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/tn.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/tn.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/tn.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/tx.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/tx.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/tx.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/tx.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/ut.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/ut.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/ut.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/ut.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/va.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/va.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/va.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/va.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/vt.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/vt.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/vt.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/vt.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/wa.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/wa.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/wa.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/wa.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/wi.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/wi.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/wi.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/wi.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/wv.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/wv.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/wv.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/wv.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/flags/wy.png b/netbox/project-static/select2-4.0.13/docs/pages/images/flags/wy.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/flags/wy.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/flags/wy.png
diff --git a/netbox/project-static/select2-4.0.12/docs/pages/images/logo.png b/netbox/project-static/select2-4.0.13/docs/pages/images/logo.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/pages/images/logo.png
rename to netbox/project-static/select2-4.0.13/docs/pages/images/logo.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/.gitkeep b/netbox/project-static/select2-4.0.13/docs/plugins/.gitkeep
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/.gitkeep
rename to netbox/project-static/select2-4.0.13/docs/plugins/.gitkeep
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/anchors.php b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/anchors.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/anchors.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/anchors.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/anchors.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/anchors.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/anchors.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/anchors.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/anchors/js/anchor.min.js b/netbox/project-static/select2-4.0.13/docs/plugins/anchors/js/anchor.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/anchors/js/anchor.min.js
rename to netbox/project-static/select2-4.0.13/docs/plugins/anchors/js/anchor.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/assets/readme_1.png b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/assets/readme_1.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/assets/readme_1.png
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/assets/readme_1.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/breadcrumbs.php b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/breadcrumbs.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/breadcrumbs.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/breadcrumbs.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/breadcrumbs.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/breadcrumbs.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/breadcrumbs.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/breadcrumbs.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/classes/breadcrumbs.php b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/classes/breadcrumbs.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/classes/breadcrumbs.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/classes/breadcrumbs.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/css/breadcrumbs.css b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/css/breadcrumbs.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/css/breadcrumbs.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/css/breadcrumbs.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/templates/partials/breadcrumbs.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/templates/partials/breadcrumbs.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/breadcrumbs/templates/partials/breadcrumbs.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/breadcrumbs/templates/partials/breadcrumbs.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/error/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/error/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/error/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/assets/readme_1.png b/netbox/project-static/select2-4.0.13/docs/plugins/error/assets/readme_1.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/assets/readme_1.png
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/assets/readme_1.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/error/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/cli/LogCommand.php b/netbox/project-static/select2-4.0.13/docs/plugins/error/cli/LogCommand.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/cli/LogCommand.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/cli/LogCommand.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/error.php b/netbox/project-static/select2-4.0.13/docs/plugins/error/error.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/error.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/error.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/error.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/error/error.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/error.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/error.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/languages.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/error/languages.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/languages.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/languages.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/pages/error.md b/netbox/project-static/select2-4.0.13/docs/plugins/error/pages/error.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/pages/error.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/pages/error.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/templates/error.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/error/templates/error.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/templates/error.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/templates/error.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/error/templates/error.json.twig b/netbox/project-static/select2-4.0.13/docs/plugins/error/templates/error.json.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/error/templates/error.json.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/error/templates/error.json.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/assets/readme_1.png b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/assets/readme_1.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/assets/readme_1.png
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/assets/readme_1.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/agate.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/agate.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/agate.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/agate.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/androidstudio.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/androidstudio.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/androidstudio.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/androidstudio.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/arduino-light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/arduino-light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/arduino-light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/arduino-light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/arta.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/arta.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/arta.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/arta.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/ascetic.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/ascetic.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/ascetic.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/ascetic.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-cave.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-cave.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-cave.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-cave.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-cave.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-cave.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-cave.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-cave.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-dune.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-dune.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-dune.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-dune.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-dune.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-dune.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-dune.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-dune.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-estuary.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-estuary.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-estuary.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-estuary.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-estuary.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-estuary.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-estuary.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-estuary.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-forest.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-forest.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-forest.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-forest.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-forest.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-forest.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-forest.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-forest.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-heath.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-heath.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-heath.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-heath.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-heath.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-heath.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-heath.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-heath.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-lakeside.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-lakeside.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-lakeside.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-lakeside.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-lakeside.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-lakeside.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-lakeside.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-lakeside.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-plateau.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-plateau.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-plateau.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-plateau.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-plateau.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-plateau.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-plateau.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-plateau.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-savanna.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-savanna.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-savanna.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-savanna.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-savanna.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-savanna.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-savanna.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-savanna.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-seaside.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-seaside.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-seaside.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-seaside.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-seaside.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-seaside.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-seaside.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-seaside.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-sulphurpool.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-sulphurpool.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-sulphurpool.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-sulphurpool.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-sulphurpool.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-sulphurpool.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/atelier-sulphurpool.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/atelier-sulphurpool.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/brown-paper.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/brown-paper.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/brown-paper.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/brown-paper.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/codepen-embed.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/codepen-embed.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/codepen-embed.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/codepen-embed.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/color-brewer.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/color-brewer.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/color-brewer.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/color-brewer.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/darkula.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/darkula.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/darkula.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/darkula.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/default.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/default.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/default.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/default.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/docco.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/docco.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/docco.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/docco.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/far.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/far.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/far.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/far.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/foundation.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/foundation.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/foundation.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/foundation.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/github-gist.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/github-gist.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/github-gist.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/github-gist.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/github.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/github.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/github.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/github.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/googlecode.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/googlecode.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/googlecode.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/googlecode.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/grayscale.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/grayscale.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/grayscale.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/grayscale.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/hopscotch.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/hopscotch.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/hopscotch.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/hopscotch.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/hybrid.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/hybrid.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/hybrid.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/hybrid.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/idea.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/idea.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/idea.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/idea.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/ir-black.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/ir-black.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/ir-black.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/ir-black.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/kimbie.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/kimbie.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/kimbie.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/kimbie.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/kimbie.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/kimbie.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/kimbie.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/kimbie.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/learn.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/learn.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/learn.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/learn.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/magula.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/magula.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/magula.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/magula.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/mono-blue.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/mono-blue.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/mono-blue.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/mono-blue.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/monokai-sublime.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/monokai-sublime.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/monokai-sublime.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/monokai-sublime.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/monokai.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/monokai.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/monokai.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/monokai.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/obsidian.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/obsidian.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/obsidian.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/obsidian.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso-dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso-dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso-dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso-dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso-light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso-light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso-light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso-light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso.dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso.dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso.dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso.dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso.light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso.light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/paraiso.light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/paraiso.light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/pojoaque.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/pojoaque.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/pojoaque.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/pojoaque.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/railscasts.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/railscasts.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/railscasts.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/railscasts.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/rainbow.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/rainbow.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/rainbow.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/rainbow.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/school-book.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/school-book.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/school-book.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/school-book.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/solarized-dark.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/solarized-dark.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/solarized-dark.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/solarized-dark.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/solarized-light.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/solarized-light.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/solarized-light.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/solarized-light.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/sunburst.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/sunburst.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/sunburst.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/sunburst.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-blue.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-blue.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-blue.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-blue.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-bright.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-bright.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-bright.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-bright.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-eighties.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-eighties.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night-eighties.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night-eighties.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow-night.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow-night.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/tomorrow.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/tomorrow.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/vs.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/vs.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/vs.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/vs.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/xcode.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/xcode.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/xcode.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/xcode.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/zenburn.css b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/zenburn.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/css/zenburn.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/css/zenburn.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/highlight.php b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/highlight.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/highlight.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/highlight.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/highlight.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/highlight.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/highlight.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/highlight.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/js/highlight.pack.js b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/js/highlight.pack.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/js/highlight.pack.js
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/js/highlight.pack.js
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/highlight/js/highlightjs-line-numbers.min.js b/netbox/project-static/select2-4.0.13/docs/plugins/highlight/js/highlightjs-line-numbers.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/highlight/js/highlightjs-line-numbers.min.js
rename to netbox/project-static/select2-4.0.13/docs/plugins/highlight/js/highlightjs-line-numbers.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/problems/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/problems/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/problems/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/assets/readme_1.png b/netbox/project-static/select2-4.0.13/docs/plugins/problems/assets/readme_1.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/assets/readme_1.png
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/assets/readme_1.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/problems/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/css/problems.css b/netbox/project-static/select2-4.0.13/docs/plugins/problems/css/problems.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/css/problems.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/css/problems.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/css/template.css b/netbox/project-static/select2-4.0.13/docs/plugins/problems/css/template.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/css/template.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/css/template.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/html/problems.html b/netbox/project-static/select2-4.0.13/docs/plugins/problems/html/problems.html
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/html/problems.html
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/html/problems.html
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/problems.php b/netbox/project-static/select2-4.0.13/docs/plugins/problems/problems.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/problems.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/problems.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/problems/problems.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/problems/problems.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/problems/problems.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/problems/problems.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/LICENSE b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/README.md b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/README.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/assets/readme_1.png b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/assets/readme_1.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/assets/readme_1.png
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/assets/readme_1.png
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/assets/search.svg b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/assets/search.svg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/assets/search.svg
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/assets/search.svg
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/css/simplesearch.css b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/css/simplesearch.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/css/simplesearch.css
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/css/simplesearch.css
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/js/simplesearch.js b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/js/simplesearch.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/js/simplesearch.js
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/js/simplesearch.js
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/languages.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/languages.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/languages.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/languages.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/pages/simplesearch.md b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/pages/simplesearch.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/pages/simplesearch.md
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/pages/simplesearch.md
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/simplesearch.php b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/simplesearch.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/simplesearch.php
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/simplesearch.php
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/simplesearch.yaml b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/simplesearch.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/simplesearch.yaml
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/simplesearch.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_base.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_base.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_base.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_base.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_item.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_item.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_item.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_item.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_searchbox.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_searchbox.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/partials/simplesearch_searchbox.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/partials/simplesearch_searchbox.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/simplesearch_results.html.twig b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/simplesearch_results.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/simplesearch_results.html.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/simplesearch_results.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/simplesearch_results.json.twig b/netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/simplesearch_results.json.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/plugins/simplesearch/templates/simplesearch_results.json.twig
rename to netbox/project-static/select2-4.0.13/docs/plugins/simplesearch/templates/simplesearch_results.json.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/screenshot.jpg b/netbox/project-static/select2-4.0.13/docs/screenshot.jpg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/screenshot.jpg
rename to netbox/project-static/select2-4.0.13/docs/screenshot.jpg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/.gitkeep b/netbox/project-static/select2-4.0.13/docs/themes/.gitkeep
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/.gitkeep
rename to netbox/project-static/select2-4.0.13/docs/themes/.gitkeep
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/CHANGELOG.md b/netbox/project-static/select2-4.0.13/docs/themes/learn2/CHANGELOG.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/CHANGELOG.md
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/CHANGELOG.md
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/LICENSE b/netbox/project-static/select2-4.0.13/docs/themes/learn2/LICENSE
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/LICENSE
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/LICENSE
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/README.md b/netbox/project-static/select2-4.0.13/docs/themes/learn2/README.md
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/README.md
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/README.md
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints.yaml b/netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints/chapter.yaml b/netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints/chapter.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints/chapter.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints/chapter.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints/docs.yaml b/netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints/docs.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/blueprints/docs.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/blueprints/docs.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/nucleus.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/nucleus.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/nucleus.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/nucleus.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/nucleus.css.map b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/nucleus.css.map
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/nucleus.css.map
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/nucleus.css.map
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/theme.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/theme.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/theme.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/theme.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/theme.css.map b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/theme.css.map
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css-compiled/theme.css.map
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css-compiled/theme.css.map
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css/featherlight.min.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css/featherlight.min.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css/featherlight.min.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css/featherlight.min.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css/font-awesome.min.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css/font-awesome.min.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css/font-awesome.min.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css/font-awesome.min.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css/nucleus-ie10.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css/nucleus-ie10.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css/nucleus-ie10.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css/nucleus-ie10.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css/nucleus-ie9.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css/nucleus-ie9.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css/nucleus-ie9.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css/nucleus-ie9.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/css/pure-0.5.0/grids-min.css b/netbox/project-static/select2-4.0.13/docs/themes/learn2/css/pure-0.5.0/grids-min.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/css/pure-0.5.0/grids-min.css
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/css/pure-0.5.0/grids-min.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.eot b/netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.eot
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.eot
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.eot
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.svg b/netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.svg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.svg
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.svg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.ttf b/netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.ttf
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.ttf
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.woff b/netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.woff
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.woff
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.woff
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.woff2 b/netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/fonts/fontawesome-webfont.woff2
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/fonts/fontawesome-webfont.woff2
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/images/clippy.svg b/netbox/project-static/select2-4.0.13/docs/themes/learn2/images/clippy.svg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/images/clippy.svg
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/images/clippy.svg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/images/favicon.png b/netbox/project-static/select2-4.0.13/docs/themes/learn2/images/favicon.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/images/favicon.png
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/images/favicon.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/images/logo.png b/netbox/project-static/select2-4.0.13/docs/themes/learn2/images/logo.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/images/logo.png
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/images/logo.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/clipboard.min.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/clipboard.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/clipboard.min.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/clipboard.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/featherlight.min.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/featherlight.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/featherlight.min.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/featherlight.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/html5shiv-printshiv.min.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/html5shiv-printshiv.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/html5shiv-printshiv.min.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/html5shiv-printshiv.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/jquery.scrollbar.min.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/jquery.scrollbar.min.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/jquery.scrollbar.min.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/jquery.scrollbar.min.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/learn.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/learn.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/learn.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/learn.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/js/modernizr.custom.71422.js b/netbox/project-static/select2-4.0.13/docs/themes/learn2/js/modernizr.custom.71422.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/js/modernizr.custom.71422.js
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/js/modernizr.custom.71422.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/languages.yaml b/netbox/project-static/select2-4.0.13/docs/themes/learn2/languages.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/languages.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/languages.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/learn2.php b/netbox/project-static/select2-4.0.13/docs/themes/learn2/learn2.php
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/learn2.php
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/learn2.php
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/learn2.yaml b/netbox/project-static/select2-4.0.13/docs/themes/learn2/learn2.yaml
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/learn2.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/learn2.yaml
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/screenshot.jpg b/netbox/project-static/select2-4.0.13/docs/themes/learn2/screenshot.jpg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/screenshot.jpg
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/screenshot.jpg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss.sh b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss.sh
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss.sh
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss.sh
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_base.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_base.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_base.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_base.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_breakpoints.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_breakpoints.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_breakpoints.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_breakpoints.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_core.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_core.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_core.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_core.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_layout.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_layout.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_layout.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_layout.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_nav.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_nav.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_nav.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_nav.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_typography.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_typography.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/nucleus/_typography.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/nucleus/_typography.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_base.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_base.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_base.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_base.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_bullets.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_bullets.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_bullets.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_bullets.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_colors.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_colors.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/configuration/theme/_colors.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/configuration/theme/_colors.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_core.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_core.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_core.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_core.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_flex.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_flex.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_flex.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_flex.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_forms.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_forms.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_forms.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_forms.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_typography.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_typography.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/_typography.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/_typography.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_base.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_base.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_base.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_base.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_direction.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_direction.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_direction.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_direction.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_range.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_range.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/functions/_range.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/functions/_range.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_base.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_base.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_base.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_base.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_breakpoints.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_breakpoints.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_breakpoints.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_breakpoints.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_utilities.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_utilities.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/mixins/_utilities.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/mixins/_utilities.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/particles/_align-text.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/particles/_align-text.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/particles/_align-text.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/particles/_align-text.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/particles/_visibility.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/particles/_visibility.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/nucleus/particles/_visibility.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/nucleus/particles/_visibility.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_bullets.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_bullets.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_bullets.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_bullets.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_buttons.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_buttons.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_buttons.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_buttons.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_configuration.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_configuration.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_configuration.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_configuration.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_core.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_core.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_core.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_core.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_custom.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_custom.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_custom.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_custom.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_fonts.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_fonts.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_fonts.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_fonts.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_forms.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_forms.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_forms.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_forms.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_header.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_header.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_header.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_header.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_main.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_main.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_main.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_main.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_nav.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_nav.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_nav.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_nav.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_scrollbar.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_scrollbar.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_scrollbar.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_scrollbar.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_tables.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_tables.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_tables.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_tables.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_tooltips.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_tooltips.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_tooltips.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_tooltips.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_typography.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_typography.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/_typography.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/_typography.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/modules/_base.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/modules/_base.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/modules/_base.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/modules/_base.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/modules/_buttons.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/modules/_buttons.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/theme/modules/_buttons.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/theme/modules/_buttons.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/_bourbon-deprecated-upcoming.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/_bourbon.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/_bourbon.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/_bourbon.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/_bourbon.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_button.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_button.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_button.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_button.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_clearfix.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_directional-values.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_ellipsis.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_font-family.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_hide-text.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_html5-input-types.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_position.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_position.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_position.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_position.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_prefixer.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_rem.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_rem.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_rem.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_rem.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_retina-image.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_size.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_size.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_size.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_size.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_timing-functions.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_triangle.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/addons/_word-wrap.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_animation.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_animation.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_animation.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_animation.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_appearance.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_backface-visibility.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_background-image.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_background.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_background.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_background.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_background.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_border-image.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_border-radius.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_box-sizing.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_calc.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_calc.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_calc.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_calc.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_columns.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_columns.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_columns.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_columns.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_filter.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_filter.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_filter.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_filter.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_flex-box.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_font-face.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_font-feature-settings.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_hidpi-media-query.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_hyphens.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_image-rendering.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_keyframes.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_linear-gradient.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_perspective.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_placeholder.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_radial-gradient.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_transform.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_transform.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_transform.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_transform.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_transition.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_transition.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_transition.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_transition.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/css3/_user-select.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_assign.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_assign.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_assign.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_assign.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_color-lightness.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_flex-grid.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_golden-ratio.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_grid-width.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_modular-scale.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-em.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_px-to-rem.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_strip-units.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_tint-shade.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_transition-property-name.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/functions/_unpack.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_convert-units.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_gradient-positions-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_is-num.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-angle-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-gradient-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-positions-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_linear-side-corner-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-arg-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-gradient-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_radial-positions-parser.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_render-gradients.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_shape-size-stripper.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/helpers/_str-to-num.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/settings/_prefixer.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/bourbon/settings/_px-to-em.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/_color-schemer.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_cmyk.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-adjustments.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_color-schemer.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_colorblind.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_comparison.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_equalize.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_harmonize.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_interpolation.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mix.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_mixins.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_ryb.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss b/netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/scss/vendor/color-schemer/color-schemer/_tint-shade.scss
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/chapter.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/chapter.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/chapter.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/chapter.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/default.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/default.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/default.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/default.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/docs.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/docs.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/docs.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/docs.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/error.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/error.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/error.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/error.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/analytics.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/analytics.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/analytics.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/analytics.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/base.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/base.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/base.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/base.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/github_link.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/github_link.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/github_link.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/github_link.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/github_note.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/github_note.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/github_note.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/github_note.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/logo.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/logo.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/logo.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/logo.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/metadata.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/metadata.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/metadata.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/metadata.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/page.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/page.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/page.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/page.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/sidebar.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/sidebar.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/templates/partials/sidebar.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/templates/partials/sidebar.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/learn2/thumbnail.jpg b/netbox/project-static/select2-4.0.13/docs/themes/learn2/thumbnail.jpg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/learn2/thumbnail.jpg
rename to netbox/project-static/select2-4.0.13/docs/themes/learn2/thumbnail.jpg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/css/s2-docs.css b/netbox/project-static/select2-4.0.13/docs/themes/site/css/s2-docs.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/css/s2-docs.css
rename to netbox/project-static/select2-4.0.13/docs/themes/site/css/s2-docs.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/css/theme.css b/netbox/project-static/select2-4.0.13/docs/themes/site/css/theme.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/css/theme.css
rename to netbox/project-static/select2-4.0.13/docs/themes/site/css/theme.css
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-36x36.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-36x36.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-36x36.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-36x36.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-48x48.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-48x48.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-48x48.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-48x48.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-72x72.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-72x72.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/android-chrome-72x72.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/android-chrome-72x72.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-57x57.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-57x57.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-57x57.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-57x57.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-60x60.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-60x60.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-60x60.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-60x60.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-72x72.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-72x72.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-72x72.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-72x72.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-precomposed.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-precomposed.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon-precomposed.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon-precomposed.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/apple-touch-icon.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/apple-touch-icon.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon-16x16.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon-16x16.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon-16x16.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon-16x16.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon-32x32.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon-32x32.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon-32x32.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon-32x32.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon.ico b/netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon.ico
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon.ico
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon.ico
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/favicon.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/favicon.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/manifest.json b/netbox/project-static/select2-4.0.13/docs/themes/site/images/manifest.json
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/manifest.json
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/manifest.json
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-150x150.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-150x150.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-150x150.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-150x150.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-310x150.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-310x150.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-310x150.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-310x150.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-70x70.png b/netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-70x70.png
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/mstile-70x70.png
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/mstile-70x70.png
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/images/safari-pinned-tab.svg b/netbox/project-static/select2-4.0.13/docs/themes/site/images/safari-pinned-tab.svg
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/images/safari-pinned-tab.svg
rename to netbox/project-static/select2-4.0.13/docs/themes/site/images/safari-pinned-tab.svg
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/js/data-fill-from.js b/netbox/project-static/select2-4.0.13/docs/themes/site/js/data-fill-from.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/js/data-fill-from.js
rename to netbox/project-static/select2-4.0.13/docs/themes/site/js/data-fill-from.js
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/site.yaml b/netbox/project-static/select2-4.0.13/docs/themes/site/site.yaml
similarity index 65%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/site.yaml
rename to netbox/project-static/select2-4.0.13/docs/themes/site/site.yaml
index f1ecec179..a486ca025 100644
--- a/netbox/project-static/select2-4.0.12/docs/themes/site/site.yaml
+++ b/netbox/project-static/select2-4.0.13/docs/themes/site/site.yaml
@@ -9,5 +9,5 @@ streams:
 google_analytics_code: UA-57144786-2
 github:
     position: top                                   # top | bottom | off
-    tree: https://github.com/select2/docs/blob/develop/
-    commits: https://github.com/select2/docs/commits/develop/
+    tree: https://github.com/select2/select2/blob/develop/docs/
+    commits: https://github.com/select2/select2/commits/develop/docs/
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/base.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/base.html.twig
similarity index 98%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/base.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/base.html.twig
index d26baa401..7cde0c918 100644
--- a/netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/base.html.twig
+++ b/netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/base.html.twig
@@ -17,7 +17,7 @@
         {% do assets.addCss('theme://css/custom.css',100) %}
         {% do assets.addCss('theme://css/font-awesome.min.css',100) %}
         {% do assets.addCss('theme://css/featherlight.min.css') %}
-        {% do assets.addCss('https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/css/select2.min.css') %}
+        {% do assets.addCss('https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/css/select2.min.css') %}
         {% do assets.addCss('theme://css/s2-docs.css', 100) %}
         {% do assets.addCss('theme://css/theme.css',100) %}
 
@@ -33,7 +33,7 @@
     {% block javascripts %}
         {% do assets.addJs('jquery',101) %}
         {% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %}
-        {% do assets.addJs('https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/js/select2.full.min.js', 100) %}
+        {% do assets.addJs('https://cdn.jsdelivr.net/npm/select2@4.0.13/dist/js/select2.full.min.js', 100) %}
         {% do assets.addJs('https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js', 100) %}
         {% do assets.addJs('theme://js/featherlight.min.js') %}
         {% do assets.addJs('theme://js/clipboard.min.js') %}
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/js/source-states.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/js/source-states.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/js/source-states.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/js/source-states.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/logo.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/logo.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/logo.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/logo.html.twig
diff --git a/netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/sidebar.html.twig b/netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/sidebar.html.twig
similarity index 100%
rename from netbox/project-static/select2-4.0.12/docs/themes/site/templates/partials/sidebar.html.twig
rename to netbox/project-static/select2-4.0.13/docs/themes/site/templates/partials/sidebar.html.twig
diff --git a/netbox/project-static/select2-4.0.12/package.json b/netbox/project-static/select2-4.0.13/package.json
similarity index 98%
rename from netbox/project-static/select2-4.0.12/package.json
rename to netbox/project-static/select2-4.0.13/package.json
index c7c3fb0a3..30135ba94 100644
--- a/netbox/project-static/select2-4.0.12/package.json
+++ b/netbox/project-static/select2-4.0.13/package.json
@@ -39,7 +39,7 @@
     "src",
     "dist"
   ],
-  "version": "4.0.12",
+  "version": "4.0.13",
   "jspm": {
     "main": "js/select2",
     "directories": {
diff --git a/netbox/project-static/select2-4.0.12/src/js/banner.end.js b/netbox/project-static/select2-4.0.13/src/js/banner.end.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/banner.end.js
rename to netbox/project-static/select2-4.0.13/src/js/banner.end.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/banner.start.js b/netbox/project-static/select2-4.0.13/src/js/banner.start.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/banner.start.js
rename to netbox/project-static/select2-4.0.13/src/js/banner.start.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/jquery.mousewheel.shim.js b/netbox/project-static/select2-4.0.13/src/js/jquery.mousewheel.shim.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/jquery.mousewheel.shim.js
rename to netbox/project-static/select2-4.0.13/src/js/jquery.mousewheel.shim.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/jquery.select2.js b/netbox/project-static/select2-4.0.13/src/js/jquery.select2.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/jquery.select2.js
rename to netbox/project-static/select2-4.0.13/src/js/jquery.select2.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/jquery.shim.js b/netbox/project-static/select2-4.0.13/src/js/jquery.shim.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/jquery.shim.js
rename to netbox/project-static/select2-4.0.13/src/js/jquery.shim.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/containerCss.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/containerCss.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/containerCss.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/containerCss.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/dropdownCss.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/dropdownCss.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/dropdownCss.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/dropdownCss.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/initSelection.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/initSelection.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/initSelection.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/initSelection.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/inputData.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/inputData.js
similarity index 94%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/inputData.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/inputData.js
index 6e1dee261..cd58c5c94 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/compat/inputData.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/compat/inputData.js
@@ -65,13 +65,13 @@ define([
       });
 
       this.$element.val(data.id);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     } else {
       var value = this.$element.val();
       value += this._valueSeparator + data.id;
 
       this.$element.val(value);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -94,7 +94,7 @@ define([
       }
 
       self.$element.val(values.join(self._valueSeparator));
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/matcher.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/matcher.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/matcher.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/matcher.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/query.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/query.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/query.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/query.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/compat/utils.js b/netbox/project-static/select2-4.0.13/src/js/select2/compat/utils.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/compat/utils.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/compat/utils.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/core.js b/netbox/project-static/select2-4.0.13/src/js/select2/core.js
similarity index 91%
rename from netbox/project-static/select2-4.0.12/src/js/select2/core.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/core.js
index 92084143a..831691f81 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/core.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/core.js
@@ -208,8 +208,8 @@ define([
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
-        $.each(mutations, self._syncS);
+        self._syncA();
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -331,7 +331,7 @@ define([
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -365,7 +365,7 @@ define([
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -376,7 +376,7 @@ define([
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -404,7 +404,22 @@ define([
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -455,7 +470,7 @@ define([
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -471,15 +486,40 @@ define([
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -556,7 +596,7 @@ define([
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/ajax.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/ajax.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/ajax.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/ajax.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/array.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/array.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/array.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/array.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/base.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/base.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/base.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/base.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/maximumInputLength.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/maximumInputLength.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/maximumInputLength.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/maximumInputLength.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/maximumSelectionLength.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/maximumSelectionLength.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/maximumSelectionLength.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/maximumSelectionLength.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/minimumInputLength.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/minimumInputLength.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/minimumInputLength.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/minimumInputLength.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/select.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/select.js
similarity index 95%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/select.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/select.js
index a897198b5..a38473502 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/data/select.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/data/select.js
@@ -36,7 +36,7 @@ define([
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -57,13 +57,13 @@ define([
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -79,7 +79,7 @@ define([
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -97,7 +97,7 @@ define([
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/tags.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/tags.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/tags.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/tags.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/data/tokenizer.js b/netbox/project-static/select2-4.0.13/src/js/select2/data/tokenizer.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/data/tokenizer.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/data/tokenizer.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/defaults.js b/netbox/project-static/select2-4.0.13/src/js/select2/defaults.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/defaults.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/defaults.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/diacritics.js b/netbox/project-static/select2-4.0.13/src/js/select2/diacritics.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/diacritics.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/diacritics.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/attachBody.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/attachBody.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/attachBody.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/attachBody.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/attachContainer.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/attachContainer.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/attachContainer.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/attachContainer.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/closeOnSelect.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/closeOnSelect.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/closeOnSelect.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/closeOnSelect.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/hidePlaceholder.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/hidePlaceholder.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/hidePlaceholder.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/hidePlaceholder.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/infiniteScroll.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/infiniteScroll.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/infiniteScroll.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/infiniteScroll.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/minimumResultsForSearch.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/minimumResultsForSearch.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/minimumResultsForSearch.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/minimumResultsForSearch.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/search.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/search.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/search.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/search.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/selectOnClose.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/selectOnClose.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/selectOnClose.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/selectOnClose.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/dropdown/stopPropagation.js b/netbox/project-static/select2-4.0.13/src/js/select2/dropdown/stopPropagation.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/dropdown/stopPropagation.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/dropdown/stopPropagation.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/af.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/af.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/af.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/af.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ar.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ar.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ar.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ar.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/az.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/az.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/az.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/az.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/bg.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/bg.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/bg.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/bg.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/bn.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/bn.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/bn.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/bn.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/bs.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/bs.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/bs.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/bs.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ca.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ca.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ca.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ca.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/cs.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/cs.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/cs.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/cs.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/da.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/da.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/da.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/da.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/de.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/de.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/de.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/de.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/dsb.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/dsb.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/dsb.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/dsb.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/el.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/el.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/el.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/el.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/en.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/en.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/en.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/en.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/es.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/es.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/es.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/es.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/et.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/et.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/et.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/et.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/eu.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/eu.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/eu.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/eu.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/fa.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/fa.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/fa.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/fa.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/fi.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/fi.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/fi.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/fi.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/fr.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/fr.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/fr.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/fr.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/gl.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/gl.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/gl.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/gl.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/he.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/he.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/he.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/he.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/hi.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/hi.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/hi.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/hi.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/hr.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/hr.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/hr.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/hr.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/hsb.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/hsb.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/hsb.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/hsb.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/hu.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/hu.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/hu.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/hu.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/hy.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/hy.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/hy.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/hy.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/id.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/id.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/id.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/id.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/is.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/is.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/is.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/is.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/it.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/it.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/it.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/it.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ja.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ja.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ja.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ja.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ka.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ka.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ka.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ka.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/km.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/km.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/km.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/km.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ko.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ko.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ko.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ko.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/lt.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/lt.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/lt.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/lt.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/lv.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/lv.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/lv.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/lv.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/mk.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/mk.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/mk.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/mk.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ms.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ms.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ms.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ms.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/nb.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/nb.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/nb.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/nb.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ne.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ne.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ne.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ne.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/nl.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/nl.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/nl.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/nl.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/pl.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/pl.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/pl.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/pl.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ps.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ps.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ps.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ps.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/pt-BR.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/pt-BR.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/pt-BR.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/pt-BR.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/pt.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/pt.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/pt.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/pt.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ro.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ro.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ro.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ro.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/ru.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/ru.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/ru.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/ru.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sk.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sk.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sk.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sk.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sl.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sl.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sl.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sl.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sq.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sq.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sq.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sq.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sr-Cyrl.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sr-Cyrl.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sr-Cyrl.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sr-Cyrl.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sr.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sr.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sr.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sr.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/sv.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/sv.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/sv.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/sv.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/th.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/th.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/th.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/th.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/tk.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/tk.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/tk.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/tk.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/tr.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/tr.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/tr.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/tr.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/uk.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/uk.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/uk.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/uk.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/vi.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/vi.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/vi.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/vi.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/zh-CN.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/zh-CN.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/zh-CN.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/zh-CN.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/i18n/zh-TW.js b/netbox/project-static/select2-4.0.13/src/js/select2/i18n/zh-TW.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/i18n/zh-TW.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/i18n/zh-TW.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/keys.js b/netbox/project-static/select2-4.0.13/src/js/select2/keys.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/keys.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/keys.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/options.js b/netbox/project-static/select2-4.0.13/src/js/select2/options.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/options.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/options.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/results.js b/netbox/project-static/select2-4.0.13/src/js/select2/results.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/results.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/results.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/allowClear.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/allowClear.js
similarity index 96%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/allowClear.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/allowClear.js
index 0de5b9bbb..7e6a32f10 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/selection/allowClear.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/selection/allowClear.js
@@ -31,7 +31,7 @@ define([
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -74,7 +74,7 @@ define([
       }
     }
 
-    this.$element.trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -97,7 +97,7 @@ define([
       return;
     }
 
-    var removeAll = this.options.get('translations').get('removeAllItems');   
+    var removeAll = this.options.get('translations').get('removeAllItems');
 
     var $remove = $(
       '<span class="select2-selection__clear" title="' + removeAll() +'">' +
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/base.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/base.js
similarity index 87%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/base.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/base.js
index f3999b831..ed9c50d32 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/selection/base.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/selection/base.js
@@ -153,5 +153,26 @@ define([
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/clickMask.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/clickMask.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/clickMask.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/clickMask.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/eventRelay.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/eventRelay.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/eventRelay.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/eventRelay.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/multiple.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/multiple.js
similarity index 98%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/multiple.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/multiple.js
index 17afa4e40..cfd6029c9 100644
--- a/netbox/project-static/select2-4.0.12/src/js/select2/selection/multiple.js
+++ b/netbox/project-static/select2-4.0.13/src/js/select2/selection/multiple.js
@@ -37,7 +37,7 @@ define([
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/placeholder.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/placeholder.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/placeholder.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/placeholder.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/search.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/search.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/search.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/search.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/single.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/single.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/single.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/single.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/selection/stopPropagation.js b/netbox/project-static/select2-4.0.13/src/js/select2/selection/stopPropagation.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/selection/stopPropagation.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/selection/stopPropagation.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/translation.js b/netbox/project-static/select2-4.0.13/src/js/select2/translation.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/translation.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/translation.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/select2/utils.js b/netbox/project-static/select2-4.0.13/src/js/select2/utils.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/select2/utils.js
rename to netbox/project-static/select2-4.0.13/src/js/select2/utils.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/wrapper.end.js b/netbox/project-static/select2-4.0.13/src/js/wrapper.end.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/wrapper.end.js
rename to netbox/project-static/select2-4.0.13/src/js/wrapper.end.js
diff --git a/netbox/project-static/select2-4.0.12/src/js/wrapper.start.js b/netbox/project-static/select2-4.0.13/src/js/wrapper.start.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/js/wrapper.start.js
rename to netbox/project-static/select2-4.0.13/src/js/wrapper.start.js
diff --git a/netbox/project-static/select2-4.0.12/src/scss/_dropdown.scss b/netbox/project-static/select2-4.0.13/src/scss/_dropdown.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/_dropdown.scss
rename to netbox/project-static/select2-4.0.13/src/scss/_dropdown.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/_multiple.scss b/netbox/project-static/select2-4.0.13/src/scss/_multiple.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/_multiple.scss
rename to netbox/project-static/select2-4.0.13/src/scss/_multiple.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/_single.scss b/netbox/project-static/select2-4.0.13/src/scss/_single.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/_single.scss
rename to netbox/project-static/select2-4.0.13/src/scss/_single.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/core.scss b/netbox/project-static/select2-4.0.13/src/scss/core.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/core.scss
rename to netbox/project-static/select2-4.0.13/src/scss/core.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/mixins/_gradients.scss b/netbox/project-static/select2-4.0.13/src/scss/mixins/_gradients.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/mixins/_gradients.scss
rename to netbox/project-static/select2-4.0.13/src/scss/mixins/_gradients.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/classic/_defaults.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/classic/_defaults.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/classic/_defaults.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/classic/_defaults.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/classic/_multiple.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/classic/_multiple.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/classic/_multiple.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/classic/_multiple.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/classic/_single.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/classic/_single.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/classic/_single.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/classic/_single.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/classic/layout.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/classic/layout.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/classic/layout.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/classic/layout.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/default/_multiple.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/default/_multiple.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/default/_multiple.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/default/_multiple.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/default/_single.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/default/_single.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/default/_single.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/default/_single.scss
diff --git a/netbox/project-static/select2-4.0.12/src/scss/theme/default/layout.scss b/netbox/project-static/select2-4.0.13/src/scss/theme/default/layout.scss
similarity index 100%
rename from netbox/project-static/select2-4.0.12/src/scss/theme/default/layout.scss
rename to netbox/project-static/select2-4.0.13/src/scss/theme/default/layout.scss
diff --git a/netbox/project-static/select2-4.0.12/tests/a11y/selection-tests.js b/netbox/project-static/select2-4.0.13/tests/a11y/selection-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/a11y/selection-tests.js
rename to netbox/project-static/select2-4.0.13/tests/a11y/selection-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/array-tests.js b/netbox/project-static/select2-4.0.13/tests/data/array-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/array-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/array-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/base-tests.js b/netbox/project-static/select2-4.0.13/tests/data/base-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/base-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/base-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/inputData-tests.js b/netbox/project-static/select2-4.0.13/tests/data/inputData-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/inputData-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/inputData-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/maximumInputLength-tests.js b/netbox/project-static/select2-4.0.13/tests/data/maximumInputLength-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/maximumInputLength-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/maximumInputLength-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/maximumSelectionLength-tests.js b/netbox/project-static/select2-4.0.13/tests/data/maximumSelectionLength-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/maximumSelectionLength-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/maximumSelectionLength-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/minimumInputLength-tests.js b/netbox/project-static/select2-4.0.13/tests/data/minimumInputLength-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/minimumInputLength-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/minimumInputLength-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/select-tests.js b/netbox/project-static/select2-4.0.13/tests/data/select-tests.js
similarity index 90%
rename from netbox/project-static/select2-4.0.12/tests/data/select-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/select-tests.js
index b59c6d4be..544a51e1e 100644
--- a/netbox/project-static/select2-4.0.12/tests/data/select-tests.js
+++ b/netbox/project-static/select2-4.0.13/tests/data/select-tests.js
@@ -167,12 +167,14 @@ test('duplicates - single - same id on select triggers change',
   var data = new SelectData($select, data);
   var second = $('#qunit-fixture .duplicates option')[2];
 
-  var changeTriggered = false;
+  var changeTriggered = false, inputTriggered = false;
 
   assert.equal($select.val(), 'one');
 
   $select.on('change', function () {
-    changeTriggered = true;
+    changeTriggered = inputTriggered;
+  }).on('input', function() {
+    inputTriggered = true;
   });
 
   data.select({
@@ -187,9 +189,14 @@ test('duplicates - single - same id on select triggers change',
     'The value never changed'
   );
 
+  assert.ok(
+    inputTriggered,
+    'The input event should be triggered'
+  );
+
   assert.ok(
     changeTriggered,
-    'The change event should be triggered'
+    'The change event should be triggered after the input event'
   );
 
   assert.ok(
@@ -205,12 +212,14 @@ test('duplicates - single - different id on select triggers change',
   var data = new SelectData($select, data);
   var second = $('#qunit-fixture .duplicates option')[2];
 
-  var changeTriggered = false;
+  var changeTriggered = false, inputTriggered = false;
 
   $select.val('two');
 
   $select.on('change', function () {
-    changeTriggered = true;
+    changeTriggered = inputTriggered;
+  }).on('input', function() {
+    inputTriggered = true;
   });
 
   data.select({
@@ -225,9 +234,14 @@ test('duplicates - single - different id on select triggers change',
     'The value changed to the duplicate id'
   );
 
+  assert.ok(
+    inputTriggered,
+    'The input event should be triggered'
+  );
+
   assert.ok(
     changeTriggered,
-    'The change event should be triggered'
+    'The change event should be triggered after the input event'
   );
 
   assert.ok(
@@ -243,12 +257,14 @@ function (assert) {
   var data = new SelectData($select, data);
   var second = $('#qunit-fixture .duplicates-multi option')[2];
 
-  var changeTriggered = false;
+  var changeTriggered = false, inputTriggered = false;
 
   $select.val(['one']);
 
   $select.on('change', function () {
-    changeTriggered = true;
+    changeTriggered = inputTriggered;
+  }).on('input', function() {
+    inputTriggered = true;
   });
 
   data.select({
@@ -263,9 +279,14 @@ function (assert) {
     'The value now has duplicates'
   );
 
+  assert.ok(
+    inputTriggered,
+    'The input event should be triggered'
+  );
+
   assert.ok(
     changeTriggered,
-    'The change event should be triggered'
+    'The change event should be triggered after the input event'
   );
 
   assert.ok(
@@ -281,12 +302,14 @@ function (assert) {
   var data = new SelectData($select, data);
   var second = $('#qunit-fixture .duplicates-multi option')[2];
 
-  var changeTriggered = false;
+  var changeTriggered = false, inputTriggered = false;
 
   $select.val(['two']);
 
   $select.on('change', function () {
-    changeTriggered = true;
+    changeTriggered = inputTriggered;
+  }).on('input', function() {
+    inputTriggered = true;
   });
 
   data.select({
@@ -301,9 +324,14 @@ function (assert) {
     'The value has the new id'
   );
 
+  assert.ok(
+    inputTriggered,
+    'The input event should be triggered'
+  );
+
   assert.ok(
     changeTriggered,
-    'The change event should be triggered'
+    'The change event should be triggered after the input event'
   );
 
   assert.ok(
diff --git a/netbox/project-static/select2-4.0.12/tests/data/tags-tests.js b/netbox/project-static/select2-4.0.13/tests/data/tags-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/tags-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/tags-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/data/tokenizer-tests.js b/netbox/project-static/select2-4.0.13/tests/data/tokenizer-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/data/tokenizer-tests.js
rename to netbox/project-static/select2-4.0.13/tests/data/tokenizer-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/dropdownCss-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/dropdownCss-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/dropdownCss-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/dropdownCss-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/dropdownParent-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/dropdownParent-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/dropdownParent-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/dropdownParent-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/positioning-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/positioning-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/positioning-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/positioning-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/search-a11y-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/search-a11y-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/search-a11y-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/search-a11y-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/selectOnClose-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/selectOnClose-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/selectOnClose-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/selectOnClose-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/dropdown/stopPropagation-tests.js b/netbox/project-static/select2-4.0.13/tests/dropdown/stopPropagation-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/dropdown/stopPropagation-tests.js
rename to netbox/project-static/select2-4.0.13/tests/dropdown/stopPropagation-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/helpers.js b/netbox/project-static/select2-4.0.13/tests/helpers.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/helpers.js
rename to netbox/project-static/select2-4.0.13/tests/helpers.js
diff --git a/netbox/project-static/select2-4.0.12/tests/integration-jq1.html b/netbox/project-static/select2-4.0.13/tests/integration-jq1.html
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/integration-jq1.html
rename to netbox/project-static/select2-4.0.13/tests/integration-jq1.html
diff --git a/netbox/project-static/select2-4.0.12/tests/integration-jq2.html b/netbox/project-static/select2-4.0.13/tests/integration-jq2.html
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/integration-jq2.html
rename to netbox/project-static/select2-4.0.13/tests/integration-jq2.html
diff --git a/netbox/project-static/select2-4.0.12/tests/integration-jq3.html b/netbox/project-static/select2-4.0.13/tests/integration-jq3.html
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/integration-jq3.html
rename to netbox/project-static/select2-4.0.13/tests/integration-jq3.html
diff --git a/netbox/project-static/select2-4.0.12/tests/integration/dom-changes.js b/netbox/project-static/select2-4.0.13/tests/integration/dom-changes.js
similarity index 87%
rename from netbox/project-static/select2-4.0.12/tests/integration/dom-changes.js
rename to netbox/project-static/select2-4.0.13/tests/integration/dom-changes.js
index 65f3fb912..0ce7a4ec5 100644
--- a/netbox/project-static/select2-4.0.12/tests/integration/dom-changes.js
+++ b/netbox/project-static/select2-4.0.13/tests/integration/dom-changes.js
@@ -1,3 +1,4 @@
+/*jshint browser: true */
 module('DOM integration');
 
 test('adding a new unselected option changes nothing', function (assert) {
@@ -286,3 +287,46 @@ test('searching tags does not loose focus', function (assert) {
   select.selection.trigger('query', {term: 'f'});
   select.selection.trigger('query', {term: 'ff'});
 });
+
+
+test('adding multiple options calls selection:update once', function (assert) {
+  assert.expect(1);
+
+  var asyncDone = assert.async();
+
+  var $ = require('jquery');
+  var Select2 = require('select2/core');
+
+  var content = '<select>';
+  var options = '';
+
+  for (var i = 0; i < 4000; i++) {
+    options += '<option>' + i + '</option>';
+  }
+
+  content += options;
+  content += '</select>';
+
+  var $select = $(content);
+
+  $('#qunit-fixture').append($select);
+
+  var select = new Select2($select);
+
+  var eventCalls = 0;
+
+  select.on('selection:update', function () {
+    eventCalls++;
+  });
+
+  $select.html(options);
+
+  setTimeout(function () {
+    assert.equal(
+      eventCalls,
+      1,
+      'selection:update was called more than once'
+    );
+    asyncDone();
+  }, 0);
+});
diff --git a/netbox/project-static/select2-4.0.12/tests/integration/jquery-calls.js b/netbox/project-static/select2-4.0.13/tests/integration/jquery-calls.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/integration/jquery-calls.js
rename to netbox/project-static/select2-4.0.13/tests/integration/jquery-calls.js
diff --git a/netbox/project-static/select2-4.0.12/tests/integration/select2-methods.js b/netbox/project-static/select2-4.0.13/tests/integration/select2-methods.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/integration/select2-methods.js
rename to netbox/project-static/select2-4.0.13/tests/integration/select2-methods.js
diff --git a/netbox/project-static/select2-4.0.12/tests/options/ajax-tests.js b/netbox/project-static/select2-4.0.13/tests/options/ajax-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/options/ajax-tests.js
rename to netbox/project-static/select2-4.0.13/tests/options/ajax-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/options/data-tests.js b/netbox/project-static/select2-4.0.13/tests/options/data-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/options/data-tests.js
rename to netbox/project-static/select2-4.0.13/tests/options/data-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/options/deprecated-tests.js b/netbox/project-static/select2-4.0.13/tests/options/deprecated-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/options/deprecated-tests.js
rename to netbox/project-static/select2-4.0.13/tests/options/deprecated-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/options/translation-tests.js b/netbox/project-static/select2-4.0.13/tests/options/translation-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/options/translation-tests.js
rename to netbox/project-static/select2-4.0.13/tests/options/translation-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/options/width-tests.js b/netbox/project-static/select2-4.0.13/tests/options/width-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/options/width-tests.js
rename to netbox/project-static/select2-4.0.13/tests/options/width-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/results/a11y-tests.js b/netbox/project-static/select2-4.0.13/tests/results/a11y-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/results/a11y-tests.js
rename to netbox/project-static/select2-4.0.13/tests/results/a11y-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/results/focusing-tests.js b/netbox/project-static/select2-4.0.13/tests/results/focusing-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/results/focusing-tests.js
rename to netbox/project-static/select2-4.0.13/tests/results/focusing-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/results/infiniteScroll-tests.js b/netbox/project-static/select2-4.0.13/tests/results/infiniteScroll-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/results/infiniteScroll-tests.js
rename to netbox/project-static/select2-4.0.13/tests/results/infiniteScroll-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/results/option-tests.js b/netbox/project-static/select2-4.0.13/tests/results/option-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/results/option-tests.js
rename to netbox/project-static/select2-4.0.13/tests/results/option-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/allowClear-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/allowClear-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/allowClear-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/allowClear-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/containerCss-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/containerCss-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/containerCss-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/containerCss-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/focusing-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/focusing-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/focusing-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/focusing-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/multiple-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/multiple-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/multiple-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/multiple-tests.js
diff --git a/netbox/project-static/select2-4.0.13/tests/selection/openOnKeyDown-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/openOnKeyDown-tests.js
new file mode 100644
index 000000000..0da838e2c
--- /dev/null
+++ b/netbox/project-static/select2-4.0.13/tests/selection/openOnKeyDown-tests.js
@@ -0,0 +1,188 @@
+module('Selection containers - Open On Key Down');
+
+var KEYS = require('select2/keys');
+var $ = require('jquery');
+
+/**
+ * Build a keydown event with the given key code and extra options.
+ *
+ * @param  {Number} keyCode     the keyboard code to be used for the 'which'
+ *                              attribute of the keydown event.
+ * @param  {Object} eventProps  extra properties to build the keydown event.
+ *
+ * @return {jQuery.Event} a 'keydown' type event.
+ */
+function buildKeyDownEvent (keyCode, eventProps) {
+  return $.Event('keydown', $.extend({}, { which: keyCode }, eventProps));
+}
+
+/**
+ * Wrapper function providing a select2 element with a given enabled/disabled
+ * state that will get a given keydown event triggered on it. Provide an
+ * assertion callback function to test the results of the triggered event.
+ *
+ * @param  {Boolean}  isEnabled   the enabled state of the desired select2
+ *                                element.
+ * @param  {String}   testName    name for the test.
+ * @param  {Number}   keyCode     used to set the 'which' attribute of the
+ *                                keydown event.
+ * @param  {Object}   eventProps  attributes to be used to build the keydown
+ *                                event.
+ * @param  {Function} fn          assertion callback to perform checks on the
+ *                                result of triggering the event, receives the
+ *                                'assert' variable for the test and the select2
+ *                                instance behind the built <select> element.
+ * @return {null}
+ */
+function testAbled(isEnabled, testName, keyCode, eventProps, fn) {
+  test(testName, function (assert) {
+    var $element = $(
+      '<select>' +
+        '<option>one</option>' +
+        '<option>two</option>' +
+      '</select>'
+    );
+    $('#qunit-fixture').append($element);
+    $element.select2({ disabled: !isEnabled });
+
+    var select2 = $element.data('select2');
+    var $selection = select2.$selection;
+
+    assert.notOk(select2.isOpen(), 'The instance should not be open');
+    assert.equal(select2.isEnabled(), isEnabled);
+
+    var event = buildKeyDownEvent(keyCode, eventProps);
+    assert.ok(event.which, 'The event\'s key code (.which) should be set');
+
+    $selection.trigger(event);
+
+    fn(assert, select2);
+  });
+}
+
+/**
+ * Test the given keydown event on an enabled element. See #testAbled for
+ * params.
+ */
+function testEnabled (testName, keyCode, eventProps, fn) {
+  testAbled(true, testName, keyCode, eventProps, fn);
+}
+
+/**
+ * Test the given keydown event on a disabled element. See #testAbled for
+ * params.
+ */
+function testDisabled (testName, keyCode, eventProps, fn) {
+  testAbled(false, testName, keyCode, eventProps, fn);
+}
+
+/**
+ * Assertion function used by the above test* wrappers. Asserts that the given
+ * select2 instance is open.
+ *
+ * @param  {Assert}   assert
+ * @param  {Select2}  select
+ * @return {null}
+ */
+function assertOpened (assert, select2) {
+  assert.ok(select2.isOpen(), 'The element should be open');
+}
+
+/**
+ * Assertion function used by the above test* wrappers. Asserts that the given
+ * select2 instance is not open.
+ *
+ * @param  {Assert}   assert
+ * @param  {Select2}  select
+ * @return {null}
+ */
+function assertNotOpened (assert, select2) {
+  assert.notOk(select2.isOpen(), 'The element should not be open');
+}
+
+/**
+ * ENTER, SPACE, and ALT+DOWN should all open an enabled select2 element.
+ */
+testEnabled(
+  'enabled element will open on ENTER',
+  KEYS.ENTER, {},
+  assertOpened
+);
+testEnabled(
+  'enabled element will open on SPACE',
+  KEYS.SPACE, {},
+  assertOpened
+);
+testEnabled(
+  'enabled element will open on ALT+DOWN',
+  KEYS.DOWN, { altKey: true },
+  assertOpened
+);
+
+/**
+ * Some other keys triggered on an enabled select2 element should not open it.
+ */
+testEnabled(
+  'enabled element will not open on UP',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testEnabled(
+  'enabled element will not open on DOWN',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testEnabled(
+  'enabled element will not open on LEFT',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testEnabled(
+  'enabled element will not open on RIGHT',
+  KEYS.UP, {},
+  assertNotOpened
+);
+
+/*
+ * The keys that will open an enabled select2 element should not open a disabled
+ * one.
+ */
+testDisabled(
+  'disabled element will not open on ENTER',
+  KEYS.ENTER, {},
+  assertNotOpened
+);
+testDisabled(
+  'disabled element will not open on SPACE',
+  KEYS.SPACE, {},
+  assertNotOpened
+);
+testDisabled(
+  'disabled element will not open on ALT+DOWN',
+  KEYS.DOWN, { altKey: true },
+  assertNotOpened
+);
+
+/**
+ * Other keys should continue to not open a disabled select2 element.
+ */
+testDisabled(
+  'disabled element will not open on UP',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testDisabled(
+  'disabled element will not open on DOWN',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testDisabled(
+  'disabled element will not open on LEFT',
+  KEYS.UP, {},
+  assertNotOpened
+);
+testDisabled(
+  'disabled element will not open on RIGHT',
+  KEYS.UP, {},
+  assertNotOpened
+);
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/placeholder-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/placeholder-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/placeholder-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/placeholder-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/search-a11y-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/search-a11y-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/search-a11y-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/search-a11y-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/search-placeholder-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/search-placeholder-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/search-placeholder-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/search-placeholder-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/search-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/search-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/search-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/search-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/single-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/single-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/single-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/single-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/selection/stopPropagation-tests.js b/netbox/project-static/select2-4.0.13/tests/selection/stopPropagation-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/selection/stopPropagation-tests.js
rename to netbox/project-static/select2-4.0.13/tests/selection/stopPropagation-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/unit-jq1.html b/netbox/project-static/select2-4.0.13/tests/unit-jq1.html
similarity index 98%
rename from netbox/project-static/select2-4.0.12/tests/unit-jq1.html
rename to netbox/project-static/select2-4.0.13/tests/unit-jq1.html
index b5ec34612..f1dac344f 100644
--- a/netbox/project-static/select2-4.0.12/tests/unit-jq1.html
+++ b/netbox/project-static/select2-4.0.13/tests/unit-jq1.html
@@ -97,6 +97,7 @@
     <script src="selection/search-placeholder-tests.js" type="text/javascript"></script>
     <script src="selection/single-tests.js" type="text/javascript"></script>
     <script src="selection/stopPropagation-tests.js" type="text/javascript"></script>
+    <script src="selection/openOnKeyDown-tests.js" type="text/javascript"></script>
 
     <script src="utils/data-tests.js" type="text/javascript"></script>
     <script src="utils/decorator-tests.js" type="text/javascript"></script>
diff --git a/netbox/project-static/select2-4.0.12/tests/unit-jq2.html b/netbox/project-static/select2-4.0.13/tests/unit-jq2.html
similarity index 98%
rename from netbox/project-static/select2-4.0.12/tests/unit-jq2.html
rename to netbox/project-static/select2-4.0.13/tests/unit-jq2.html
index 7eca50575..9d4a99b15 100644
--- a/netbox/project-static/select2-4.0.12/tests/unit-jq2.html
+++ b/netbox/project-static/select2-4.0.13/tests/unit-jq2.html
@@ -97,6 +97,7 @@
     <script src="selection/search-placeholder-tests.js" type="text/javascript"></script>
     <script src="selection/single-tests.js" type="text/javascript"></script>
     <script src="selection/stopPropagation-tests.js" type="text/javascript"></script>
+    <script src="selection/openOnKeyDown-tests.js" type="text/javascript"></script>
 
     <script src="utils/data-tests.js" type="text/javascript"></script>
     <script src="utils/decorator-tests.js" type="text/javascript"></script>
diff --git a/netbox/project-static/select2-4.0.12/tests/unit-jq3.html b/netbox/project-static/select2-4.0.13/tests/unit-jq3.html
similarity index 98%
rename from netbox/project-static/select2-4.0.12/tests/unit-jq3.html
rename to netbox/project-static/select2-4.0.13/tests/unit-jq3.html
index a34f771c9..9e062678a 100644
--- a/netbox/project-static/select2-4.0.12/tests/unit-jq3.html
+++ b/netbox/project-static/select2-4.0.13/tests/unit-jq3.html
@@ -97,6 +97,7 @@
     <script src="selection/search-placeholder-tests.js" type="text/javascript"></script>
     <script src="selection/single-tests.js" type="text/javascript"></script>
     <script src="selection/stopPropagation-tests.js" type="text/javascript"></script>
+    <script src="selection/openOnKeyDown-tests.js" type="text/javascript"></script>
 
     <script src="utils/data-tests.js" type="text/javascript"></script>
     <script src="utils/decorator-tests.js" type="text/javascript"></script>
diff --git a/netbox/project-static/select2-4.0.12/tests/utils/data-tests.js b/netbox/project-static/select2-4.0.13/tests/utils/data-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/utils/data-tests.js
rename to netbox/project-static/select2-4.0.13/tests/utils/data-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/utils/decorator-tests.js b/netbox/project-static/select2-4.0.13/tests/utils/decorator-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/utils/decorator-tests.js
rename to netbox/project-static/select2-4.0.13/tests/utils/decorator-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/utils/escapeMarkup-tests.js b/netbox/project-static/select2-4.0.13/tests/utils/escapeMarkup-tests.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/utils/escapeMarkup-tests.js
rename to netbox/project-static/select2-4.0.13/tests/utils/escapeMarkup-tests.js
diff --git a/netbox/project-static/select2-4.0.12/tests/vendor/jquery-1.7.2.js b/netbox/project-static/select2-4.0.13/tests/vendor/jquery-1.7.2.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/vendor/jquery-1.7.2.js
rename to netbox/project-static/select2-4.0.13/tests/vendor/jquery-1.7.2.js
diff --git a/netbox/project-static/select2-4.0.12/tests/vendor/jquery-2.2.4.js b/netbox/project-static/select2-4.0.13/tests/vendor/jquery-2.2.4.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/vendor/jquery-2.2.4.js
rename to netbox/project-static/select2-4.0.13/tests/vendor/jquery-2.2.4.js
diff --git a/netbox/project-static/select2-4.0.12/tests/vendor/jquery-3.4.1.js b/netbox/project-static/select2-4.0.13/tests/vendor/jquery-3.4.1.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/vendor/jquery-3.4.1.js
rename to netbox/project-static/select2-4.0.13/tests/vendor/jquery-3.4.1.js
diff --git a/netbox/project-static/select2-4.0.12/tests/vendor/qunit-1.23.1.css b/netbox/project-static/select2-4.0.13/tests/vendor/qunit-1.23.1.css
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/vendor/qunit-1.23.1.css
rename to netbox/project-static/select2-4.0.13/tests/vendor/qunit-1.23.1.css
diff --git a/netbox/project-static/select2-4.0.12/tests/vendor/qunit-1.23.1.js b/netbox/project-static/select2-4.0.13/tests/vendor/qunit-1.23.1.js
similarity index 100%
rename from netbox/project-static/select2-4.0.12/tests/vendor/qunit-1.23.1.js
rename to netbox/project-static/select2-4.0.13/tests/vendor/qunit-1.23.1.js
diff --git a/netbox/templates/base.html b/netbox/templates/base.html
index 6125e4614..20042d151 100644
--- a/netbox/templates/base.html
+++ b/netbox/templates/base.html
@@ -14,8 +14,8 @@
           href="{% static 'jquery-ui-1.12.1/jquery-ui.css' %}"
           onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.12.1/jquery-ui.css'">
     <link rel="stylesheet"
-          href="{% static 'select2-4.0.12/dist/css/select2.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.12/dist/css/select2.min.css'">
+          href="{% static 'select2-4.0.13/dist/css/select2.min.css' %}"
+          onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/dist/css/select2.min.css'">
     <link rel="stylesheet"
           href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
           onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
@@ -80,16 +80,16 @@
             </div>
         </div>
     </footer>
-<script src="{% static 'jquery/jquery-3.4.1.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.4.1.min.js'"></script>
+<script src="{% static 'jquery/jquery-3.5.1.min.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.5.1.min.js'"></script>
 <script src="{% static 'jquery-ui-1.12.1/jquery-ui.min.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.12.1/jquery-ui.min.js'"></script>
 <script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/js/bootstrap.min.js'"></script>
-<script src="{% static 'select2-4.0.12/dist/js/select2.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.12/dist/js/select2.min.js'"></script>
-<script src="{% static 'clipboard.js/clipboard-2.0.4.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=clipboard.js/clipboard-2.0.4.min.js'"></script>
+<script src="{% static 'select2-4.0.13/dist/js/select2.min.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/dist/js/select2.min.js'"></script>
+<script src="{% static 'clipboard.js/clipboard-2.0.6.min.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=clipboard.js/clipboard-2.0.6.min.js'"></script>
 <script src="{% static 'flatpickr-4.6.3/flatpickr.min.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.3/flatpickr.min.js'"></script>
 <script src="{% static 'js/forms.js' %}?v{{ settings.VERSION }}"

From ba50bfa93989c503e56bbf957cc6ec3fbb3f0d10 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 16 Jul 2020 16:52:45 -0400
Subject: [PATCH 362/505] Address some of the django_tables2 deprecation
 warnings

---
 netbox/circuits/tables.py       |   2 +-
 netbox/dcim/tables.py           | 108 ++++++++++++++------------------
 netbox/extras/tables.py         |   1 -
 netbox/ipam/tables.py           |  36 +++++------
 netbox/virtualization/tables.py |  27 ++++----
 5 files changed, 75 insertions(+), 99 deletions(-)

diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
index ce3368f31..4aca8688f 100644
--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -62,7 +62,7 @@ class CircuitTable(BaseTable):
     )
     provider = tables.LinkColumn(
         viewname='circuits:provider',
-        args=[Accessor('provider.slug')]
+        args=[Accessor('provider__slug')]
     )
     status = tables.TemplateColumn(
         template_code=STATUS_LABEL
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 823788292..2ef7e21bb 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -187,7 +187,7 @@ class RackGroupTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')],
+        args=[Accessor('site__slug')],
         verbose_name='Site'
     )
     rack_count = tables.Column(
@@ -231,7 +231,7 @@ class RackTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
@@ -290,22 +290,19 @@ class RackDetailTable(RackTable):
 
 class RackReservationTable(BaseTable):
     pk = ToggleColumn()
-    reservation = tables.LinkColumn(
-        viewname='dcim:rackreservation',
-        args=[Accessor('pk')],
-        accessor='pk'
+    reservation = tables.Column(
+        accessor='pk',
+        linkify=True
     )
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        accessor=Accessor('rack.site'),
-        args=[Accessor('rack.site.slug')],
+    site = tables.Column(
+        accessor=Accessor('rack__site'),
+        linkify=True
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    rack = tables.LinkColumn(
-        viewname='dcim:rack',
-        args=[Accessor('rack.pk')]
+    rack = tables.Column(
+        linkify=True
     )
     unit_list = tables.Column(
         orderable=False,
@@ -359,9 +356,8 @@ class ManufacturerTable(BaseTable):
 
 class DeviceTypeTable(BaseTable):
     pk = ToggleColumn()
-    model = tables.LinkColumn(
-        viewname='dcim:devicetype',
-        args=[Accessor('pk')],
+    model = tables.Column(
+        linkify=True,
         verbose_name='Device Type'
     )
     is_full_depth = BooleanColumn(
@@ -577,20 +573,18 @@ class DeviceTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        args=[Accessor('site.slug')]
+    site = tables.Column(
+        linkify=True
     )
-    rack = tables.LinkColumn(
-        viewname='dcim:rack',
-        args=[Accessor('rack.pk')]
+    rack = tables.Column(
+        linkify=True
     )
     device_role = ColoredLabelColumn(
         verbose_name='Role'
     )
     device_type = tables.LinkColumn(
         viewname='dcim:devicetype',
-        args=[Accessor('device_type.pk')],
+        args=[Accessor('device_type__pk')],
         verbose_name='Type',
         text=lambda record: record.device_type.display_name
     )
@@ -599,23 +593,21 @@ class DeviceTable(BaseTable):
         orderable=False,
         verbose_name='IP Address'
     )
-    primary_ip4 = tables.LinkColumn(
-        viewname='ipam:ipaddress',
-        args=[Accessor('primary_ip4.pk')],
+    primary_ip4 = tables.Column(
+        linkify=True,
         verbose_name='IPv4 Address'
     )
-    primary_ip6 = tables.LinkColumn(
-        viewname='ipam:ipaddress',
-        args=[Accessor('primary_ip6.pk')],
+    primary_ip6 = tables.Column(
+        linkify=True,
         verbose_name='IPv6 Address'
     )
     cluster = tables.LinkColumn(
         viewname='virtualization:cluster',
-        args=[Accessor('cluster.pk')]
+        args=[Accessor('cluster__pk')]
     )
     virtual_chassis = tables.LinkColumn(
         viewname='dcim:virtualchassis',
-        args=[Accessor('virtual_chassis.pk')]
+        args=[Accessor('virtual_chassis__pk')]
     )
     vc_position = tables.Column(
         verbose_name='VC Position'
@@ -649,13 +641,11 @@ class DeviceImportTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        args=[Accessor('site.slug')]
+    site = tables.Column(
+        linkify=True
     )
-    rack = tables.LinkColumn(
-        viewname='dcim:rack',
-        args=[Accessor('rack.pk')]
+    rack = tables.Column(
+        linkify=True
     )
     device_role = tables.Column(
         verbose_name='Role'
@@ -800,9 +790,8 @@ class InventoryItemTable(DeviceComponentTable):
 
 class CableTable(BaseTable):
     pk = ToggleColumn()
-    id = tables.LinkColumn(
-        viewname='dcim:cable',
-        args=[Accessor('pk')],
+    id = tables.Column(
+        linkify=True,
         verbose_name='ID'
     )
     termination_a_parent = tables.TemplateColumn(
@@ -858,20 +847,20 @@ class CableTable(BaseTable):
 class ConsoleConnectionTable(BaseTable):
     console_server = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('connected_endpoint.device'),
-        args=[Accessor('connected_endpoint.device.pk')],
+        accessor=Accessor('connected_endpoint__device'),
+        args=[Accessor('connected_endpoint__device__pk')],
         verbose_name='Console Server'
     )
     connected_endpoint = tables.Column(
         verbose_name='Port'
     )
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
+    device = tables.Column(
+        linkify=True
     )
     name = tables.Column(
         verbose_name='Console Port'
     )
+    connection_status = BooleanColumn()
 
     class Meta(BaseTable.Meta):
         model = ConsolePort
@@ -881,8 +870,8 @@ class ConsoleConnectionTable(BaseTable):
 class PowerConnectionTable(BaseTable):
     pdu = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('connected_endpoint.device'),
-        args=[Accessor('connected_endpoint.device.pk')],
+        accessor=Accessor('connected_endpoint__device'),
+        args=[Accessor('connected_endpoint__device__pk')],
         order_by='_connected_poweroutlet__device',
         verbose_name='PDU'
     )
@@ -890,9 +879,8 @@ class PowerConnectionTable(BaseTable):
         accessor=Accessor('_connected_poweroutlet'),
         verbose_name='Outlet'
     )
-    device = tables.LinkColumn(
-        viewname='dcim:device',
-        args=[Accessor('device.pk')]
+    device = tables.Column(
+        linkify=True
     )
     name = tables.Column(
         verbose_name='Power Port'
@@ -907,7 +895,7 @@ class InterfaceConnectionTable(BaseTable):
     device_a = tables.LinkColumn(
         viewname='dcim:device',
         accessor=Accessor('device'),
-        args=[Accessor('device.pk')],
+        args=[Accessor('device__pk')],
         verbose_name='Device A'
     )
     interface_a = tables.LinkColumn(
@@ -918,14 +906,14 @@ class InterfaceConnectionTable(BaseTable):
     )
     device_b = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('_connected_interface.device'),
-        args=[Accessor('_connected_interface.device.pk')],
+        accessor=Accessor('_connected_interface__device'),
+        args=[Accessor('_connected_interface__device__pk')],
         verbose_name='Device B'
     )
     interface_b = tables.LinkColumn(
         viewname='dcim:interface',
         accessor=Accessor('_connected_interface'),
-        args=[Accessor('_connected_interface.pk')],
+        args=[Accessor('_connected_interface__pk')],
         verbose_name='Interface B'
     )
 
@@ -970,7 +958,7 @@ class PowerPanelTable(BaseTable):
     name = tables.LinkColumn()
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     powerfeed_count = tables.TemplateColumn(
         template_code=POWERPANEL_POWERFEED_COUNT,
@@ -993,13 +981,11 @@ class PowerPanelTable(BaseTable):
 class PowerFeedTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
-    power_panel = tables.LinkColumn(
-        viewname='dcim:powerpanel',
-        args=[Accessor('power_panel.pk')],
+    power_panel = tables.Column(
+        linkify=True
     )
-    rack = tables.LinkColumn(
-        viewname='dcim:rack',
-        args=[Accessor('rack.pk')]
+    rack = tables.Column(
+        linkify=True
     )
     status = tables.TemplateColumn(
         template_code=STATUS_LABEL
diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py
index 9d49988e7..7980bdcc1 100644
--- a/netbox/extras/tables.py
+++ b/netbox/extras/tables.py
@@ -1,5 +1,4 @@
 import django_tables2 as tables
-from django_tables2.utils import Accessor
 
 from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange, Tag, TaggedItem
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 83b5b92fa..87744f652 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -322,13 +322,11 @@ class PrefixTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=TENANT_LINK
     )
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        args=[Accessor('site.slug')]
+    site = tables.Column(
+        linkify=True
     )
-    vlan = tables.LinkColumn(
-        viewname='ipam:vlan',
-        args=[Accessor('vlan.pk')],
+    vlan = tables.Column(
+        linkify=True,
         verbose_name='VLAN'
     )
     role = tables.TemplateColumn(
@@ -392,7 +390,8 @@ class IPAddressTable(BaseTable):
         template_code=TENANT_LINK
     )
     assigned = tables.BooleanColumn(
-        accessor='assigned_object_id'
+        accessor='assigned_object_id',
+        verbose_name='Assigned'
     )
 
     class Meta(BaseTable.Meta):
@@ -406,9 +405,8 @@ class IPAddressTable(BaseTable):
 
 
 class IPAddressDetailTable(IPAddressTable):
-    nat_inside = tables.LinkColumn(
-        viewname='ipam:ipaddress',
-        args=[Accessor('nat_inside.pk')],
+    nat_inside = tables.Column(
+        linkify=True,
         orderable=False,
         verbose_name='NAT (Inside)'
     )
@@ -479,7 +477,7 @@ class VLANGroupTable(BaseTable):
     name = tables.LinkColumn()
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     vlan_count = tables.Column(
         verbose_name='VLANs'
@@ -507,11 +505,11 @@ class VLANTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     group = tables.LinkColumn(
         viewname='ipam:vlangroup_vlans',
-        args=[Accessor('group.pk')]
+        args=[Accessor('group__pk')]
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
@@ -581,12 +579,11 @@ class InterfaceVLANTable(BaseTable):
         verbose_name='ID'
     )
     tagged = BooleanColumn()
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        args=[Accessor('site.slug')]
+    site = tables.Column(
+        linkify=True
     )
     group = tables.Column(
-        accessor=Accessor('group.name'),
+        accessor=Accessor('group__name'),
         verbose_name='Group'
     )
     tenant = tables.TemplateColumn(
@@ -614,9 +611,8 @@ class InterfaceVLANTable(BaseTable):
 
 class ServiceTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn(
-        viewname='ipam:service',
-        args=[Accessor('pk')]
+    name = tables.Column(
+        linkify=True
     )
     parent = tables.LinkColumn(
         order_by=('device', 'virtual_machine')
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 8289d9758..003a52b78 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -3,7 +3,7 @@ from django_tables2.utils import Accessor
 
 from dcim.tables import BaseInterfaceTable
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 VIRTUALMACHINE_STATUS = """
@@ -60,13 +60,11 @@ class ClusterGroupTable(BaseTable):
 class ClusterTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
-    tenant = tables.LinkColumn(
-        viewname='tenancy:tenant',
-        args=[Accessor('tenant.slug')]
+    tenant = tables.Column(
+        linkify=True
     )
-    site = tables.LinkColumn(
-        viewname='dcim:site',
-        args=[Accessor('site.slug')]
+    site = tables.Column(
+        linkify=True
     )
     device_count = tables.Column(
         accessor=Accessor('devices.count'),
@@ -98,9 +96,8 @@ class VirtualMachineTable(BaseTable):
     status = tables.TemplateColumn(
         template_code=VIRTUALMACHINE_STATUS
     )
-    cluster = tables.LinkColumn(
-        viewname='virtualization:cluster',
-        args=[Accessor('cluster.pk')]
+    cluster = tables.Column(
+        linkify=True
     )
     role = ColoredLabelColumn()
     tenant = tables.TemplateColumn(
@@ -113,14 +110,12 @@ class VirtualMachineTable(BaseTable):
 
 
 class VirtualMachineDetailTable(VirtualMachineTable):
-    primary_ip4 = tables.LinkColumn(
-        viewname='ipam:ipaddress',
-        args=[Accessor('primary_ip4.pk')],
+    primary_ip4 = tables.Column(
+        linkify=True,
         verbose_name='IPv4 Address'
     )
-    primary_ip6 = tables.LinkColumn(
-        viewname='ipam:ipaddress',
-        args=[Accessor('primary_ip6.pk')],
+    primary_ip6 = tables.Column(
+        linkify=True,
         verbose_name='IPv6 Address'
     )
     primary_ip = tables.TemplateColumn(

From 5b43fa0e12e98cc9a401c21ef9c75c2c80a35697 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 20 Jul 2020 11:10:55 -0400
Subject: [PATCH 363/505] Upgrade Django to 3.1RC1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 8f7cbefd3..d7f215d12 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.1b1
+Django==3.1rc1
 django-cacheops==5.0.1
 django-cors-headers==3.4.0
 django-debug-toolbar==2.2

From 0f679e1f0374ddc14e2aa3ce4c4689233472be37 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 20 Jul 2020 12:07:19 -0400
Subject: [PATCH 364/505] Closes #4871: Specify ordering for querysets using
 annotate() to count related objects

---
 netbox/circuits/api/views.py       |  4 +--
 netbox/circuits/views.py           | 10 +++----
 netbox/dcim/api/views.py           | 36 +++++++++++++---------
 netbox/dcim/views.py               | 48 ++++++++++++++++++++++--------
 netbox/ipam/api/views.py           | 10 +++----
 netbox/ipam/views.py               | 14 +++++----
 netbox/netbox/views.py             | 16 +++++++---
 netbox/secrets/api/views.py        |  2 +-
 netbox/secrets/views.py            |  4 +--
 netbox/tenancy/api/views.py        |  8 +++--
 netbox/tenancy/views.py            |  8 ++++-
 netbox/virtualization/api/views.py |  6 ++--
 netbox/virtualization/views.py     |  8 ++---
 13 files changed, 113 insertions(+), 61 deletions(-)

diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py
index 1575a181b..79c4452d2 100644
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -19,7 +19,7 @@ from . import serializers
 class ProviderViewSet(CustomFieldModelViewSet):
     queryset = Provider.objects.prefetch_related('tags').annotate(
         circuit_count=Count('circuits')
-    )
+    ).order_by(*Provider._meta.ordering)
     serializer_class = serializers.ProviderSerializer
     filterset_class = filters.ProviderFilterSet
 
@@ -41,7 +41,7 @@ class ProviderViewSet(CustomFieldModelViewSet):
 class CircuitTypeViewSet(ModelViewSet):
     queryset = CircuitType.objects.annotate(
         circuit_count=Count('circuits')
-    )
+    ).order_by(*CircuitType._meta.ordering)
     serializer_class = serializers.CircuitTypeSerializer
     filterset_class = filters.CircuitTypeFilterSet
 
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index 55ff70327..df90a3671 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -21,7 +21,7 @@ from .models import Circuit, CircuitTermination, CircuitType, Provider
 #
 
 class ProviderListView(ObjectListView):
-    queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
+    queryset = Provider.objects.annotate(count_circuits=Count('circuits')).order_by(*Provider._meta.ordering)
     filterset = filters.ProviderFilterSet
     filterset_form = forms.ProviderFilterForm
     table = tables.ProviderTable
@@ -73,14 +73,14 @@ class ProviderBulkImportView(BulkImportView):
 
 
 class ProviderBulkEditView(BulkEditView):
-    queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
+    queryset = Provider.objects.annotate(count_circuits=Count('circuits')).order_by(*Provider._meta.ordering)
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
     form = forms.ProviderBulkEditForm
 
 
 class ProviderBulkDeleteView(BulkDeleteView):
-    queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
+    queryset = Provider.objects.annotate(count_circuits=Count('circuits')).order_by(*Provider._meta.ordering)
     filterset = filters.ProviderFilterSet
     table = tables.ProviderTable
 
@@ -90,7 +90,7 @@ class ProviderBulkDeleteView(BulkDeleteView):
 #
 
 class CircuitTypeListView(ObjectListView):
-    queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
+    queryset = CircuitType.objects.annotate(circuit_count=Count('circuits')).order_by(*CircuitType._meta.ordering)
     table = tables.CircuitTypeTable
 
 
@@ -110,7 +110,7 @@ class CircuitTypeBulkImportView(BulkImportView):
 
 
 class CircuitTypeBulkDeleteView(BulkDeleteView):
-    queryset = CircuitType.objects.annotate(circuit_count=Count('circuits'))
+    queryset = CircuitType.objects.annotate(circuit_count=Count('circuits')).order_by(*CircuitType._meta.ordering)
     table = tables.CircuitTypeTable
 
 
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index fdd58ef12..b5d68cebe 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -74,8 +74,12 @@ class CableTraceMixin(object):
 #
 
 class RegionViewSet(ModelViewSet):
-    queryset = Region.objects.annotate(
-        site_count=Count('sites')
+    queryset = Region.objects.add_related_count(
+        Region.objects.all(),
+        Site,
+        'region',
+        'site_count',
+        cumulative=True
     )
     serializer_class = serializers.RegionSerializer
     filterset_class = filters.RegionFilterSet
@@ -95,7 +99,7 @@ class SiteViewSet(CustomFieldModelViewSet):
         vlan_count=get_subquery(VLAN, 'site'),
         circuit_count=get_subquery(Circuit, 'terminations__site'),
         virtualmachine_count=get_subquery(VirtualMachine, 'cluster__site'),
-    )
+    ).order_by(*Site._meta.ordering)
     serializer_class = serializers.SiteSerializer
     filterset_class = filters.SiteFilterSet
 
@@ -115,9 +119,13 @@ class SiteViewSet(CustomFieldModelViewSet):
 #
 
 class RackGroupViewSet(ModelViewSet):
-    queryset = RackGroup.objects.prefetch_related('site').annotate(
-        rack_count=Count('racks')
-    )
+    queryset = RackGroup.objects.add_related_count(
+        RackGroup.objects.all(),
+        Rack,
+        'group',
+        'rack_count',
+        cumulative=True
+    ).prefetch_related('site')
     serializer_class = serializers.RackGroupSerializer
     filterset_class = filters.RackGroupFilterSet
 
@@ -129,7 +137,7 @@ class RackGroupViewSet(ModelViewSet):
 class RackRoleViewSet(ModelViewSet):
     queryset = RackRole.objects.annotate(
         rack_count=Count('racks')
-    )
+    ).order_by(*RackRole._meta.ordering)
     serializer_class = serializers.RackRoleSerializer
     filterset_class = filters.RackRoleFilterSet
 
@@ -144,7 +152,7 @@ class RackViewSet(CustomFieldModelViewSet):
     ).annotate(
         device_count=get_subquery(Device, 'rack'),
         powerfeed_count=get_subquery(PowerFeed, 'rack')
-    )
+    ).order_by(*Rack._meta.ordering)
     serializer_class = serializers.RackSerializer
     filterset_class = filters.RackFilterSet
 
@@ -217,7 +225,7 @@ class ManufacturerViewSet(ModelViewSet):
         devicetype_count=get_subquery(DeviceType, 'manufacturer'),
         inventoryitem_count=get_subquery(InventoryItem, 'manufacturer'),
         platform_count=get_subquery(Platform, 'manufacturer')
-    )
+    ).order_by(*Manufacturer._meta.ordering)
     serializer_class = serializers.ManufacturerSerializer
     filterset_class = filters.ManufacturerFilterSet
 
@@ -229,7 +237,7 @@ class ManufacturerViewSet(ModelViewSet):
 class DeviceTypeViewSet(CustomFieldModelViewSet):
     queryset = DeviceType.objects.prefetch_related('manufacturer', 'tags').annotate(
         device_count=Count('instances')
-    )
+    ).order_by(*DeviceType._meta.ordering)
     serializer_class = serializers.DeviceTypeSerializer
     filterset_class = filters.DeviceTypeFilterSet
 
@@ -294,7 +302,7 @@ class DeviceRoleViewSet(ModelViewSet):
     queryset = DeviceRole.objects.annotate(
         device_count=get_subquery(Device, 'device_role'),
         virtualmachine_count=get_subquery(VirtualMachine, 'role')
-    )
+    ).order_by(*DeviceRole._meta.ordering)
     serializer_class = serializers.DeviceRoleSerializer
     filterset_class = filters.DeviceRoleFilterSet
 
@@ -307,7 +315,7 @@ class PlatformViewSet(ModelViewSet):
     queryset = Platform.objects.annotate(
         device_count=get_subquery(Device, 'platform'),
         virtualmachine_count=get_subquery(VirtualMachine, 'platform')
-    )
+    ).order_by(*Platform._meta.ordering)
     serializer_class = serializers.PlatformSerializer
     filterset_class = filters.PlatformFilterSet
 
@@ -583,7 +591,7 @@ class CableViewSet(ModelViewSet):
 class VirtualChassisViewSet(ModelViewSet):
     queryset = VirtualChassis.objects.prefetch_related('tags').annotate(
         member_count=Count('members')
-    )
+    ).order_by(*VirtualChassis._meta.ordering)
     serializer_class = serializers.VirtualChassisSerializer
     filterset_class = filters.VirtualChassisFilterSet
 
@@ -597,7 +605,7 @@ class PowerPanelViewSet(ModelViewSet):
         'site', 'rack_group'
     ).annotate(
         powerfeed_count=Count('powerfeeds')
-    )
+    ).order_by(*PowerPanel._meta.ordering)
     serializer_class = serializers.PowerPanelSerializer
     filterset_class = filters.PowerPanelFilterSet
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 889b4d94e..2216bafd3 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -133,7 +133,13 @@ class RegionBulkImportView(BulkImportView):
 
 
 class RegionBulkDeleteView(BulkDeleteView):
-    queryset = Region.objects.all()
+    queryset = Region.objects.add_related_count(
+        Region.objects.all(),
+        Site,
+        'region',
+        'site_count',
+        cumulative=True
+    )
     filterset = filters.RegionFilterSet
     table = tables.RegionTable
 
@@ -238,7 +244,13 @@ class RackGroupBulkImportView(BulkImportView):
 
 
 class RackGroupBulkDeleteView(BulkDeleteView):
-    queryset = RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks'))
+    queryset = RackGroup.objects.add_related_count(
+        RackGroup.objects.all(),
+        Rack,
+        'group',
+        'rack_count',
+        cumulative=True
+    ).prefetch_related('site')
     filterset = filters.RackGroupFilterSet
     table = tables.RackGroupTable
 
@@ -248,7 +260,7 @@ class RackGroupBulkDeleteView(BulkDeleteView):
 #
 
 class RackRoleListView(ObjectListView):
-    queryset = RackRole.objects.annotate(rack_count=Count('racks'))
+    queryset = RackRole.objects.annotate(rack_count=Count('racks')).order_by(*RackRole._meta.ordering)
     table = tables.RackRoleTable
 
 
@@ -268,7 +280,7 @@ class RackRoleBulkImportView(BulkImportView):
 
 
 class RackRoleBulkDeleteView(BulkDeleteView):
-    queryset = RackRole.objects.annotate(rack_count=Count('racks'))
+    queryset = RackRole.objects.annotate(rack_count=Count('racks')).order_by(*RackRole._meta.ordering)
     table = tables.RackRoleTable
 
 
@@ -281,7 +293,7 @@ class RackListView(ObjectListView):
         'site', 'group', 'tenant', 'role', 'devices__device_type'
     ).annotate(
         device_count=Count('devices')
-    )
+    ).order_by(*Rack._meta.ordering)
     filterset = filters.RackFilterSet
     filterset_form = forms.RackFilterForm
     table = tables.RackDetailTable
@@ -465,7 +477,7 @@ class ManufacturerListView(ObjectListView):
         devicetype_count=Count('device_types', distinct=True),
         inventoryitem_count=Count('inventory_items', distinct=True),
         platform_count=Count('platforms', distinct=True),
-    )
+    ).order_by(*Manufacturer._meta.ordering)
     table = tables.ManufacturerTable
 
 
@@ -485,7 +497,9 @@ class ManufacturerBulkImportView(BulkImportView):
 
 
 class ManufacturerBulkDeleteView(BulkDeleteView):
-    queryset = Manufacturer.objects.annotate(devicetype_count=Count('device_types'))
+    queryset = Manufacturer.objects.annotate(
+        devicetype_count=Count('device_types')
+    ).order_by(*Manufacturer._meta.ordering)
     table = tables.ManufacturerTable
 
 
@@ -494,7 +508,9 @@ class ManufacturerBulkDeleteView(BulkDeleteView):
 #
 
 class DeviceTypeListView(ObjectListView):
-    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
+    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(
+        instance_count=Count('instances')
+    ).order_by(*DeviceType._meta.ordering)
     filterset = filters.DeviceTypeFilterSet
     filterset_form = forms.DeviceTypeFilterForm
     table = tables.DeviceTypeTable
@@ -602,14 +618,18 @@ class DeviceTypeImportView(ObjectImportView):
 
 
 class DeviceTypeBulkEditView(BulkEditView):
-    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
+    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(
+        instance_count=Count('instances')
+    ).order_by(*DeviceType._meta.ordering)
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
     form = forms.DeviceTypeBulkEditForm
 
 
 class DeviceTypeBulkDeleteView(BulkDeleteView):
-    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances'))
+    queryset = DeviceType.objects.prefetch_related('manufacturer').annotate(
+        instance_count=Count('instances')
+    ).order_by(*DeviceType._meta.ordering)
     filterset = filters.DeviceTypeFilterSet
     table = tables.DeviceTypeTable
 
@@ -2152,7 +2172,9 @@ class InterfaceConnectionsListView(ObjectListView):
 #
 
 class VirtualChassisListView(ObjectListView):
-    queryset = VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members'))
+    queryset = VirtualChassis.objects.prefetch_related('master').annotate(
+        member_count=Count('members')
+    ).order_by(*VirtualChassis._meta.ordering)
     table = tables.VirtualChassisTable
     filterset = filters.VirtualChassisFilterSet
     filterset_form = forms.VirtualChassisFilterForm
@@ -2385,7 +2407,7 @@ class PowerPanelListView(ObjectListView):
         'site', 'rack_group'
     ).annotate(
         powerfeed_count=Count('powerfeeds')
-    )
+    ).order_by(*PowerPanel._meta.ordering)
     filterset = filters.PowerPanelFilterSet
     filterset_form = forms.PowerPanelFilterForm
     table = tables.PowerPanelTable
@@ -2437,7 +2459,7 @@ class PowerPanelBulkDeleteView(BulkDeleteView):
         'site', 'rack_group'
     ).annotate(
         rack_count=Count('powerfeeds')
-    )
+    ).order_by(*PowerPanel._meta.ordering)
     filterset = filters.PowerPanelFilterSet
     table = tables.PowerPanelTable
 
diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 77ac36683..80b29a76e 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -24,7 +24,7 @@ class VRFViewSet(CustomFieldModelViewSet):
     queryset = VRF.objects.prefetch_related('tenant').prefetch_related('tags').annotate(
         ipaddress_count=get_subquery(IPAddress, 'vrf'),
         prefix_count=get_subquery(Prefix, 'vrf')
-    )
+    ).order_by(*VRF._meta.ordering)
     serializer_class = serializers.VRFSerializer
     filterset_class = filters.VRFFilterSet
 
@@ -36,7 +36,7 @@ class VRFViewSet(CustomFieldModelViewSet):
 class RIRViewSet(ModelViewSet):
     queryset = RIR.objects.annotate(
         aggregate_count=Count('aggregates')
-    )
+    ).order_by(*RIR._meta.ordering)
     serializer_class = serializers.RIRSerializer
     filterset_class = filters.RIRFilterSet
 
@@ -59,7 +59,7 @@ class RoleViewSet(ModelViewSet):
     queryset = Role.objects.annotate(
         prefix_count=get_subquery(Prefix, 'role'),
         vlan_count=get_subquery(VLAN, 'role')
-    )
+    ).order_by(*Role._meta.ordering)
     serializer_class = serializers.RoleSerializer
     filterset_class = filters.RoleFilterSet
 
@@ -246,7 +246,7 @@ class IPAddressViewSet(CustomFieldModelViewSet):
 class VLANGroupViewSet(ModelViewSet):
     queryset = VLANGroup.objects.prefetch_related('site').annotate(
         vlan_count=Count('vlans')
-    )
+    ).order_by(*VLANGroup._meta.ordering)
     serializer_class = serializers.VLANGroupSerializer
     filterset_class = filters.VLANGroupFilterSet
 
@@ -260,7 +260,7 @@ class VLANViewSet(CustomFieldModelViewSet):
         'site', 'group', 'tenant', 'role', 'tags'
     ).annotate(
         prefix_count=get_subquery(Prefix, 'vlan')
-    )
+    ).order_by(*VLAN._meta.ordering)
     serializer_class = serializers.VLANSerializer
     filterset_class = filters.VLANFilterSet
 
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 8a9c647f0..2a4188df4 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -78,7 +78,7 @@ class VRFBulkDeleteView(BulkDeleteView):
 #
 
 class RIRListView(ObjectListView):
-    queryset = RIR.objects.annotate(aggregate_count=Count('aggregates'))
+    queryset = RIR.objects.annotate(aggregate_count=Count('aggregates')).order_by(*RIR._meta.ordering)
     filterset = filters.RIRFilterSet
     filterset_form = forms.RIRFilterForm
     table = tables.RIRDetailTable
@@ -171,7 +171,7 @@ class RIRBulkImportView(BulkImportView):
 
 
 class RIRBulkDeleteView(BulkDeleteView):
-    queryset = RIR.objects.annotate(aggregate_count=Count('aggregates'))
+    queryset = RIR.objects.annotate(aggregate_count=Count('aggregates')).order_by(*RIR._meta.ordering)
     filterset = filters.RIRFilterSet
     table = tables.RIRTable
 
@@ -183,7 +183,7 @@ class RIRBulkDeleteView(BulkDeleteView):
 class AggregateListView(ObjectListView):
     queryset = Aggregate.objects.prefetch_related('rir').annotate(
         child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ())
-    )
+    ).order_by(*Aggregate._meta.ordering)
     filterset = filters.AggregateFilterSet
     filterset_form = forms.AggregateFilterForm
     table = tables.AggregateDetailTable
@@ -650,7 +650,9 @@ class IPAddressBulkDeleteView(BulkDeleteView):
 #
 
 class VLANGroupListView(ObjectListView):
-    queryset = VLANGroup.objects.prefetch_related('site').annotate(vlan_count=Count('vlans'))
+    queryset = VLANGroup.objects.prefetch_related('site').annotate(
+        vlan_count=Count('vlans')
+    ).order_by(*VLANGroup._meta.ordering)
     filterset = filters.VLANGroupFilterSet
     filterset_form = forms.VLANGroupFilterForm
     table = tables.VLANGroupTable
@@ -672,7 +674,9 @@ class VLANGroupBulkImportView(BulkImportView):
 
 
 class VLANGroupBulkDeleteView(BulkDeleteView):
-    queryset = VLANGroup.objects.prefetch_related('site').annotate(vlan_count=Count('vlans'))
+    queryset = VLANGroup.objects.prefetch_related('site').annotate(
+        vlan_count=Count('vlans')
+    ).order_by(*VLANGroup._meta.ordering)
     filterset = filters.VLANGroupFilterSet
     table = tables.VLANGroupTable
 
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index 548173a32..a743947fe 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -46,7 +46,9 @@ SEARCH_MAX_RESULTS = 15
 SEARCH_TYPES = OrderedDict((
     # Circuits
     ('provider', {
-        'queryset': Provider.objects.annotate(count_circuits=Count('circuits')),
+        'queryset': Provider.objects.annotate(
+            count_circuits=Count('circuits')
+        ).order_by(*Provider._meta.ordering),
         'filterset': ProviderFilterSet,
         'table': ProviderTable,
         'url': 'circuits:provider_list',
@@ -73,13 +75,17 @@ SEARCH_TYPES = OrderedDict((
         'url': 'dcim:rack_list',
     }),
     ('rackgroup', {
-        'queryset': RackGroup.objects.prefetch_related('site').annotate(rack_count=Count('racks')),
+        'queryset': RackGroup.objects.prefetch_related('site').annotate(
+            rack_count=Count('racks')
+        ).order_by(*RackGroup._meta.ordering),
         'filterset': RackGroupFilterSet,
         'table': RackGroupTable,
         'url': 'dcim:rackgroup_list',
     }),
     ('devicetype', {
-        'queryset': DeviceType.objects.prefetch_related('manufacturer').annotate(instance_count=Count('instances')),
+        'queryset': DeviceType.objects.prefetch_related('manufacturer').annotate(
+            instance_count=Count('instances')
+        ).order_by(*DeviceType._meta.ordering),
         'filterset': DeviceTypeFilterSet,
         'table': DeviceTypeTable,
         'url': 'dcim:devicetype_list',
@@ -93,7 +99,9 @@ SEARCH_TYPES = OrderedDict((
         'url': 'dcim:device_list',
     }),
     ('virtualchassis', {
-        'queryset': VirtualChassis.objects.prefetch_related('master').annotate(member_count=Count('members')),
+        'queryset': VirtualChassis.objects.prefetch_related('master').annotate(
+            member_count=Count('members')
+        ).order_by(*VirtualChassis._meta.ordering),
         'filterset': VirtualChassisFilterSet,
         'table': VirtualChassisTable,
         'url': 'dcim:virtualchassis_list',
diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py
index 9e330b782..3ad87a8ff 100644
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -27,7 +27,7 @@ ERR_PRIVKEY_INVALID = "Invalid private key."
 class SecretRoleViewSet(ModelViewSet):
     queryset = SecretRole.objects.annotate(
         secret_count=Count('secrets')
-    )
+    ).order_by(*SecretRole._meta.ordering)
     serializer_class = serializers.SecretRoleSerializer
     filterset_class = filters.SecretRoleFilterSet
 
diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py
index e9ea1835f..2872616b8 100644
--- a/netbox/secrets/views.py
+++ b/netbox/secrets/views.py
@@ -29,7 +29,7 @@ def get_session_key(request):
 #
 
 class SecretRoleListView(ObjectListView):
-    queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
+    queryset = SecretRole.objects.annotate(secret_count=Count('secrets')).order_by(*SecretRole._meta.ordering)
     table = tables.SecretRoleTable
 
 
@@ -49,7 +49,7 @@ class SecretRoleBulkImportView(BulkImportView):
 
 
 class SecretRoleBulkDeleteView(BulkDeleteView):
-    queryset = SecretRole.objects.annotate(secret_count=Count('secrets'))
+    queryset = SecretRole.objects.annotate(secret_count=Count('secrets')).order_by(*SecretRole._meta.ordering)
     table = tables.SecretRoleTable
 
 
diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py
index 148058a33..652544b21 100644
--- a/netbox/tenancy/api/views.py
+++ b/netbox/tenancy/api/views.py
@@ -15,8 +15,12 @@ from . import serializers
 #
 
 class TenantGroupViewSet(ModelViewSet):
-    queryset = TenantGroup.objects.annotate(
-        tenant_count=get_subquery(Tenant, 'group')
+    queryset = TenantGroup.objects.add_related_count(
+        TenantGroup.objects.all(),
+        Tenant,
+        'group',
+        'tenant_count',
+        cumulative=True
     )
     serializer_class = serializers.TenantGroupSerializer
     filterset_class = filters.TenantGroupFilterSet
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 9ef44206c..b129177eb 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -43,7 +43,13 @@ class TenantGroupBulkImportView(BulkImportView):
 
 
 class TenantGroupBulkDeleteView(BulkDeleteView):
-    queryset = TenantGroup.objects.annotate(tenant_count=Count('tenants'))
+    queryset = TenantGroup.objects.add_related_count(
+        TenantGroup.objects.all(),
+        Tenant,
+        'group',
+        'tenant_count',
+        cumulative=True
+    )
     table = tables.TenantGroupTable
 
 
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 867413357..df48e92e6 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -22,7 +22,7 @@ from . import serializers
 class ClusterTypeViewSet(ModelViewSet):
     queryset = ClusterType.objects.annotate(
         cluster_count=Count('clusters')
-    )
+    ).order_by(*ClusterType._meta.ordering)
     serializer_class = serializers.ClusterTypeSerializer
     filterset_class = filters.ClusterTypeFilterSet
 
@@ -30,7 +30,7 @@ class ClusterTypeViewSet(ModelViewSet):
 class ClusterGroupViewSet(ModelViewSet):
     queryset = ClusterGroup.objects.annotate(
         cluster_count=Count('clusters')
-    )
+    ).order_by(*ClusterGroup._meta.ordering)
     serializer_class = serializers.ClusterGroupSerializer
     filterset_class = filters.ClusterGroupFilterSet
 
@@ -41,7 +41,7 @@ class ClusterViewSet(CustomFieldModelViewSet):
     ).annotate(
         device_count=get_subquery(Device, 'cluster'),
         virtualmachine_count=get_subquery(VirtualMachine, 'cluster')
-    )
+    ).order_by(*Cluster._meta.ordering)
     serializer_class = serializers.ClusterSerializer
     filterset_class = filters.ClusterFilterSet
 
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index 176c89f2e..a622265fc 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -22,7 +22,7 @@ from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterf
 #
 
 class ClusterTypeListView(ObjectListView):
-    queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
+    queryset = ClusterType.objects.annotate(cluster_count=Count('clusters')).order_by(*ClusterType._meta.ordering)
     table = tables.ClusterTypeTable
 
 
@@ -42,7 +42,7 @@ class ClusterTypeBulkImportView(BulkImportView):
 
 
 class ClusterTypeBulkDeleteView(BulkDeleteView):
-    queryset = ClusterType.objects.annotate(cluster_count=Count('clusters'))
+    queryset = ClusterType.objects.annotate(cluster_count=Count('clusters')).order_by(*ClusterType._meta.ordering)
     table = tables.ClusterTypeTable
 
 
@@ -51,7 +51,7 @@ class ClusterTypeBulkDeleteView(BulkDeleteView):
 #
 
 class ClusterGroupListView(ObjectListView):
-    queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
+    queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters')).order_by(*ClusterGroup._meta.ordering)
     table = tables.ClusterGroupTable
 
 
@@ -71,7 +71,7 @@ class ClusterGroupBulkImportView(BulkImportView):
 
 
 class ClusterGroupBulkDeleteView(BulkDeleteView):
-    queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters'))
+    queryset = ClusterGroup.objects.annotate(cluster_count=Count('clusters')).order_by(*ClusterGroup._meta.ordering)
     table = tables.ClusterGroupTable
 
 

From 8514a5427c9d94552a0f32061bfd91a0970ba93b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 20 Jul 2020 13:00:33 -0400
Subject: [PATCH 365/505] Update related object counts to use dunders in
 accessor

---
 netbox/dcim/tables.py           | 8 ++++----
 netbox/ipam/tables.py           | 4 ++--
 netbox/virtualization/tables.py | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index 2ef7e21bb..075cee60b 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -503,13 +503,13 @@ class DeviceRoleTable(BaseTable):
     pk = ToggleColumn()
     device_count = tables.TemplateColumn(
         template_code=DEVICEROLE_DEVICE_COUNT,
-        accessor=Accessor('devices.unrestricted.count'),
+        accessor=Accessor('devices__unrestricted__count'),
         orderable=False,
         verbose_name='Devices'
     )
     vm_count = tables.TemplateColumn(
         template_code=DEVICEROLE_VM_COUNT,
-        accessor=Accessor('virtual_machines.unrestricted.count'),
+        accessor=Accessor('virtual_machines__unrestricted__count'),
         orderable=False,
         verbose_name='VMs'
     )
@@ -534,13 +534,13 @@ class PlatformTable(BaseTable):
     pk = ToggleColumn()
     device_count = tables.TemplateColumn(
         template_code=PLATFORM_DEVICE_COUNT,
-        accessor=Accessor('devices.count'),
+        accessor=Accessor('devices__unrestricted__count'),
         orderable=False,
         verbose_name='Devices'
     )
     vm_count = tables.TemplateColumn(
         template_code=PLATFORM_VM_COUNT,
-        accessor=Accessor('virtual_machines.count'),
+        accessor=Accessor('virtual_machines__unrestricted__count'),
         orderable=False,
         verbose_name='VMs'
     )
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 87744f652..c695186ee 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -283,13 +283,13 @@ class AggregateDetailTable(AggregateTable):
 class RoleTable(BaseTable):
     pk = ToggleColumn()
     prefix_count = tables.TemplateColumn(
-        accessor=Accessor('prefixes.unrestricted.count'),
+        accessor=Accessor('prefixes__unrestricted__count'),
         template_code=ROLE_PREFIX_COUNT,
         orderable=False,
         verbose_name='Prefixes'
     )
     vlan_count = tables.TemplateColumn(
-        accessor=Accessor('vlans.unrestricted.count'),
+        accessor=Accessor('vlans__unrestricted__count'),
         template_code=ROLE_VLAN_COUNT,
         orderable=False,
         verbose_name='VLANs'
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 003a52b78..c16ff97cd 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -67,12 +67,12 @@ class ClusterTable(BaseTable):
         linkify=True
     )
     device_count = tables.Column(
-        accessor=Accessor('devices.count'),
+        accessor=Accessor('devices__unrestricted__count'),
         orderable=False,
         verbose_name='Devices'
     )
     vm_count = tables.Column(
-        accessor=Accessor('virtual_machines.count'),
+        accessor=Accessor('virtual_machines__unrestricted__count'),
         orderable=False,
         verbose_name='VMs'
     )

From 0ef016db07a92e1d6020ebeb066c8b184645c858 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 20 Jul 2020 16:53:04 -0400
Subject: [PATCH 366/505] Update installation docs

---
 docs/installation/1-postgresql.md             |  16 +-
 docs/installation/2-redis.md                  |   2 +-
 docs/installation/3-netbox.md                 | 215 +++++++++---------
 docs/installation/4-gunicorn.md               |  49 ++++
 .../{4-http-daemon.md => 5-http-server.md}    |  66 ++----
 docs/installation/{5-ldap.md => 6-ldap.md}    |   0
 docs/installation/index.md                    |   8 +-
 mkdocs.yml                                    |   5 +-
 8 files changed, 193 insertions(+), 168 deletions(-)
 create mode 100644 docs/installation/4-gunicorn.md
 rename docs/installation/{4-http-daemon.md => 5-http-server.md} (51%)
 rename docs/installation/{5-ldap.md => 6-ldap.md} (100%)

diff --git a/docs/installation/1-postgresql.md b/docs/installation/1-postgresql.md
index 933e32edc..20ddaa07f 100644
--- a/docs/installation/1-postgresql.md
+++ b/docs/installation/1-postgresql.md
@@ -3,7 +3,7 @@
 This section entails the installation and configuration of a local PostgreSQL database. If you already have a PostgreSQL database service in place, skip to [the next section](2-redis.md).
 
 !!! warning
-    NetBox requires PostgreSQL 9.6 or higher. Please note that MySQL and other relational databases are **not** supported.
+    NetBox requires PostgreSQL 9.6 or higher. Please note that MySQL and other relational databases are **not** currently supported.
 
 The installation instructions provided here have been tested to work on Ubuntu 18.04 and CentOS 7.5. The particular commands needed to install dependencies on other distributions may vary significantly. Unfortunately, this is outside the control of the NetBox maintainers. Please consult your distribution's documentation for assistance with any errors.
 
@@ -20,7 +20,7 @@ If a recent enough version of PostgreSQL is not available through your distribut
 
 #### CentOS
 
-CentOS 7.5 does not ship with a recent enough version of PostgreSQL, so it will need to be installed from an external repository. The instructions below show the installation of PostgreSQL 9.6, however you may opt to install a more recent version.
+CentOS 7 does not ship with a recent enough version of PostgreSQL, so it will need to be installed from an external repository. The instructions below show the installation of PostgreSQL 9.6, however you may opt to install a more recent version.
 
 ```no-highlight
 # yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
@@ -47,11 +47,11 @@ Then, start the service and enable it to run at boot:
 At a minimum, we need to create a database for NetBox and assign it a username and password for authentication. This is done with the following commands.
 
 !!! danger
-    DO NOT USE THE PASSWORD FROM THE EXAMPLE.
+    **Do not use the password from the example.** Choose a strong, random password to ensure secure database authentication for your NetBox installation.
 
 ```no-highlight
 # sudo -u postgres psql
-psql (10.10)
+psql (10.12 (Ubuntu 10.12-0ubuntu0.18.04.1))
 Type "help" for help.
 
 postgres=# CREATE DATABASE netbox;
@@ -68,7 +68,13 @@ postgres=# \q
 You can verify that authentication works issuing the following command and providing the configured password. (Replace `localhost` with your database server if using a remote database.)
 
 ```no-highlight
-# psql -U netbox -W -h localhost netbox
+# psql --username netbox --password --host localhost netbox
+Password for user netbox: 
+psql (10.12 (Ubuntu 10.12-0ubuntu0.18.04.1))
+SSL connection (protocol: TLSv1.3, cipher: TLS_AES_256_GCM_SHA384, bits: 256, compression: off)
+Type "help" for help.
+
+netbox=> \q
 ```
 
 If successful, you will enter a `netbox` prompt. Type `\q` to exit.
diff --git a/docs/installation/2-redis.md b/docs/installation/2-redis.md
index b8c7aa7a2..20f0095d0 100644
--- a/docs/installation/2-redis.md
+++ b/docs/installation/2-redis.md
@@ -5,7 +5,7 @@
 [Redis](https://redis.io/) is an in-memory key-value store which NetBox employs for caching and queuing. This section entails the installation and configuration of a local Redis instance. If you already have a Redis service in place, skip to [the next section](3-netbox.md).
 
 !!! note
-    NetBox v2.9.0 or later requires Redis v4.0 or higher.
+    NetBox v2.9.0 and later require Redis v4.0 or higher. If your distribution does not offer a recent enough release, you will need to build Redis from source. Please see [the Redis installation documentation](https://github.com/redis/redis) for further details.
 
 ### Ubuntu
 
diff --git a/docs/installation/3-netbox.md b/docs/installation/3-netbox.md
index c583d08fe..05f6d825e 100644
--- a/docs/installation/3-netbox.md
+++ b/docs/installation/3-netbox.md
@@ -4,7 +4,10 @@ This section of the documentation discusses installing and configuring the NetBo
 
 ## Install System Packages
 
-Begin by installing all system packages required by NetBox and its dependencies. Note that beginning with NetBox v2.8, Python 3.6 or later is required.
+Begin by installing all system packages required by NetBox and its dependencies.
+
+!!! note
+    NetBox v2.8.0 and later require Python 3.6 or 3.7. This documentation assumes Python 3.6.
 
 ### Ubuntu
 
@@ -19,22 +22,32 @@ Begin by installing all system packages required by NetBox and its dependencies.
 # easy_install-3.6 pip
 ```
 
+Before continuing with either platform, update pip (Python's package management tool) to its latest release:
+
+```no-highlight
+# pip install --upgrade pip
+```
+
 ## Download NetBox
 
-You may opt to install NetBox either from a numbered release or by cloning the master branch of its repository on GitHub.
+This documentation provides two options for installing NetBox: from a downloadable archive, or from the git repository. Installing from a package (option A below) requires manually fetching and decompressing the archive for every future update, whereas installation via git (option B) allows for seamless upgrades by re-pulling the `master` branch.
 
-### Option A: Download a Release
+### Option A: Download a Release Archive
 
-Download the [latest stable release](https://github.com/netbox-community/netbox/releases) from GitHub as a tarball or ZIP archive and extract it to your desired path. In this example, we'll use `/opt/netbox`.
+Download the [latest stable release](https://github.com/netbox-community/netbox/releases) from GitHub as a tarball or ZIP archive and extract it to your desired path. In this example, we'll use `/opt/netbox` as the NetBox root.
 
 ```no-highlight
 # wget https://github.com/netbox-community/netbox/archive/vX.Y.Z.tar.gz
 # tar -xzf vX.Y.Z.tar.gz -C /opt
-# cd /opt/
-# ln -s netbox-X.Y.Z/ netbox
-# cd /opt/netbox/
+# ln -s /opt/netbox-X.Y.Z/ /opt/netbox
+# ls -l /opt | grep netbox
+lrwxrwxrwx  1 root root         13 Jul 20 13:44 netbox -> netbox-2.9.0/
+drwxr-xr-x  2 root root       4096 Jul 20 13:44 netbox-2.9.0
 ```
 
+!!! note
+    It is recommended to install NetBox in a directory named for its version number. For example, NetBox v2.9.0 would be installed into `/opt/netbox-2.9.0`, and a symlink from `/opt/netbox/` would point to this location. This allows for future releases to be installed in parallel without interrupting the current installation. When changing to the new release, only the symlink needs to be updated.
+
 ### Option B: Clone the Git Repository
 
 Create the base directory for the NetBox installation. For this guide, we'll use `/opt/netbox`.
@@ -57,7 +70,7 @@ If `git` is not already installed, install it:
 # yum install -y git
 ```
 
-Next, clone the **master** branch of the NetBox GitHub repository into the current directory:
+Next, clone the **master** branch of the NetBox GitHub repository into the current directory. (This branch always holds the current stable release.)
 
 ```no-highlight
 # git clone -b master https://github.com/netbox-community/netbox.git .
@@ -70,72 +83,38 @@ Resolving deltas: 100% (1495/1495), done.
 Checking connectivity... done.
 ```
 
-## Create the NetBox User
-
-Create a system user account named `netbox`. We'll configure the WSGI and HTTP services to run under this account. We'll also assign this user ownership of the media directory. This ensures that NetBox will be able to save local files.
-
 !!! note
-    CentOS users may need to create the `netbox` group first.
+    Installation via git also allows you to easily try out development versions of NetBox. The `develop` branch contains all work underway for the next minor release, and the `develop-x.y` branch (if present) tracks progress on the next major release. 
+
+## Create the NetBox System User
+
+Create a system user account named `netbox`. We'll configure the WSGI and HTTP services to run under this account. We'll also assign this user ownership of the media directory. This ensures that NetBox will be able to save uploaded files.
+
+#### Ubuntu
 
 ```
-# groupadd --system netbox
-# adduser --system --gid netbox netbox
+# adduser --system --group netbox
 # chown --recursive netbox /opt/netbox/netbox/media/
 ```
 
-## Set Up Python Environment
+#### CentOS
 
-We'll use a Python [virtual environment](https://docs.python.org/3.6/tutorial/venv.html) to ensure NetBox's required packages don't conflict with anything in the base system. This will create a directory named `venv` in our NetBox root.
-
-```no-highlight
-# python3 -m venv /opt/netbox/venv
 ```
-
-Next, activate the virtual environment and install the required Python packages. You should see your console prompt change to indicate the active environment. (Activating the virtual environment updates your command shell to use the local copy of Python that we just installed for NetBox instead of the system's Python interpreter.)
-
-```no-highlight
-# source venv/bin/activate
-(venv) # pip3 install -r requirements.txt
-```
-
-### NAPALM Automation (Optional)
-
-NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API. Installation of NAPALM is optional. To enable it, install the `napalm` package:
-
-```no-highlight
-(venv) # pip3 install napalm
-```
-
-To ensure NAPALM is automatically re-installed during future upgrades, create a file named `local_requirements.txt` in the NetBox root directory (alongside `requirements.txt`) and list the `napalm` package:
-
-```no-highlight
-# echo napalm >> local_requirements.txt
-```
-
-### Remote File Storage (Optional)
-
-By default, NetBox will use the local filesystem to storage uploaded files. To use a remote filesystem, install the [`django-storages`](https://django-storages.readthedocs.io/en/stable/) library and configure your [desired backend](../../configuration/optional-settings/#storage_backend) in `configuration.py`.
-
-```no-highlight
-(venv) # pip3 install django-storages
-```
-
-Don't forget to add the `django-storages` package to `local_requirements.txt` to ensure it gets re-installed during future upgrades:
-
-```no-highlight
-# echo django-storages >> local_requirements.txt
+# groupadd --system netbox
+# adduser --system -g netbox netbox
+# chown --recursive netbox /opt/netbox/netbox/media/
 ```
 
 ## Configuration
 
-Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`.
+Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`. This file will hold all of your local configuration parameters.
 
 ```no-highlight
-(venv) # cd netbox/netbox/
-(venv) # cp configuration.example.py configuration.py
+# cd /opt/netbox/netbox/netbox/
+# cp configuration.example.py configuration.py
 ```
 
-Open `configuration.py` with your preferred editor and set the following variables:
+Open `configuration.py` with your preferred editor to begin configuring NetBox. NetBox offers [many configuration parameters](/configuration/), but only the following four are required for new installations:
 
 * `ALLOWED_HOSTS`
 * `DATABASE`
@@ -144,19 +123,21 @@ Open `configuration.py` with your preferred editor and set the following variabl
 
 ### ALLOWED_HOSTS
 
-This is a list of the valid hostnames by which this server can be reached. You must specify at least one name or IP address.
-
-Example:
+This is a list of the valid hostnames and IP addresses by which this server can be reached. You must specify at least one name or IP address. (Note that this does not restrict the locations from which NetBox may be accessed: It is merely for [HTTP host header validation](https://docs.djangoproject.com/en/3.0/topics/security/#host-headers-virtual-hosting).)
 
 ```python
 ALLOWED_HOSTS = ['netbox.example.com', '192.0.2.123']
 ```
 
+If you are not yet sure what the domain name and/or IP address of the NetBox installation will be, you can set this to a wildcard (asterisk) to allow all host values:
+
+```python
+ALLOWED_HOSTS = ['*']
+```
+
 ### DATABASE
 
-This parameter holds the database configuration details. You must define the username and password used when you configured PostgreSQL. If the service is running on a remote host, replace `localhost` with its address. See the [configuration documentation](../../configuration/required-settings/#database) for more detail on individual parameters.
-
-Example:
+This parameter holds the database configuration details. You must define the username and password used when you configured PostgreSQL. If the service is running on a remote host, update the `HOST` and `PORT` parameters accordingly. See the [configuration documentation](/configuration/required-settings/#database) for more detail on individual parameters.
 
 ```python
 DATABASE = {
@@ -165,29 +146,31 @@ DATABASE = {
     'PASSWORD': 'J5brHrAXFLQSif0K', # PostgreSQL password
     'HOST': 'localhost',            # Database server
     'PORT': '',                     # Database port (leave blank for default)
-    'CONN_MAX_AGE': 300,            # Max database connection age
+    'CONN_MAX_AGE': 300,            # Max database connection age (seconds)
 }
 ```
 
 ### REDIS
 
-Redis is a in-memory key-value store required as part of the NetBox installation. It is used for features such as webhooks and caching. Redis typically requires minimal configuration; the values below should suffice for most installations. See the [configuration documentation](../../configuration/required-settings/#redis) for more detail on individual parameters.
+Redis is a in-memory key-value store used by NetBox for caching and background task queuing. Redis typically requires minimal configuration; the values below should suffice for most installations. See the [configuration documentation](/configuration/required-settings/#redis) for more detail on individual parameters.
+
+Note that NetBox requires the specification of two separate Redis databases: `tasks` and `caching`. These may both be provided by the same Redis service, however each should have a unique database ID.
 
 ```python
 REDIS = {
     'tasks': {
-        'HOST': 'redis.example.com',
-        'PORT': 1234,
-        'PASSWORD': 'foobar',
-        'DATABASE': 0,
-        'DEFAULT_TIMEOUT': 300,
-        'SSL': False,
+        'HOST': 'localhost',      # Redis server
+        'PORT': 6379,             # Redis port
+        'PASSWORD': '',           # Redis password (optional)
+        'DATABASE': 0,            # Database ID
+        'DEFAULT_TIMEOUT': 300,   # Timeout (seconds)
+        'SSL': False,             # Use SSL (optional)
     },
     'caching': {
         'HOST': 'localhost',
         'PORT': 6379,
         'PASSWORD': '',
-        'DATABASE': 1,
+        'DATABASE': 1,            # Unique ID for second database
         'DEFAULT_TIMEOUT': 300,
         'SSL': False,
     }
@@ -196,37 +179,69 @@ REDIS = {
 
 ### SECRET_KEY
 
-Generate a random secret key of at least 50 alphanumeric characters. This key must be unique to this installation and must not be shared outside the local system.
+This parameter must be assigned a randomly-generated key employed as a salt for hashing and related cryptographic functions. (Note, however, that it is _never_ directly used in the encryption of secret data.) This key must be unique to this installation and is recommended to be at least 50 characters long. It should not be shared outside the local system.
 
-You may use the script located at `netbox/generate_secret_key.py` to generate a suitable key.
-
-!!! note
-    In the case of a highly available installation with multiple web servers, `SECRET_KEY` must be identical among all servers in order to maintain a persistent user session state.
-
-## Run Database Migrations
-
-Before NetBox can run, we need to install the database schema. This is done by running `python3 manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example):
+A simple Python script named `generate_secret_key.py` is provided in the parent directory to assist in generating a suitable key:
 
 ```no-highlight
-(venv) # cd /opt/netbox/netbox/
-(venv) # python3 manage.py migrate
-Operations to perform:
-  Apply all migrations: dcim, sessions, admin, ipam, utilities, auth, circuits, contenttypes, extras, secrets, users
-Running migrations:
-  Rendering model states... DONE
-  Applying contenttypes.0001_initial... OK
-  Applying auth.0001_initial... OK
-  Applying admin.0001_initial... OK
-  ...
+# python3 ../generate_secret_key.py
 ```
 
-If this step results in a PostgreSQL authentication error, ensure that the username and password created in the database match what has been specified in `configuration.py`
+!!! warning
+    In the case of a highly available installation with multiple web servers, `SECRET_KEY` must be identical among all servers in order to maintain a persistent user session state.
+
+When you have finished modifying the configuration, remember to save the file.
+
+## Optional Requirements
+
+All Python packages required by NetBox are listed in `requirements.txt` and will be installed automatically. NetBox also supports some optional packages. If desired, these packages must be listed in `local_requirements.txt` within the NetBox root directory.
+
+### NAPALM
+
+The [NAPALM automation](https://napalm-automation.net/) library allows NetBox to fetch live data from devices and return it to a requester via its REST API. The `NAPALM_USERNAME` and `NAPALM_PASSWORD` configuration parameters define the credentials to be used when connecting to a device.
+
+```no-highlight
+# echo napalm >> /opt/netbox/local_requirements.txt
+```
+
+### Remote File Storage
+
+By default, NetBox will use the local filesystem to store uploaded files. To use a remote filesystem, install the [`django-storages`](https://django-storages.readthedocs.io/en/stable/) library and configure your [desired storage backend](/configuration/optional-settings/#storage_backend) in `configuration.py`.
+
+```no-highlight
+# echo django-storages >> /opt/netbox/local_requirements.txt
+```
+
+## Run the Upgrade Script
+
+Once NetBox has been configured, we're ready to proceed with the actual installation. We'll run the packaged upgrade script (`upgrade.sh`) to perform the following actions:
+
+* Create a Python virtual environment
+* Install all required Python packages
+* Run database schema migrations
+* Aggregate static resource files on disk
+
+```no-highlight
+# /opt/netbox/upgrade.sh
+```
+
+!!! note
+    Upon completion, the upgrade script may warn that no existing virtual environment was detected. As this is a new installation, this warning can be safely ignored.
 
 ## Create a Super User
 
-NetBox does not come with any predefined user accounts. You'll need to create a super user to be able to log into NetBox:
+NetBox does not come with any predefined user accounts. You'll need to create a super user (administrative account) to be able to log into NetBox. First, enter the Python virtual environment created by the upgrade script:
 
 ```no-highlight
+# source /opt/netbox/venv/bin/activate
+```
+
+Once the virtual environment has been activated, you should notice the string `(venv)` prepended to your console prompt.
+
+Next, we'll create a superuser account using the `createsuperuser` Django management command (via `manage.py`). Specifying an email address for the user is not required, but be sure to use a very strong password.
+
+```no-highlight
+(venv) # cd /opt/netbox/netbox
 (venv) # python3 manage.py createsuperuser
 Username: admin
 Email address: admin@example.com
@@ -235,17 +250,9 @@ Password (again):
 Superuser created successfully.
 ```
 
-## Collect Static Files
-
-```no-highlight
-(venv) # python3 manage.py collectstatic --no-input
-
-959 static files copied to '/opt/netbox/netbox/static'.
-```
-
 ## Test the Application
 
-At this point, NetBox should be able to run. We can verify this by starting a development instance:
+At this point, we should be able to run NetBox. We can check by starting a development instance:
 
 ```no-highlight
 (venv) # python3 manage.py runserver 0.0.0.0:8000 --insecure
@@ -267,6 +274,6 @@ Note that the initial UI will be locked down for non-authenticated users.
 
 ![NetBox UI as seen by a non-authenticated user](../media/installation/netbox_ui_guest.png)
 
-After logging in as the superuser you created earlier, all areas of the UI will be available.
+Try logging in as the super user we just created. Once authenticated, you'll be able to access all areas of the UI:
 
 ![NetBox UI as seen by an administrator](../media/installation/netbox_ui_admin.png)
diff --git a/docs/installation/4-gunicorn.md b/docs/installation/4-gunicorn.md
new file mode 100644
index 000000000..48cab756a
--- /dev/null
+++ b/docs/installation/4-gunicorn.md
@@ -0,0 +1,49 @@
+# Gunicorn
+
+Like most Django applications, NetBox runs as a [WSGI application](https://en.wikipedia.org/wiki/Web_Server_Gateway_Interface) behind an HTTP server. This documentation shows how to install and configure [gunicorn](http://gunicorn.org/) for this role, however other WSGIs are available and should work similarly well.
+
+## Configuration
+
+NetBox ships with a default configuration file for gunicorn. To use it, copy `/opt/netbox/contrib/gunicorn.py` to `/opt/netbox/gunicorn.py`. (We make a copy of this file rather than pointing to it directly to ensure that any changes to it do not get overwritten by a future upgrade.)
+
+```no-highlight
+# cd /opt/netbox
+# cp contrib/gunicorn.py /opt/netbox/gunicorn.py
+```
+
+While this default configuration should suffice for most initial installations, you may wish to edit this file to change the bound IP address and/or port number, or to make performance-related adjustments. See [the Gunicorn documentation](https://docs.gunicorn.org/en/stable/configure.html) for the available configuration parameters.
+
+## systemd Setup
+
+We'll use systemd to control both gunicorn and NetBox's background worker process. First, copy `contrib/netbox.service` and `contrib/netbox-rq.service` to the `/etc/systemd/system/` directory and reload the systemd dameon:
+
+```no-highlight
+# cp contrib/*.service /etc/systemd/system/
+# systemctl daemon-reload
+```
+
+Then, start the `netbox` and `netbox-rq` services and enable them to initiate at boot time:
+
+```no-highlight
+# systemctl start netbox netbox-rq
+# systemctl enable netbox netbox-rq
+```
+
+You can use the command `systemctl status netbox` to verify that the WSGI service is running:
+
+```no-highlight
+# systemctl status netbox.service
+● netbox.service - NetBox WSGI Service
+   Loaded: loaded (/etc/systemd/system/netbox.service; enabled; vendor preset: enabled)
+   Active: active (running) since Thu 2019-12-12 19:23:40 UTC; 25s ago
+     Docs: https://netbox.readthedocs.io/en/stable/
+ Main PID: 11993 (gunicorn)
+    Tasks: 6 (limit: 2362)
+   CGroup: /system.slice/netbox.service
+           ├─11993 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
+           ├─12015 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
+           ├─12016 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
+...
+```
+
+Once you've verified that the WSGI workers are up and running, move on to HTTP server setup.
diff --git a/docs/installation/4-http-daemon.md b/docs/installation/5-http-server.md
similarity index 51%
rename from docs/installation/4-http-daemon.md
rename to docs/installation/5-http-server.md
index b93bdc3ef..5b4e3dfae 100644
--- a/docs/installation/4-http-daemon.md
+++ b/docs/installation/5-http-server.md
@@ -1,9 +1,9 @@
 # HTTP Server Setup
 
-We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for the purposes of this guide. For web servers, we provide example configurations for both [nginx](https://www.nginx.com/resources/wiki/) and [Apache](http://httpd.apache.org/docs/2.4). (You are of course free to use whichever combination of HTTP and WSGI services you'd like.) We'll use systemd to enable service persistence.
+This documentation provides example configurations for both [nginx](https://www.nginx.com/resources/wiki/) and [Apache](http://httpd.apache.org/docs/2.4), though any HTTP server which supports WSGI should be compatible.
 
 !!! info
-    For the sake of brevity, only Ubuntu 18.04 instructions are provided here, but this sort of web server and WSGI configuration is not unique to NetBox. Please consult your distribution's documentation for assistance if needed.
+    For the sake of brevity, only Ubuntu 18.04 instructions are provided here, these tasks not unique to NetBox and should carry over to other distributions with mininal changes. Please consult your distribution's documentation for assistance if needed.
 
 ## Obtain an SSL Certificate
 
@@ -17,17 +17,19 @@ The command below can be used to generate a self-signed certificate for testing
 -out /etc/ssl/certs/netbox.crt
 ```
 
-## HTTP Daemon Installation
+The above command will prompt you for additional details of the certificate; all of these are optional.
+
+## HTTP Server Installation
 
 ### Option A: nginx
 
-The following will serve as a minimal nginx configuration. Be sure to modify your server name and installation path appropriately.
+Begin by installing nginx:
 
 ```no-highlight
 # apt-get install -y nginx
 ```
 
-Once nginx is installed, copy the default nginx configuration file to `/etc/nginx/sites-available/netbox`. Be sure to replace `netbox.example.com` with the domain name or IP address of your installation. (This should match the value configured for `ALLOWED_HOSTS` in `configuration.py`.)
+Once nginx is installed, copy the nginx configuration file provided by NetBox to `/etc/nginx/sites-available/netbox`. Be sure to replace `netbox.example.com` with the domain name or IP address of your installation. (This should match the value configured for `ALLOWED_HOSTS` in `configuration.py`.)
 
 ```no-highlight
 # cp /opt/netbox/contrib/nginx.conf /etc/nginx/sites-available/netbox
@@ -69,67 +71,25 @@ Finally, ensure that the required Apache modules are enabled, enable the `netbox
 # service apache2 restart
 ```
 
-!!! note
-    Certain components of NetBox (such as the display of rack elevation diagrams) rely on the use of embedded objects. Ensure that your HTTP server configuration does not override the `X-Frame-Options` response header set by NetBox.
-
-## Gunicorn Configuration
-
-Copy `/opt/netbox/contrib/gunicorn.py` to `/opt/netbox/gunicorn.py`. (We make a copy of this file to ensure that any changes to it do not get overwritten by a future upgrade.)
-
-```no-highlight
-# cd /opt/netbox
-# cp contrib/gunicorn.py /opt/netbox/gunicorn.py
-```
-
-You may wish to edit this file to change the bound IP address or port number, or to make performance-related adjustments. See [the Gunicorn documentation](https://docs.gunicorn.org/en/stable/configure.html) for the available configuration parameters.
-
-## systemd Configuration
-
-We'll use systemd to control the daemonization of NetBox services. First, copy `contrib/netbox.service` and `contrib/netbox-rq.service` to the `/etc/systemd/system/` directory:
-
-```no-highlight
-# cp contrib/*.service /etc/systemd/system/
-```
-
-Then, start the `netbox` and `netbox-rq` services and enable them to initiate at boot time:
-
-```no-highlight
-# systemctl daemon-reload
-# systemctl start netbox netbox-rq
-# systemctl enable netbox netbox-rq
-```
-
-You can use the command `systemctl status netbox` to verify that the WSGI service is running:
-
-```no-highlight
-# systemctl status netbox.service
-● netbox.service - NetBox WSGI Service
-   Loaded: loaded (/etc/systemd/system/netbox.service; enabled; vendor preset: enabled)
-   Active: active (running) since Thu 2019-12-12 19:23:40 UTC; 25s ago
-     Docs: https://netbox.readthedocs.io/en/stable/
- Main PID: 11993 (gunicorn)
-    Tasks: 6 (limit: 2362)
-   CGroup: /system.slice/netbox.service
-           ├─11993 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
-           ├─12015 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
-           ├─12016 /usr/bin/python3 /usr/local/bin/gunicorn --pid /var/tmp/netbox.pid --pythonpath /opt/netbox/...
-...
-```
+## Confirm Connectivity
 
 At this point, you should be able to connect to the HTTP service at the server name or IP address you provided.
 
 !!! info
     Please keep in mind that the configurations provided here are bare minimums required to get NetBox up and running. You may want to make adjustments to better suit your production environment.
 
+!!! warning
+    Certain components of NetBox (such as the display of rack elevation diagrams) rely on the use of embedded objects. Ensure that your HTTP server configuration does not override the `X-Frame-Options` response header set by NetBox.
+
 ## Troubleshooting
 
 If you are unable to connect to the HTTP server, check that:
 
 * Nginx/Apache is running and configured to listen on the correct port.
-* Access is not being blocked by a firewall. (Try connecting locally from the server itself.)
+* Access is not being blocked by a firewall somewhere along the path. (Try connecting locally from the server itself.)
 
 If you are able to connect but receive a 502 (bad gateway) error, check the following:
 
-* The NetBox system process (gunicorn) is running: `systemctl status netbox`
+* The WSGI worker processes (gunicorn) are running (`systemctl status netbox` should show a status of "active (running)")
 * nginx/Apache is configured to connect to the port on which gunicorn is listening (default is 8001).
 * SELinux is not preventing the reverse proxy connection. You may need to allow HTTP network connections with the command `setsebool -P httpd_can_network_connect 1`
diff --git a/docs/installation/5-ldap.md b/docs/installation/6-ldap.md
similarity index 100%
rename from docs/installation/5-ldap.md
rename to docs/installation/6-ldap.md
diff --git a/docs/installation/index.md b/docs/installation/index.md
index 4c904e953..b520f2917 100644
--- a/docs/installation/index.md
+++ b/docs/installation/index.md
@@ -5,8 +5,9 @@ The following sections detail how to set up a new instance of NetBox:
 1. [PostgreSQL database](1-postgresql.md)
 1. [Redis](2-redis.md)
 3. [NetBox components](3-netbox.md)
-4. [HTTP daemon](4-http-daemon.md)
-5. [LDAP authentication](5-ldap.md) (optional)
+4. [Gunicorn](4-gunicorn.md)
+5. [HTTP server](5-http-server.md)
+6. [LDAP authentication](6-ldap.md) (optional)
 
 Below is a simplified overview of the NetBox application stack for reference:
 
@@ -16,4 +17,5 @@ Below is a simplified overview of the NetBox application stack for reference:
 
 If you are upgrading from an existing installation, please consult the [upgrading guide](upgrading.md).
 
-Netbox v2.5.9 and later moved to using systemd instead of supervisord.  Please see the instructions for [migrating to systemd](migrating-to-systemd.md) if you are still using supervisord.
+!!! note
+    Beginning with v2.5.9, the official documentation calls for systemd to be used for managing the WSGI workers in place of supervisord.  Please see the instructions for [migrating to systemd](migrating-to-systemd.md) if you are still using supervisord.
diff --git a/mkdocs.yml b/mkdocs.yml
index 2c58acbd8..091a3af5c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -20,8 +20,9 @@ nav:
         - 1. PostgreSQL: 'installation/1-postgresql.md'
         - 2. Redis: 'installation/2-redis.md'
         - 3. NetBox: 'installation/3-netbox.md'
-        - 4. HTTP Daemon: 'installation/4-http-daemon.md'
-        - 5. LDAP (Optional): 'installation/5-ldap.md'
+        - 4. Gunicorn: 'installation/4-gunicorn.md'
+        - 5. HTTP Server: 'installation/5-http-server.md'
+        - 6. LDAP (Optional): 'installation/6-ldap.md'
         - Upgrading NetBox: 'installation/upgrading.md'
         - Migrating to systemd: 'installation/migrating-to-systemd.md'
     - Configuration:

From c6fd6ab329929466db47aa847c775c9c33bbf34a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 20 Jul 2020 16:54:24 -0400
Subject: [PATCH 367/505] Remove cacheops monkey patch for RestrictedQuerySet

---
 netbox/netbox/__init__.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/netbox/netbox/__init__.py b/netbox/netbox/__init__.py
index 034c9c80e..e69de29bb 100644
--- a/netbox/netbox/__init__.py
+++ b/netbox/netbox/__init__.py
@@ -1,17 +0,0 @@
-from cacheops.query import ManagerMixin, no_invalidation, _old_objs
-
-
-# Monkey-patch cacheops' _pre_save() signal receiver. This is needed to mark the sending model's QuerySet as
-# unrestricted.
-def _pre_save(self, sender, instance, using, **kwargs):
-    if not (instance.pk is None or instance._state.adding or no_invalidation.active):
-        try:
-            qs = sender.objects.using(using)
-            if hasattr(qs, 'restrict'):
-                qs = qs.unrestricted()
-            _old_objs.__dict__[sender, instance.pk] = qs.get(pk=instance.pk)
-        except sender.DoesNotExist:
-            pass
-
-
-ManagerMixin._pre_save = _pre_save

From a3d1ee474c1d6494529e958467505d607cfa4a51 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 21 Jul 2020 16:58:31 -0400
Subject: [PATCH 368/505] Clean up v2.9 release notes

---
 docs/release-notes/version-2.9.md | 52 ++++++++++++++++++++++---------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 944badaf3..c06f6f02c 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,17 +6,17 @@
 
 #### Object-Based Permissions ([#554](https://github.com/netbox-community/netbox/issues/554))
 
-NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group to perform a certain action on one or more types of objects, an administrator can optionally specify a set of constraints. The permission will apply only to objects which match the specified constraints. For example, assigning permission to modify devices with the constraint `{"tenant__group__name": "Customers"}` would grant the permission only for devices assigned to a tenant belonging to the "Customers" group.
+NetBox v2.9 replaces Django's built-in permissions framework with one that supports object-based assignment of permissions using arbitrary constraints. When granting a user or group permission to perform a certain action on one or more types of objects, an administrator can optionally specify a set of constraints. The permission will apply only to objects which match the specified constraints. For example, assigning permission to modify devices with the constraint `{"tenant__group__name": "Customers"}` would allow the associated users/groups to perform an action only on devices assigned to a tenant belonging to the "Customers" group.
 
-#### Background Script & Report Execution ([#2006](https://github.com/netbox-community/netbox/issues/2006))
+#### Background Execution of Scripts & Reports ([#2006](https://github.com/netbox-community/netbox/issues/2006))
 
-When running a report or custom script, the task is now queued for background processing and a response is immediately returned to the user. This prevents long-running scripts from blocking the response, and avoids WSGI timeout errors. Once the task has completed, the page will automatically refresh to display its results. Both scripts and reports now store their output in the new JobResult model. (The ReportResult model has been removed.)
+When running a report or custom script, its execution is now queued for background processing and the user receives an immediate response indicating its status. This prevents long-running scripts from resulting in a timeout error. Once the execution has completed, the page will automatically refresh to display its results. Both scripts and reports now store their output in the new JobResult model. (The ReportResult model has been removed.)
 
 ### Enhancements
 
 * [#2018](https://github.com/netbox-community/netbox/issues/2018) - Add `name` field to virtual chassis model
 * [#3703](https://github.com/netbox-community/netbox/issues/3703) - Tags must be created administratively before being assigned to an object
-* [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components
+* [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components and component templates
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 * [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
@@ -35,7 +35,8 @@ When running a report or custom script, the task is now queued for background pr
 
 ### REST API Changes
 
-* The count of `tagged_items` is no longer included when viewing the tags list when `brief` is passed.
+* A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
+* The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
 * The assignment of tags to an object is now achieved in the same manner as specifying any other related device. The `tags` field accepts a list of JSON objects each matching a desired tag. (Alternatively, a list of numeric primary keys corresponding to tags may be passed instead.) For example:
 
 ```json
@@ -45,17 +46,38 @@ When running a report or custom script, the task is now queued for background pr
 ]
 ```
 
-* The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
-* A `label` field has been added to all device components and component templates.
-* The IP address model now uses a generic foreign key to refer to the assigned interface. The `interface` field on the serializer has been replaced with `assigned_object_type` and `assigned_object_id` for write operations. If one exists, the assigned interface is available as `assigned_object`.
-* The serialized representation of a virtual machine interface now includes only relevant fields: `type`, `lag`, `mgmt_only`, `connected_endpoint_type`, `connected_endpoint`, and `cable` are no longer included.
-* dcim.VirtualChassis: Added a mandatory `name` field
-* An optional `description` field has been added to all device component templates
+* Legacy numeric values for choice fields are no longer conveyed or accepted.
+* dcim.Cable: Added `tags` field
+* dcim.ConsolePort: Added `label` field
+* dcim.ConsolePortTemplate: Added `description` and `label` fields
+* dcim.ConsoleServerPort: Added `label` field
+* dcim.ConsoleServerPortTemplate: Added `description` and `label` fields
+* dcim.DeviceBay: Added `label` field
+* dcim.DeviceBayTemplate: Added `description` and `label` fields
+* dcim.FrontPort: Added `label` field
+* dcim.FrontPortTemplate: Added `description` and `label` fields
+* dcim.Interface: Added `label` field
+* dcim.InterfaceTemplate: Added `description` and `label` fields
+* dcim.PowerPanel: Added `tags` field
+* dcim.PowerPort: Added ``label` field
+* dcim.PowerPortTemplate: Added `description` and `label` fields
+* dcim.PowerOutlet: Added `label` field
+* dcim.PowerOutletTemplate: Added `description` and `label` fields
+* dcim.RackGroup: Added a `_depth` attribute indicating an object's position in the tree.
+* dcim.RackReservation: Added `tags` field
+* dcim.RearPort: Added `label` field
+* dcim.RearPortTemplate: Added `description` and `label` fields
+* dcim.Region: Added a `_depth` attribute indicating an object's position in the tree.
+* dcim.VirtualChassis: Added `name` field (required)
+* extras.ConfigContext: Added `created` and `last_updated` fields
+* extras.JobResult: Added the `/api/extras/job-results/` endpoint
 * extras.Report: The `failed` field has been removed. The `completed` (boolean) and `status` (string) fields have been introduced to convey the status of a report's most recent execution. Additionally, the `result` field now conveys the nested representation of a JobResult.
 * extras.Script: Added `module` and `result` fields. The `result` field now conveys the nested representation of a JobResult.
-* A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
-* A `_depth` field has been added to all objects which feature a self-recursive hierarchy (namely regions, rack groups, and tenant groups).
-* Legacy numeric values for choice fields are no longer conveyed or accepted.
+* extras.Tag: The count of `tagged_items` is no longer included when viewing the tags list when `brief` is passed.
+* ipam.IPAddress: Removed `interface` field; replaced with `assigned_object` generic foreign key. This may represent either a device interface or a virtual machine interface. Assign an object by setting `assigned_object_type` and `assigned_object_id`.
+* tenancy.TenantGroup: Added a `_depth` attribute indicating an object's position in the tree.
+* users.ObjectPermissions: Added the `/api/users/permissions/` endpoint
+* virtualization.VMInterface: Removed `type` field (VM interfaces have no type)
 
 ### Other Changes
 
@@ -64,5 +86,5 @@ When running a report or custom script, the task is now queued for background pr
 * The `users.delete_token` permission is no longer enforced. All users are permitted to delete their own API tokens.
 * Dropped backward compatibility for the `webhooks` Redis queue configuration (use `tasks` instead).
 * Dropped backward compatibility for the `/admin/webhook-backend-status` URL (moved to `/admin/background-tasks/`).
-* Virtual chassis are now created by navigating to `/dcim/virtual-chassis/add` rather than via the devices list.
+* Virtual chassis are now created by navigating to `/dcim/virtual-chassis/add/` rather than via the devices list.
 * A name is required when creating a virtual chassis.

From 3e6b257fa0aad852c9834cfb0cc2747c194695ca Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 21 Jul 2020 17:39:56 -0400
Subject: [PATCH 369/505] Exclude ObjectPermissions API endpoint from
 EXEMPT_VIEW_PERMISSIONS

---
 docs/configuration/optional-settings.md |  3 +++
 netbox/users/tests/test_api.py          | 18 +++++++++++++++++-
 netbox/utilities/permissions.py         | 12 +++++++++---
 netbox/utilities/testing/api.py         |  7 ++++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 69939d6e5..77286c97d 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -172,6 +172,9 @@ To exempt _all_ models from view permission enforcement, set the following. (Not
 EXEMPT_VIEW_PERMISSIONS = ['*']
 ```
 
+!!! note
+    Using a wildcard will not affect certain potentially sensitive models, such as user permissions. If there is a need to exempt these models, they must be specified individually.
+
 ---
 
 ## ENFORCE_GLOBAL_UNIQUE
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index a485fe9df..757b186cc 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -1,9 +1,11 @@
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
+from django.test import override_settings
 from django.urls import reverse
+from rest_framework import status
 
 from users.models import ObjectPermission
-from utilities.testing import APIViewTestCases, APITestCase
+from utilities.testing import APIViewTestCases, APITestCase, disable_warnings
 
 
 class AppTest(APITestCase):
@@ -72,3 +74,17 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
                 'constraints': {'name': 'TEST6'},
             },
         ]
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+    def test_list_objects_anonymous(self):
+        # Endpoint should never be exposed via EXEMPT_VIEW_PERMISSIONS
+        url = self._get_list_url()
+        with disable_warnings('django.request'):
+            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
+
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+    def test_get_object_anonymous(self):
+        # Endpoint should never be exposed via EXEMPT_VIEW_PERMISSIONS
+        url = self._get_detail_url(self._get_queryset().first())
+        with disable_warnings('django.request'):
+            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 44c34942f..0321fc6a7 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,6 +1,12 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 
+# Exclude potentially sensitive models from wild view exemption. These may still be exempted
+# by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter.
+EXEMPT_EXCLUDE_MODELS = (
+    ('users', 'objectpermission'),
+)
+
 
 def get_permission_for_model(model, action):
     """
@@ -63,11 +69,11 @@ def permission_is_exempt(name):
 
     if action == 'view':
         if (
-            # All models are exempt from view permission enforcement
-            '*' in settings.EXEMPT_VIEW_PERMISSIONS
+            # All models (excluding those in EXEMPT_EXCLUDE_MODELS) are exempt from view permission enforcement
+            '*' in settings.EXEMPT_VIEW_PERMISSIONS and (app_label, model_name) not in EXEMPT_EXCLUDE_MODELS
         ) or (
             # This specific model is exempt from view permission enforcement
-            '{}.{}'.format(app_label, model_name) in settings.EXEMPT_VIEW_PERMISSIONS
+            f'{app_label}.{model_name}' in settings.EXEMPT_VIEW_PERMISSIONS
         ):
             return True
 
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index 6bd9770d4..b1b1d9f55 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -103,14 +103,15 @@ class APIViewTestCases:
             url = self._get_list_url()
             response = self.client.get(url, **self.header)
 
-            self.assertEqual(len(response.data['results']), self._get_queryset().count())
             self.assertHttpStatus(response, status.HTTP_200_OK)
+            self.assertEqual(len(response.data['results']), self._get_queryset().count())
 
-        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_brief(self):
             """
-            GET a list of objects using the "brief" parameter as an unauthenticated user.
+            GET a list of objects using the "brief" parameter.
             """
+            self.add_permissions(f'{self.model._meta.app_label}.view_{self.model._meta.model_name}')
             url = f'{self._get_list_url()}?brief=1'
             response = self.client.get(url, **self.header)
 

From 1ac215bf87381e1cb7d5fb93955f0d4f795b1c5a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 11:21:51 -0400
Subject: [PATCH 370/505] Introduce API endpoints for Users and Groups

---
 netbox/users/api/nested_serializers.py |  9 ++--
 netbox/users/api/serializers.py        | 26 ++++++++++++
 netbox/users/api/urls.py               |  4 ++
 netbox/users/api/views.py              | 22 +++++++++-
 netbox/users/filters.py                | 58 ++++++++++++++++++++++++++
 5 files changed, 115 insertions(+), 4 deletions(-)
 create mode 100644 netbox/users/filters.py

diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py
index 6e89f1da0..f1bcf3b37 100644
--- a/netbox/users/api/nested_serializers.py
+++ b/netbox/users/api/nested_serializers.py
@@ -13,20 +13,23 @@ __all__ = [
 
 
 class NestedGroupSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')
 
     class Meta:
         model = Group
-        fields = ['id', 'name']
+        fields = ['id', 'url', 'name']
 
 
 class NestedUserSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')
 
     class Meta:
         model = User
-        fields = ['id', 'username']
+        fields = ['id', 'url', 'username']
 
 
 class NestedObjectPermissionSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
     object_types = ContentTypeField(
         queryset=ContentType.objects.all(),
         many=True
@@ -36,7 +39,7 @@ class NestedObjectPermissionSerializer(WritableNestedSerializer):
 
     class Meta:
         model = ObjectPermission
-        fields = ['id', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
+        fields = ['id', 'url', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
 
     def get_groups(self, obj):
         return [g.name for g in obj.groups.all()]
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index c91f9be4a..5141abb10 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -7,6 +7,32 @@ from utilities.api import ContentTypeField, SerializedPKRelatedField, ValidatedM
 from .nested_serializers import *
 
 
+class UserSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:user-detail')
+    groups = SerializedPKRelatedField(
+        queryset=Group.objects.all(),
+        serializer=NestedGroupSerializer,
+        required=False,
+        many=True
+    )
+
+    class Meta:
+        model = User
+        fields = (
+            'id', 'url', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'date_joined',
+            'groups',
+        )
+
+
+class GroupSerializer(ValidatedModelSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')
+    user_count = serializers.IntegerField(read_only=True)
+
+    class Meta:
+        model = Group
+        fields = ('id', 'url', 'name', 'user_count')
+
+
 class ObjectPermissionSerializer(ValidatedModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='users-api:objectpermission-detail')
     object_types = ContentTypeField(
diff --git a/netbox/users/api/urls.py b/netbox/users/api/urls.py
index fffea5968..a81b56bed 100644
--- a/netbox/users/api/urls.py
+++ b/netbox/users/api/urls.py
@@ -14,6 +14,10 @@ class UsersRootView(routers.APIRootView):
 router = routers.DefaultRouter()
 router.APIRootView = UsersRootView
 
+# Users and groups
+router.register('users', views.UserViewSet)
+router.register('groups', views.GroupViewSet)
+
 # Permissions
 router.register('permissions', views.ObjectPermissionViewSet)
 
diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index 74b315b44..07c449236 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -1,7 +1,27 @@
+from django.contrib.auth.models import Group, User
+from django.db.models import Count
+
+from users import filters
+from users.models import ObjectPermission
 from utilities.api import ModelViewSet
+from utilities.querysets import RestrictedQuerySet
 from . import serializers
 
-from users.models import ObjectPermission
+
+#
+# Users and groups
+#
+
+class UserViewSet(ModelViewSet):
+    queryset = RestrictedQuerySet(model=User).prefetch_related('groups')
+    serializer_class = serializers.UserSerializer
+    filterset_class = filters.UserFitlerSet
+
+
+class GroupViewSet(ModelViewSet):
+    queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user'))
+    serializer_class = serializers.GroupSerializer
+    filterset_class = filters.GroupFitlerSet
 
 
 #
diff --git a/netbox/users/filters.py b/netbox/users/filters.py
new file mode 100644
index 000000000..e433dc5fa
--- /dev/null
+++ b/netbox/users/filters.py
@@ -0,0 +1,58 @@
+import django_filters
+from django.contrib.auth.models import Group, User
+from django.db.models import Q
+
+from utilities.filters import BaseFilterSet
+
+__all__ = (
+    'GroupFitlerSet',
+    'UserFitlerSet',
+)
+
+
+class GroupFitlerSet(BaseFilterSet):
+    q = django_filters.CharFilter(
+        method='search',
+        label='Search',
+    )
+
+    class Meta:
+        model = Group
+        fields = ['id', 'name']
+
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        return queryset.filter(name__icontains=value)
+
+
+class UserFitlerSet(BaseFilterSet):
+    q = django_filters.CharFilter(
+        method='search',
+        label='Search',
+    )
+    group_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='groups',
+        queryset=Group.objects.all(),
+        label='Group',
+    )
+    group = django_filters.ModelMultipleChoiceFilter(
+        field_name='groups__name',
+        queryset=Group.objects.all(),
+        to_field_name='name',
+        label='Group (name)',
+    )
+
+    class Meta:
+        model = User
+        fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'date_joined']
+
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        return queryset.filter(
+            Q(username__icontains=value) |
+            Q(first_name__icontains=value) |
+            Q(last_name__icontains=value) |
+            Q(email__icontains=value)
+        )

From e9199d6ca5e35c48d8468b2d9034ed627354f813 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 11:50:20 -0400
Subject: [PATCH 371/505] Look for auth model serializers in users app

---
 netbox/utilities/api.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 83405a3c1..56f9f87b4 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -32,9 +32,10 @@ def get_serializer_for_model(model, prefix=''):
     Dynamically resolve and return the appropriate serializer for a model.
     """
     app_name, model_name = model._meta.label.split('.')
-    serializer_name = '{}.api.serializers.{}{}Serializer'.format(
-        app_name, prefix, model_name
-    )
+    # Serializers for Django's auth models are in the users app
+    if app_name == 'auth':
+        app_name = 'users'
+    serializer_name = f'{app_name}.api.serializers.{prefix}{model_name}Serializer'
     try:
         return dynamic_import(serializer_name)
     except AttributeError:

From 788f8c9a1c6268c1ed16a4a2abf933818408fb81 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 11:51:10 -0400
Subject: [PATCH 372/505] Add view_namespace attrbiute to APITestCase to
 override model's app_label

---
 netbox/utilities/testing/api.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index b1b1d9f55..f46bcae35 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -21,7 +21,14 @@ __all__ = (
 #
 
 class APITestCase(ModelTestCase):
+    """
+    Base test case for API requests.
+
+    client_class: Test client class
+    view_namespace: Namespace for API views. If None, the model's app_label will be used.
+    """
     client_class = APIClient
+    view_namespace = None
 
     def setUp(self):
         """
@@ -33,12 +40,15 @@ class APITestCase(ModelTestCase):
         self.token = Token.objects.create(user=self.user)
         self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
 
+    def _get_view_namespace(self):
+        return f'{self.view_namespace or self.model._meta.app_label}-api'
+
     def _get_detail_url(self, instance):
-        viewname = f'{instance._meta.app_label}-api:{instance._meta.model_name}-detail'
+        viewname = f'{self._get_view_namespace()}:{instance._meta.model_name}-detail'
         return reverse(viewname, kwargs={'pk': instance.pk})
 
     def _get_list_url(self):
-        viewname = f'{self.model._meta.app_label}-api:{self.model._meta.model_name}-list'
+        viewname = f'{self._get_view_namespace()}:{self.model._meta.model_name}-list'
         return reverse(viewname)
 
 

From b4cf85149bb7bb36dcda53ad620921bdfba2cd74 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 11:51:41 -0400
Subject: [PATCH 373/505] Add tests for users and groups API endpoints

---
 netbox/users/tests/test_api.py | 56 +++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 757b186cc..42c5a3e03 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -18,9 +18,63 @@ class AppTest(APITestCase):
         self.assertEqual(response.status_code, 200)
 
 
+class UserTest(APIViewTestCases.APIViewTestCase):
+    model = User
+    view_namespace = 'users'
+    brief_fields = ['id', 'url', 'username']
+    create_data = [
+        {
+            'username': 'User_4',
+        },
+        {
+            'username': 'User_5',
+        },
+        {
+            'username': 'User_6',
+        },
+    ]
+
+    @classmethod
+    def setUpTestData(cls):
+
+        users = (
+            User(username='User_1'),
+            User(username='User_2'),
+            User(username='User_3'),
+        )
+        User.objects.bulk_create(users)
+
+
+class GroupTest(APIViewTestCases.APIViewTestCase):
+    model = Group
+    view_namespace = 'users'
+    brief_fields = ['id', 'name', 'url']
+    create_data = [
+        {
+            'name': 'Group 4',
+        },
+        {
+            'name': 'Group 5',
+        },
+        {
+            'name': 'Group 6',
+        },
+    ]
+
+    @classmethod
+    def setUpTestData(cls):
+
+        users = (
+            Group(name='Group 1'),
+            Group(name='Group 2'),
+            Group(name='Group 3'),
+        )
+        Group.objects.bulk_create(users)
+
+
 class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
     model = ObjectPermission
-    brief_fields = ['actions', 'enabled', 'groups', 'id', 'name', 'object_types', 'users']
+    brief_fields = ['actions', 'enabled', 'groups', 'id', 'name', 'object_types', 'url', 'users']
 
     @classmethod
     def setUpTestData(cls):

From 64a3bd37e700a75ffac9a1d99232d962412d6b7f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 12:13:07 -0400
Subject: [PATCH 374/505] Move EXEMPT_EXCLUDE_MODELS to settings; add Group and
 User models

---
 netbox/netbox/settings.py       |  8 ++++++++
 netbox/users/tests/test_api.py  | 14 --------------
 netbox/utilities/permissions.py |  8 +-------
 netbox/utilities/testing/api.py | 22 ++++++++++++++++------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 86f1b333e..ee5b39a47 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -382,6 +382,14 @@ LOGIN_URL = '/{}login/'.format(BASE_PATH)
 
 CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
+# Exclude potentially sensitive models from wildcard view exemption. These may still be exempted
+# by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter.
+EXEMPT_EXCLUDE_MODELS = (
+    ('auth', 'group'),
+    ('auth', 'user'),
+    ('users', 'objectpermission'),
+)
+
 #
 # Caching
 #
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 42c5a3e03..1cd5892e9 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -128,17 +128,3 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
                 'constraints': {'name': 'TEST6'},
             },
         ]
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-    def test_list_objects_anonymous(self):
-        # Endpoint should never be exposed via EXEMPT_VIEW_PERMISSIONS
-        url = self._get_list_url()
-        with disable_warnings('django.request'):
-            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
-
-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
-    def test_get_object_anonymous(self):
-        # Endpoint should never be exposed via EXEMPT_VIEW_PERMISSIONS
-        url = self._get_detail_url(self._get_queryset().first())
-        with disable_warnings('django.request'):
-            self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py
index 0321fc6a7..b6bddcf61 100644
--- a/netbox/utilities/permissions.py
+++ b/netbox/utilities/permissions.py
@@ -1,12 +1,6 @@
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 
-# Exclude potentially sensitive models from wild view exemption. These may still be exempted
-# by specifying the model individually in the EXEMPT_VIEW_PERMISSIONS configuration parameter.
-EXEMPT_EXCLUDE_MODELS = (
-    ('users', 'objectpermission'),
-)
-
 
 def get_permission_for_model(model, action):
     """
@@ -70,7 +64,7 @@ def permission_is_exempt(name):
     if action == 'view':
         if (
             # All models (excluding those in EXEMPT_EXCLUDE_MODELS) are exempt from view permission enforcement
-            '*' in settings.EXEMPT_VIEW_PERMISSIONS and (app_label, model_name) not in EXEMPT_EXCLUDE_MODELS
+            '*' in settings.EXEMPT_VIEW_PERMISSIONS and (app_label, model_name) not in settings.EXEMPT_EXCLUDE_MODELS
         ) or (
             # This specific model is exempt from view permission enforcement
             f'{app_label}.{model_name}' in settings.EXEMPT_VIEW_PERMISSIONS
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index f46bcae35..bf6ebd7ff 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
@@ -62,8 +63,13 @@ class APIViewTestCases:
             GET a single object as an unauthenticated user.
             """
             url = self._get_detail_url(self._get_queryset().first())
-            response = self.client.get(url, **self.header)
-            self.assertHttpStatus(response, status.HTTP_200_OK)
+            if (self.model._meta.app_label, self.model._meta.model_name) in settings.EXEMPT_EXCLUDE_MODELS:
+                # Models listed in EXEMPT_EXCLUDE_MODELS should not be accessible to anonymous users
+                with disable_warnings('django.request'):
+                    self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
+            else:
+                response = self.client.get(url, **self.header)
+                self.assertHttpStatus(response, status.HTTP_200_OK)
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_get_object_without_permission(self):
@@ -111,10 +117,14 @@ class APIViewTestCases:
             GET a list of objects as an unauthenticated user.
             """
             url = self._get_list_url()
-            response = self.client.get(url, **self.header)
-
-            self.assertHttpStatus(response, status.HTTP_200_OK)
-            self.assertEqual(len(response.data['results']), self._get_queryset().count())
+            if (self.model._meta.app_label, self.model._meta.model_name) in settings.EXEMPT_EXCLUDE_MODELS:
+                # Models listed in EXEMPT_EXCLUDE_MODELS should not be accessible to anonymous users
+                with disable_warnings('django.request'):
+                    self.assertHttpStatus(self.client.get(url, **self.header), status.HTTP_403_FORBIDDEN)
+            else:
+                response = self.client.get(url, **self.header)
+                self.assertHttpStatus(response, status.HTTP_200_OK)
+                self.assertEqual(len(response.data['results']), self._get_queryset().count())
 
         @override_settings(EXEMPT_VIEW_PERMISSIONS=[])
         def test_list_objects_brief(self):

From 2cc4f032b02b06b0cb39241bfba23587f85ceb76 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 13:48:04 -0400
Subject: [PATCH 375/505] Correct FilterSet naming

---
 netbox/users/api/views.py | 4 ++--
 netbox/users/filters.py   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index 07c449236..5e9624ee8 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -15,13 +15,13 @@ from . import serializers
 class UserViewSet(ModelViewSet):
     queryset = RestrictedQuerySet(model=User).prefetch_related('groups')
     serializer_class = serializers.UserSerializer
-    filterset_class = filters.UserFitlerSet
+    filterset_class = filters.UserFilterSet
 
 
 class GroupViewSet(ModelViewSet):
     queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user'))
     serializer_class = serializers.GroupSerializer
-    filterset_class = filters.GroupFitlerSet
+    filterset_class = filters.GroupFilterSet
 
 
 #
diff --git a/netbox/users/filters.py b/netbox/users/filters.py
index e433dc5fa..e48394cfe 100644
--- a/netbox/users/filters.py
+++ b/netbox/users/filters.py
@@ -5,12 +5,12 @@ from django.db.models import Q
 from utilities.filters import BaseFilterSet
 
 __all__ = (
-    'GroupFitlerSet',
-    'UserFitlerSet',
+    'GroupFilterSet',
+    'UserFilterSet',
 )
 
 
-class GroupFitlerSet(BaseFilterSet):
+class GroupFilterSet(BaseFilterSet):
     q = django_filters.CharFilter(
         method='search',
         label='Search',
@@ -26,7 +26,7 @@ class GroupFitlerSet(BaseFilterSet):
         return queryset.filter(name__icontains=value)
 
 
-class UserFitlerSet(BaseFilterSet):
+class UserFilterSet(BaseFilterSet):
     q = django_filters.CharFilter(
         method='search',
         label='Search',

From 79f1248119ccc81f709aed397bc733343bdec1b8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 13:58:12 -0400
Subject: [PATCH 376/505] Add filter tests for group, users

---
 netbox/users/filters.py            |   2 +-
 netbox/users/tests/test_filters.py | 116 +++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 netbox/users/tests/test_filters.py

diff --git a/netbox/users/filters.py b/netbox/users/filters.py
index e48394cfe..d33c10270 100644
--- a/netbox/users/filters.py
+++ b/netbox/users/filters.py
@@ -45,7 +45,7 @@ class UserFilterSet(BaseFilterSet):
 
     class Meta:
         model = User
-        fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'date_joined']
+        fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active']
 
     def search(self, queryset, name, value):
         if not value.strip():
diff --git a/netbox/users/tests/test_filters.py b/netbox/users/tests/test_filters.py
new file mode 100644
index 000000000..7db013a4b
--- /dev/null
+++ b/netbox/users/tests/test_filters.py
@@ -0,0 +1,116 @@
+from django.contrib.auth.models import Group, User
+from django.test import TestCase
+
+from users.filters import GroupFilterSet, UserFilterSet
+
+
+class UserTestCase(TestCase):
+    queryset = User.objects.all()
+    filterset = UserFilterSet
+
+    @classmethod
+    def setUpTestData(cls):
+
+        groups = (
+            Group(name='Group 1'),
+            Group(name='Group 2'),
+            Group(name='Group 3'),
+        )
+        Group.objects.bulk_create(groups)
+
+        users = (
+            User(
+                username='User1',
+                first_name='Hank',
+                last_name='Hill',
+                email='hank@stricklandpropane.com',
+                is_staff=True
+            ),
+            User(
+                username='User2',
+                first_name='Dale',
+                last_name='Gribble',
+                email='dale@dalesdeadbug.com'
+            ),
+            User(
+                username='User3',
+                first_name='Bill',
+                last_name='Dauterive',
+                email='bill.dauterive@army.mil'
+            ),
+            User(
+                username='User4',
+                first_name='Jeff',
+                last_name='Boomhauer',
+                email='boomhauer@dangolemail.com'
+            ),
+            User(
+                username='User5',
+                first_name='Debbie',
+                last_name='Grund',
+                is_active=False
+            )
+        )
+        User.objects.bulk_create(users)
+
+        users[0].groups.set([groups[0]])
+        users[1].groups.set([groups[1]])
+        users[2].groups.set([groups[2]])
+
+    def test_id(self):
+        params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_username(self):
+        params = {'username': ['User1', 'User2']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_first_name(self):
+        params = {'first_name': ['Hank', 'Dale']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_last_name(self):
+        params = {'last_name': ['Hill', 'Gribble']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_email(self):
+        params = {'email': ['hank@stricklandpropane.com', 'dale@dalesdeadbug.com']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_is_staff(self):
+        params = {'is_staff': True}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+
+    def test_is_active(self):
+        params = {'is_active': True}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
+
+    def test_group(self):
+        groups = Group.objects.all()[:2]
+        params = {'group_id': [groups[0].pk, groups[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'group': [groups[0].name, groups[1].name]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+
+class GroupTestCase(TestCase):
+    queryset = Group.objects.all()
+    filterset = GroupFilterSet
+
+    @classmethod
+    def setUpTestData(cls):
+
+        groups = (
+            Group(name='Group 1'),
+            Group(name='Group 2'),
+            Group(name='Group 3'),
+        )
+        Group.objects.bulk_create(groups)
+
+    def test_id(self):
+        params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_name(self):
+        params = {'name': ['Group 1', 'Group 2']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

From 798810b3dd72ac319c7f3c7d1c85ac5dfa2f6990 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 14:41:39 -0400
Subject: [PATCH 377/505] Changelog for #4877

---
 docs/release-notes/version-2.9.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index c06f6f02c..e1ac9cb2a 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -27,6 +27,7 @@ When running a report or custom script, its execution is now queued for backgrou
 * [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
 * [#4837](https://github.com/netbox-community/netbox/issues/4837) - Use dynamic form widget for relationships to MPTT objects (e.g. regions)
 * [#4840](https://github.com/netbox-community/netbox/issues/4840) - Enable change logging for config contexts
+* [#4877](https://github.com/netbox-community/netbox/issues/4877) - Add REST API endpoints for users and groups
 
 ### Configuration Changes
 
@@ -35,6 +36,7 @@ When running a report or custom script, its execution is now queued for backgrou
 
 ### REST API Changes
 
+* Added new endpoints for users, groups, and permissions under `/api/users/`.
 * A `url` field is now included on all object representations, identifying the unique REST API URL for each object.
 * The `tags` field of an object now includes a more complete representation of each tag, rather than just its name.
 * The assignment of tags to an object is now achieved in the same manner as specifying any other related device. The `tags` field accepts a list of JSON objects each matching a desired tag. (Alternatively, a list of numeric primary keys corresponding to tags may be passed instead.) For example:

From 7cdb0cf560f412455461245b20a38497faa6d8c4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 15:25:06 -0400
Subject: [PATCH 378/505] Allow the assignment of ObjectPermissions to users,
 groups, and permissions

---
 netbox/users/migrations/0008_objectpermission.py |  4 ++--
 netbox/users/models.py                           | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 63e173ef8..2df065898 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -22,12 +22,12 @@ class Migration(migrations.Migration):
                 ('enabled', models.BooleanField(default=True)),
                 ('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
-                ('object_types', models.ManyToManyField(limit_choices_to={'app_label__in': ['circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization']}, related_name='object_permissions', to='contenttypes.ContentType')),
+                ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(_negated=True, app_label__in=['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')),
                 ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')),
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
             options={
-                'verbose_name': 'Permission',
+                'verbose_name': 'permission',
             },
         ),
     ]
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 9e890cfdf..b8c799d65 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -6,6 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import ArrayField
 from django.core.validators import MinLengthValidator
 from django.db import models
+from django.db.models import Q
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.utils import timezone
@@ -244,11 +245,11 @@ class ObjectPermission(models.Model):
     )
     object_types = models.ManyToManyField(
         to=ContentType,
-        limit_choices_to={
-            'app_label__in': [
-                'circuits', 'dcim', 'extras', 'ipam', 'secrets', 'tenancy', 'virtualization',
-            ],
-        },
+        limit_choices_to=Q(
+            ~Q(app_label__in=['admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
+            Q(app_label='auth', model__in=['group', 'user']) |
+            Q(app_label='users', model__in=['objectpermission', 'token'])
+        ),
         related_name='object_permissions'
     )
     groups = models.ManyToManyField(
@@ -274,7 +275,7 @@ class ObjectPermission(models.Model):
     objects = RestrictedQuerySet.as_manager()
 
     class Meta:
-        verbose_name = "Permission"
+        verbose_name = "permission"
 
     def __str__(self):
         if self.name:

From 4f54ffa9aa4a53022272bfbb1ef80d9e328aba42 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 16:00:28 -0400
Subject: [PATCH 379/505] Admin UI cleanup

---
 netbox/users/admin.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index aca0f1489..5795eeb7b 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -42,6 +42,7 @@ class ObjectPermissionInline(admin.TabularInline):
     readonly_fields = fields
     extra = 0
     verbose_name = 'Permission'
+    verbose_name_plural = 'Permissions'
 
     def object_types(self, instance):
         return ', '.join(instance.objectpermission.object_types.values_list('model', flat=True))
@@ -65,7 +66,7 @@ class UserAdmin(UserAdmin_):
     fieldsets = (
         (None, {'fields': ('username', 'password', 'first_name', 'last_name', 'email')}),
         ('Groups', {'fields': ('groups',)}),
-        ('Permissions', {
+        ('Status', {
             'fields': ('is_active', 'is_staff', 'is_superuser'),
         }),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
@@ -120,6 +121,9 @@ class ObjectPermissionForm(forms.ModelForm):
         labels = {
             'actions': 'Additional actions'
         }
+        widgets = {
+            'constraints': forms.Textarea(attrs={'class': 'vLargeTextField'})
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

From 380d30e6125a8b5ce9f2d60120decffcdad3c6df Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 22 Jul 2020 16:34:16 -0400
Subject: [PATCH 380/505] Add filters for ObjectPermissions

---
 netbox/users/api/views.py          |  2 +-
 netbox/users/filters.py            | 31 ++++++++++++
 netbox/users/tests/test_filters.py | 78 +++++++++++++++++++++++++++++-
 3 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index 5e9624ee8..1c3a92bcc 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -31,4 +31,4 @@ class GroupViewSet(ModelViewSet):
 class ObjectPermissionViewSet(ModelViewSet):
     queryset = ObjectPermission.objects.prefetch_related('object_types', 'groups', 'users')
     serializer_class = serializers.ObjectPermissionSerializer
-    # filterset_class = filters.ObjectPermissionFilterSet
+    filterset_class = filters.ObjectPermissionFilterSet
diff --git a/netbox/users/filters.py b/netbox/users/filters.py
index d33c10270..359cf9cc7 100644
--- a/netbox/users/filters.py
+++ b/netbox/users/filters.py
@@ -2,10 +2,12 @@ import django_filters
 from django.contrib.auth.models import Group, User
 from django.db.models import Q
 
+from users.models import ObjectPermission
 from utilities.filters import BaseFilterSet
 
 __all__ = (
     'GroupFilterSet',
+    'ObjectPermissionFilterSet',
     'UserFilterSet',
 )
 
@@ -56,3 +58,32 @@ class UserFilterSet(BaseFilterSet):
             Q(last_name__icontains=value) |
             Q(email__icontains=value)
         )
+
+
+class ObjectPermissionFilterSet(BaseFilterSet):
+    user_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='users',
+        queryset=User.objects.all(),
+        label='User',
+    )
+    user = django_filters.ModelMultipleChoiceFilter(
+        field_name='users__username',
+        queryset=User.objects.all(),
+        to_field_name='username',
+        label='User (name)',
+    )
+    group_id = django_filters.ModelMultipleChoiceFilter(
+        field_name='groups',
+        queryset=Group.objects.all(),
+        label='Group',
+    )
+    group = django_filters.ModelMultipleChoiceFilter(
+        field_name='groups__name',
+        queryset=Group.objects.all(),
+        to_field_name='name',
+        label='Group (name)',
+    )
+
+    class Meta:
+        model = ObjectPermission
+        fields = ['id', 'name', 'enabled', 'object_types']
diff --git a/netbox/users/tests/test_filters.py b/netbox/users/tests/test_filters.py
index 7db013a4b..c3774927c 100644
--- a/netbox/users/tests/test_filters.py
+++ b/netbox/users/tests/test_filters.py
@@ -1,7 +1,9 @@
 from django.contrib.auth.models import Group, User
+from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
-from users.filters import GroupFilterSet, UserFilterSet
+from users.filters import GroupFilterSet, ObjectPermissionFilterSet, UserFilterSet
+from users.models import ObjectPermission
 
 
 class UserTestCase(TestCase):
@@ -114,3 +116,77 @@ class GroupTestCase(TestCase):
     def test_name(self):
         params = {'name': ['Group 1', 'Group 2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+
+class ObjectPermissionTestCase(TestCase):
+    queryset = ObjectPermission.objects.all()
+    filterset = ObjectPermissionFilterSet
+
+    @classmethod
+    def setUpTestData(cls):
+
+        groups = (
+            Group(name='Group 1'),
+            Group(name='Group 2'),
+            Group(name='Group 3'),
+        )
+        Group.objects.bulk_create(groups)
+
+        users = (
+            User(username='User1'),
+            User(username='User2'),
+            User(username='User3'),
+        )
+        User.objects.bulk_create(users)
+
+        object_types = (
+            ContentType.objects.get(app_label='dcim', model='site'),
+            ContentType.objects.get(app_label='dcim', model='rack'),
+            ContentType.objects.get(app_label='dcim', model='device'),
+        )
+
+        permissions = (
+            ObjectPermission(name='Permission 1', actions=['view', 'add', 'change', 'delete']),
+            ObjectPermission(name='Permission 2', actions=['view', 'add', 'change', 'delete']),
+            ObjectPermission(name='Permission 3', actions=['view', 'add', 'change', 'delete']),
+            ObjectPermission(name='Permission 4', actions=['view'], enabled=False),
+            ObjectPermission(name='Permission 5', actions=['add'], enabled=False),
+            ObjectPermission(name='Permission 6', actions=['change'], enabled=False),
+            ObjectPermission(name='Permission 7', actions=['delete'], enabled=False),
+        )
+        ObjectPermission.objects.bulk_create(permissions)
+        for i in range(0, 3):
+            permissions[i].groups.set([groups[i]])
+            permissions[i].users.set([users[i]])
+            permissions[i].object_types.set([object_types[i]])
+
+    def test_id(self):
+        params = {'id': self.queryset.values_list('pk', flat=True)[:2]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_name(self):
+        params = {'name': ['Permission 1', 'Permission 2']}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_enabled(self):
+        params = {'enabled': True}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
+
+    def test_group(self):
+        groups = Group.objects.filter(name__in=['Group 1', 'Group 2'])
+        params = {'group_id': [groups[0].pk, groups[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'group': [groups[0].name, groups[1].name]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_user(self):
+        users = User.objects.filter(username__in=['User1', 'User2'])
+        params = {'user_id': [users[0].pk, users[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+        params = {'user': [users[0].username, users[1].username]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
+
+    def test_object_types(self):
+        object_types = ContentType.objects.filter(model__in=['site', 'rack'])
+        params = {'object_types': [object_types[0].pk, object_types[1].pk]}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)

From cb36f9fdb349d050b2ce12d3b1eeea340ce9c14e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 12:48:03 -0400
Subject: [PATCH 381/505] Remove restriction enforcement from
 RestrictedQuerySet

---
 netbox/circuits/api/views.py                |   2 +-
 netbox/circuits/filters.py                  |  30 +--
 netbox/circuits/models.py                   |   4 +-
 netbox/circuits/signals.py                  |   2 +-
 netbox/circuits/tests/test_api.py           |   2 +-
 netbox/circuits/tests/test_filters.py       |  28 +--
 netbox/circuits/views.py                    |   9 +-
 netbox/dcim/api/views.py                    |   2 +-
 netbox/dcim/filters.py                      | 154 +++++++-------
 netbox/dcim/models/__init__.py              |  48 ++---
 netbox/dcim/tests/test_api.py               |  82 ++++----
 netbox/dcim/tests/test_filters.py           | 220 ++++++++++----------
 netbox/extras/filters.py                    |  30 +--
 netbox/extras/middleware.py                 |   2 +-
 netbox/extras/models/models.py              |   2 +-
 netbox/extras/tests/test_filters.py         |  22 +-
 netbox/ipam/api/views.py                    |   3 +-
 netbox/ipam/filters.py                      |  72 +++----
 netbox/ipam/models.py                       |  28 +--
 netbox/ipam/tests/test_api.py               |   2 +-
 netbox/ipam/tests/test_filters.py           |  72 +++----
 netbox/ipam/tests/test_models.py            |   4 +-
 netbox/ipam/tests/test_ordering.py          |   6 +-
 netbox/ipam/views.py                        |  11 +-
 netbox/netbox/authentication.py             |   2 +-
 netbox/secrets/filters.py                   |   8 +-
 netbox/secrets/tests/test_filters.py        |   8 +-
 netbox/tenancy/filters.py                   |  16 +-
 netbox/tenancy/tests/test_filters.py        |   6 +-
 netbox/users/admin.py                       |   6 +-
 netbox/utilities/api.py                     |   4 -
 netbox/utilities/mptt.py                    |   6 +-
 netbox/utilities/querysets.py               |  43 ----
 netbox/utilities/testing/views.py           |   4 +-
 netbox/virtualization/api/views.py          |   3 +-
 netbox/virtualization/filters.py            |  50 ++---
 netbox/virtualization/models.py             |   4 +-
 netbox/virtualization/tests/test_api.py     |   6 +-
 netbox/virtualization/tests/test_filters.py |  42 ++--
 39 files changed, 491 insertions(+), 554 deletions(-)

diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py
index 79c4452d2..fec22f604 100644
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -52,7 +52,7 @@ class CircuitTypeViewSet(ModelViewSet):
 
 class CircuitViewSet(CustomFieldModelViewSet):
     queryset = Circuit.objects.prefetch_related(
-        Prefetch('terminations', queryset=CircuitTermination.objects.unrestricted().prefetch_related(
+        Prefetch('terminations', queryset=CircuitTermination.objects.prefetch_related(
             'site', 'connected_endpoint__device'
         )),
         'type', 'tenant', 'provider',
diff --git a/netbox/circuits/filters.py b/netbox/circuits/filters.py
index a81d6acca..206dcc305 100644
--- a/netbox/circuits/filters.py
+++ b/netbox/circuits/filters.py
@@ -24,13 +24,13 @@ class ProviderFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilte
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='circuits__terminations__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='circuits__terminations__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -38,12 +38,12 @@ class ProviderFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilte
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='circuits__terminations__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='circuits__terminations__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
@@ -78,22 +78,22 @@ class CircuitFilterSet(BaseFilterSet, CustomFieldFilterSet, TenancyFilterSet, Cr
         label='Search',
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Provider.objects.unrestricted(),
+        queryset=Provider.objects.all(),
         label='Provider (ID)',
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
-        queryset=Provider.objects.unrestricted(),
+        queryset=Provider.objects.all(),
         to_field_name='slug',
         label='Provider (slug)',
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=CircuitType.objects.unrestricted(),
+        queryset=CircuitType.objects.all(),
         label='Circuit type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
-        queryset=CircuitType.objects.unrestricted(),
+        queryset=CircuitType.objects.all(),
         to_field_name='slug',
         label='Circuit type (slug)',
     )
@@ -103,23 +103,23 @@ class CircuitFilterSet(BaseFilterSet, CustomFieldFilterSet, TenancyFilterSet, Cr
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='terminations__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='terminations__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='terminations__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='terminations__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -150,16 +150,16 @@ class CircuitTerminationFilterSet(BaseFilterSet):
         label='Search',
     )
     circuit_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Circuit.objects.unrestricted(),
+        queryset=Circuit.objects.all(),
         label='Circuit',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py
index 9ec90d110..cdec41d1f 100644
--- a/netbox/circuits/models.py
+++ b/netbox/circuits/models.py
@@ -238,7 +238,7 @@ class Circuit(ChangeLoggedModel, CustomFieldModel):
         return self.STATUS_CLASS_MAP.get(self.status)
 
     def _get_termination(self, side):
-        for ct in self.terminations.unrestricted():
+        for ct in self.terminations.all():
             if ct.term_side == side:
                 return ct
         return None
@@ -336,7 +336,7 @@ class CircuitTermination(CableTermination):
     def get_peer_termination(self):
         peer_side = 'Z' if self.term_side == 'A' else 'A'
         try:
-            return CircuitTermination.objects.unrestricted().prefetch_related('site').get(
+            return CircuitTermination.objects.prefetch_related('site').get(
                 circuit=self.circuit,
                 term_side=peer_side
             )
diff --git a/netbox/circuits/signals.py b/netbox/circuits/signals.py
index 071b7af20..86db21400 100644
--- a/netbox/circuits/signals.py
+++ b/netbox/circuits/signals.py
@@ -10,7 +10,7 @@ def update_circuit(instance, **kwargs):
     """
     When a CircuitTermination has been modified, update the last_updated time of its parent Circuit.
     """
-    circuits = Circuit.objects.unrestricted().filter(pk=instance.circuit_id)
+    circuits = Circuit.objects.filter(pk=instance.circuit_id)
     time = timezone.now()
     for circuit in circuits:
         circuit.last_updated = time
diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index 05a0febc7..56cdc7874 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -51,7 +51,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
         """
         Test retrieval of Graphs assigned to Providers.
         """
-        provider = self.model.objects.unrestricted().first()
+        provider = self.model.objects.first()
         ct = ContentType.objects.get(app_label='circuits', model='provider')
         graphs = (
             Graph(type=ct, name='Graph 1', source='http://example.com/graphs.py?provider={{ obj.slug }}&foo=1'),
diff --git a/netbox/circuits/tests/test_filters.py b/netbox/circuits/tests/test_filters.py
index 55025c043..9756c320b 100644
--- a/netbox/circuits/tests/test_filters.py
+++ b/netbox/circuits/tests/test_filters.py
@@ -8,7 +8,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class ProviderTestCase(TestCase):
-    queryset = Provider.objects.unrestricted()
+    queryset = Provider.objects.all()
     filterset = ProviderFilterSet
 
     @classmethod
@@ -75,14 +75,14 @@ class ProviderTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
@@ -90,7 +90,7 @@ class ProviderTestCase(TestCase):
 
 
 class CircuitTypeTestCase(TestCase):
-    queryset = CircuitType.objects.unrestricted()
+    queryset = CircuitType.objects.all()
     filterset = CircuitTypeFilterSet
 
     @classmethod
@@ -116,7 +116,7 @@ class CircuitTypeTestCase(TestCase):
 
 
 class CircuitTestCase(TestCase):
-    queryset = Circuit.objects.unrestricted()
+    queryset = Circuit.objects.all()
     filterset = CircuitFilterSet
 
     @classmethod
@@ -199,14 +199,14 @@ class CircuitTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_provider(self):
-        provider = Provider.objects.unrestricted().first()
+        provider = Provider.objects.first()
         params = {'provider_id': [provider.pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'provider': [provider.slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_type(self):
-        circuit_type = CircuitType.objects.unrestricted().first()
+        circuit_type = CircuitType.objects.first()
         params = {'type_id': [circuit_type.pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'type': [circuit_type.slug]}
@@ -217,28 +217,28 @@ class CircuitTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -246,7 +246,7 @@ class CircuitTestCase(TestCase):
 
 
 class CircuitTerminationTestCase(TestCase):
-    queryset = CircuitTermination.objects.unrestricted()
+    queryset = CircuitTermination.objects.all()
     filterset = CircuitTerminationFilterSet
 
     @classmethod
@@ -303,12 +303,12 @@ class CircuitTerminationTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_circuit_id(self):
-        circuits = Circuit.objects.unrestricted()[:2]
+        circuits = Circuit.objects.all()[:2]
         params = {'circuit_id': [circuits[0].pk, circuits[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py
index df90a3671..4d02ef011 100644
--- a/netbox/circuits/views.py
+++ b/netbox/circuits/views.py
@@ -120,8 +120,7 @@ class CircuitTypeBulkDeleteView(BulkDeleteView):
 
 class CircuitListView(ObjectListView):
     queryset = Circuit.objects.prefetch_related(
-        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
-        'provider', 'type', 'tenant'
+        'provider', 'type', 'tenant', 'terminations'
     ).annotate_sites()
     filterset = filters.CircuitFilterSet
     filterset_form = forms.CircuitFilterForm
@@ -175,8 +174,7 @@ class CircuitBulkImportView(BulkImportView):
 
 class CircuitBulkEditView(BulkEditView):
     queryset = Circuit.objects.prefetch_related(
-        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
-        'provider', 'type', 'tenant'
+        'provider', 'type', 'tenant', 'terminations'
     )
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
@@ -185,8 +183,7 @@ class CircuitBulkEditView(BulkEditView):
 
 class CircuitBulkDeleteView(BulkDeleteView):
     queryset = Circuit.objects.prefetch_related(
-        Prefetch('terminations', CircuitTermination.objects.unrestricted()),
-        'provider', 'type', 'tenant'
+        'provider', 'type', 'tenant', 'terminations'
     )
     filterset = filters.CircuitFilterSet
     table = tables.CircuitTable
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 112569c07..038907b97 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -682,7 +682,7 @@ class ConnectedDeviceViewSet(ViewSet):
 
         # Determine local interface from peer interface's connection
         peer_interface = get_object_or_404(
-            Interface.objects.unrestricted(),
+            Interface.objects.all(),
             device__name=peer_device_name,
             name=peer_interface_name
         )
diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index fa0af7228..4168a19ff 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -62,12 +62,12 @@ __all__ = (
 
 class RegionFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         label='Parent region (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         to_field_name='slug',
         label='Parent region (slug)',
     )
@@ -87,13 +87,13 @@ class SiteFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         null_value=None
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='region',
         lookup_expr='in',
         to_field_name='slug',
@@ -131,35 +131,35 @@ class SiteFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
 
 class RackGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         label='Rack group (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         to_field_name='slug',
         label='Rack group (slug)',
     )
@@ -182,36 +182,36 @@ class RackFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='group',
         lookup_expr='in',
         to_field_name='slug',
@@ -222,12 +222,12 @@ class RackFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         null_value=None
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RackRole.objects.unrestricted(),
+        queryset=RackRole.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=RackRole.objects.unrestricted(),
+        queryset=RackRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -261,28 +261,28 @@ class RackReservationFilterSet(BaseFilterSet, TenancyFilterSet):
         label='Search',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Rack.objects.unrestricted(),
+        queryset=Rack.objects.all(),
         label='Rack (ID)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='rack__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='rack__group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='rack__group',
         lookup_expr='in',
         to_field_name='slug',
@@ -328,12 +328,12 @@ class DeviceTypeFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFil
         label='Search',
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -410,7 +410,7 @@ class DeviceTypeFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFil
 
 class DeviceTypeComponentFilterSet(NameSlugSearchFilterSet):
     devicetype_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceType.objects.unrestricted(),
+        queryset=DeviceType.objects.all(),
         field_name='device_type_id',
         label='Device type (ID)',
     )
@@ -482,12 +482,12 @@ class DeviceRoleFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
 class PlatformFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -510,81 +510,81 @@ class DeviceFilterSet(
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__manufacturer',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__manufacturer__slug',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
     device_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceType.objects.unrestricted(),
+        queryset=DeviceType.objects.all(),
         label='Device type (ID)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role_id',
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='device_role__slug',
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         label='Platform (ID)',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platform__slug',
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         to_field_name='slug',
         label='Platform (slug)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     rack_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='rack__group',
         lookup_expr='in',
         label='Rack group (ID)',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack',
-        queryset=Rack.objects.unrestricted(),
+        queryset=Rack.objects.all(),
         label='Rack (ID)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Cluster.objects.unrestricted(),
+        queryset=Cluster.objects.all(),
         label='VM cluster (ID)',
     )
     model = django_filters.ModelMultipleChoiceFilter(
         field_name='device_type__slug',
-        queryset=DeviceType.objects.unrestricted(),
+        queryset=DeviceType.objects.all(),
         to_field_name='slug',
         label='Device model (slug)',
     )
@@ -609,7 +609,7 @@ class DeviceFilterSet(
     )
     virtual_chassis_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_chassis',
-        queryset=VirtualChassis.objects.unrestricted(),
+        queryset=VirtualChassis.objects.all(),
         label='Virtual chassis (ID)',
     )
     virtual_chassis_member = django_filters.BooleanFilter(
@@ -707,13 +707,13 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='device__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='device__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -721,22 +721,22 @@ class DeviceComponentFilterSet(django_filters.FilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         to_field_name='name',
         label='Device (name)',
     )
@@ -844,7 +844,7 @@ class InterfaceFilterSet(BaseFilterSet, DeviceComponentFilterSet):
     )
     lag_id = django_filters.ModelMultipleChoiceFilter(
         field_name='lag',
-        queryset=Interface.objects.unrestricted(),
+        queryset=Interface.objects.all(),
         label='LAG interface (ID)',
     )
     mac_address = MultiValueMACAddressFilter()
@@ -951,13 +951,13 @@ class InventoryItemFilterSet(BaseFilterSet, DeviceComponentFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='device__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='device__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -965,35 +965,35 @@ class InventoryItemFilterSet(BaseFilterSet, DeviceComponentFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='device__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     device_id = django_filters.ModelChoiceFilter(
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         label='Device (ID)',
     )
     device = django_filters.ModelChoiceFilter(
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         to_field_name='name',
         label='Device (name)',
     )
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=InventoryItem.objects.unrestricted(),
+        queryset=InventoryItem.objects.all(),
         label='Parent inventory item (ID)',
     )
     manufacturer_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         label='Manufacturer (ID)',
     )
     manufacturer = django_filters.ModelMultipleChoiceFilter(
         field_name='manufacturer__slug',
-        queryset=Manufacturer.objects.unrestricted(),
+        queryset=Manufacturer.objects.all(),
         to_field_name='slug',
         label='Manufacturer (slug)',
     )
@@ -1024,13 +1024,13 @@ class VirtualChassisFilterSet(BaseFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='master__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='master__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -1038,23 +1038,23 @@ class VirtualChassisFilterSet(BaseFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='master__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='master__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
         field_name='master__tenant',
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
         field_name='master__tenant__slug',
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         to_field_name='slug',
         label='Tenant (slug)',
     )
@@ -1240,30 +1240,30 @@ class PowerPanelFilterSet(BaseFilterSet):
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     rack_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=RackGroup.objects.unrestricted(),
+        queryset=RackGroup.objects.all(),
         field_name='rack_group',
         lookup_expr='in',
         label='Rack group (ID)',
@@ -1289,13 +1289,13 @@ class PowerFeedFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='power_panel__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='power_panel__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -1303,22 +1303,22 @@ class PowerFeedFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='power_panel__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='power_panel__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site name (slug)',
     )
     power_panel_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=PowerPanel.objects.unrestricted(),
+        queryset=PowerPanel.objects.all(),
         label='Power panel (ID)',
     )
     rack_id = django_filters.ModelMultipleChoiceFilter(
         field_name='rack',
-        queryset=Rack.objects.unrestricted(),
+        queryset=Rack.objects.all(),
         label='Rack (ID)',
     )
     tag = TagFilter()
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 7fb6d3a4b..3deea8140 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -581,7 +581,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         if self.pk:
             # Validate that Rack is tall enough to house the installed Devices
-            top_device = Device.objects.unrestricted().filter(
+            top_device = Device.objects.filter(
                 rack=self
             ).exclude(
                 position__isnull=True
@@ -606,13 +606,13 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         # Record the original site assignment for this rack.
         _site_id = None
         if self.pk:
-            _site_id = Rack.objects.unrestricted().get(pk=self.pk).site_id
+            _site_id = Rack.objects.get(pk=self.pk).site_id
 
         super().save(*args, **kwargs)
 
         # Update racked devices if the assigned Site has been changed.
         if _site_id is not None and self.site_id != _site_id:
-            devices = Device.objects.unrestricted().filter(rack=self)
+            devices = Device.objects.filter(rack=self)
             for device in devices:
                 device.site = self.site
                 device.save()
@@ -674,7 +674,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         # Add devices to rack units list
         if self.pk:
-            queryset = Device.objects.unrestricted().prefetch_related(
+            queryset = Device.objects.prefetch_related(
                 'device_type',
                 'device_type__manufacturer',
                 'device_role'
@@ -712,7 +712,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         :param exclude: List of devices IDs to exclude (useful when moving a device within a rack)
         """
         # Gather all devices which consume U space within the rack
-        devices = self.devices.unrestricted().prefetch_related('device_type').filter(position__gte=1)
+        devices = self.devices.prefetch_related('device_type').filter(position__gte=1)
         if exclude is not None:
             devices = devices.exclude(pk__in=exclude)
 
@@ -742,7 +742,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         Return a dictionary mapping all reserved units within the rack to their reservation.
         """
         reserved_units = {}
-        for r in self.reservations.unrestricted():
+        for r in self.reservations.all():
             for u in r.units:
                 reserved_units[u] = r
         return reserved_units
@@ -796,7 +796,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         """
         Determine the utilization rate of power in the rack and return it as a percentage.
         """
-        power_stats = PowerFeed.objects.unrestricted().filter(
+        power_stats = PowerFeed.objects.filter(
             rack=self
         ).annotate(
             allocated_draw_total=Sum('connected_endpoint__poweroutlets__connected_endpoint__allocated_draw'),
@@ -1130,7 +1130,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
         # room to expand within their racks. This validation will impose a very high performance penalty when there are
         # many instances to check, but increasing the u_height of a DeviceType should be a very rare occurrence.
         if self.pk and self.u_height > self._original_u_height:
-            for d in Device.objects.unrestricted().filter(device_type=self, position__isnull=False):
+            for d in Device.objects.filter(device_type=self, position__isnull=False):
                 face_required = None if self.is_full_depth else d.face
                 u_available = d.rack.get_available_units(
                     u_height=self.u_height,
@@ -1145,7 +1145,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
 
         # If modifying the height of an existing DeviceType to 0U, check for any instances assigned to a rack position.
         elif self.pk and self._original_u_height > 0 and self.u_height == 0:
-            racked_instance_count = Device.objects.unrestricted().filter(
+            racked_instance_count = Device.objects.filter(
                 device_type=self,
                 position__isnull=False
             ).count()
@@ -1501,7 +1501,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # 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 Device.objects.unrestricted().exclude(pk=self.pk).filter(
+            if Device.objects.exclude(pk=self.pk).filter(
                     name=self.name,
                     site=self.site,
                     tenant__isnull=True
@@ -1635,32 +1635,32 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # If this is a new Device, instantiate all of the related components per the DeviceType definition
         if is_new:
             ConsolePort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleporttemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.consoleporttemplates.all()]
             )
             ConsoleServerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleserverporttemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.consoleserverporttemplates.all()]
             )
             PowerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.powerporttemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.powerporttemplates.all()]
             )
             PowerOutlet.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.poweroutlettemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.poweroutlettemplates.all()]
             )
             Interface.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.interfacetemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.interfacetemplates.all()]
             )
             RearPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.rearporttemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.rearporttemplates.all()]
             )
             FrontPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.frontporttemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.frontporttemplates.all()]
             )
             DeviceBay.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.devicebaytemplates.unrestricted()]
+                [x.instantiate(self) for x in self.device_type.devicebaytemplates.all()]
             )
 
         # Update Site and Rack assignment for any child Devices
-        devices = Device.objects.unrestricted().filter(parent_bay__device=self)
+        devices = Device.objects.filter(parent_bay__device=self)
         for device in devices:
             device.site = self.site
             device.rack = self.rack
@@ -1730,7 +1730,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         filter = Q(device=self)
         if self.virtual_chassis and self.virtual_chassis.master == self:
             filter |= Q(device__virtual_chassis=self.virtual_chassis, mgmt_only=False)
-        return Interface.objects.unrestricted().filter(filter)
+        return Interface.objects.filter(filter)
 
     def get_cables(self, pk_list=False):
         """
@@ -1751,7 +1751,7 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         """
         Return the set of child Devices installed in DeviceBays within this Device.
         """
-        return Device.objects.unrestricted().filter(parent_bay__device=self.pk)
+        return Device.objects.filter(parent_bay__device=self.pk)
 
     def get_status_class(self):
         return self.STATUS_CLASS_MAP.get(self.status)
@@ -1808,7 +1808,7 @@ class VirtualChassis(ChangeLoggedModel):
     def delete(self, *args, **kwargs):
 
         # Check for LAG interfaces split across member chassis
-        interfaces = Interface.objects.unrestricted().filter(
+        interfaces = Interface.objects.filter(
             device__in=self.members.all(),
             lag__isnull=False
         ).exclude(
@@ -2183,7 +2183,7 @@ class Cable(ChangeLoggedModel):
         if not hasattr(self, 'termination_a_type'):
             raise ValidationError('Termination A type has not been specified')
         try:
-            self.termination_a_type.model_class().objects.unrestricted().get(pk=self.termination_a_id)
+            self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
         except ObjectDoesNotExist:
             raise ValidationError({
                 'termination_a': 'Invalid ID for type {}'.format(self.termination_a_type)
@@ -2193,7 +2193,7 @@ class Cable(ChangeLoggedModel):
         if not hasattr(self, 'termination_b_type'):
             raise ValidationError('Termination B type has not been specified')
         try:
-            self.termination_b_type.model_class().objects.unrestricted().get(pk=self.termination_b_id)
+            self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
         except ObjectDoesNotExist:
             raise ValidationError({
                 'termination_b': 'Invalid ID for type {}'.format(self.termination_b_type)
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index 264102fbe..b6788eabe 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -38,11 +38,11 @@ class Mixins:
             """
             Test tracing a device component's attached cable.
             """
-            obj = self.model.objects.unrestricted().first()
+            obj = self.model.objects.first()
             peer_device = Device.objects.create(
-                site=Site.objects.unrestricted().first(),
-                device_type=DeviceType.objects.unrestricted().first(),
-                device_role=DeviceRole.objects.unrestricted().first(),
+                site=Site.objects.first(),
+                device_type=DeviceType.objects.first(),
+                device_role=DeviceRole.objects.first(),
                 name='Peer Device'
             )
             if self.peer_termination_type is None:
@@ -146,7 +146,7 @@ class SiteTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_site')
-        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.unrestricted().unrestricted().first().pk})
+        url = reverse('dcim-api:site-graphs', kwargs={'pk': Site.objects.first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -285,7 +285,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         """
         GET a single rack elevation.
         """
-        rack = Rack.objects.unrestricted().first()
+        rack = Rack.objects.first()
         self.add_permissions('dcim.view_rack')
         url = reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk})
 
@@ -305,7 +305,7 @@ class RackTest(APIViewTestCases.APIViewTestCase):
         """
         GET a single rack elevation in SVG format.
         """
-        rack = Rack.objects.unrestricted().first()
+        rack = Rack.objects.first()
         self.add_permissions('dcim.view_rack')
         url = '{}?render=svg'.format(reverse('dcim-api:rack-elevation', kwargs={'pk': rack.pk}))
 
@@ -916,7 +916,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_device')
-        url = reverse('dcim-api:device-graphs', kwargs={'pk': Device.objects.unrestricted().first().pk})
+        url = reverse('dcim-api:device-graphs', kwargs={'pk': Device.objects.first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -946,7 +946,7 @@ class DeviceTest(APIViewTestCases.APIViewTestCase):
         """
         Check that creating a device with a duplicate name within a site fails.
         """
-        device = Device.objects.unrestricted().first()
+        device = Device.objects.first()
         data = {
             'device_type': device.device_type.pk,
             'device_role': device.device_role.pk,
@@ -1173,7 +1173,7 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase
         Graph.objects.bulk_create(graphs)
 
         self.add_permissions('dcim.view_interface')
-        url = reverse('dcim-api:interface-graphs', kwargs={'pk': Interface.objects.unrestricted().first().pk})
+        url = reverse('dcim-api:interface-graphs', kwargs={'pk': Interface.objects.first().pk})
         response = self.client.get(url, **self.header)
 
         self.assertEqual(len(response.data), 3)
@@ -1483,11 +1483,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.unrestricted().count(), 1)
+        self.assertEqual(Cable.objects.count(), 1)
 
-        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
-        consoleport1 = ConsolePort.objects.unrestricted().get(pk=consoleport1.pk)
-        consoleserverport1 = ConsoleServerPort.objects.unrestricted().get(pk=consoleserverport1.pk)
+        cable = Cable.objects.get(pk=response.data['id'])
+        consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk)
+        consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk)
 
         self.assertEqual(cable.termination_a, consoleport1)
         self.assertEqual(cable.termination_b, consoleserverport1)
@@ -1548,12 +1548,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+            cable = Cable.objects.get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        consoleport1 = ConsolePort.objects.unrestricted().get(pk=consoleport1.pk)
-        consoleserverport1 = ConsoleServerPort.objects.unrestricted().get(pk=consoleserverport1.pk)
+        consoleport1 = ConsolePort.objects.get(pk=consoleport1.pk)
+        consoleserverport1 = ConsoleServerPort.objects.get(pk=consoleserverport1.pk)
         self.assertEqual(consoleport1.connected_endpoint, consoleserverport1)
         self.assertEqual(consoleserverport1.connected_endpoint, consoleport1)
 
@@ -1578,11 +1578,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.unrestricted().count(), 1)
+        self.assertEqual(Cable.objects.count(), 1)
 
-        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
-        powerport1 = PowerPort.objects.unrestricted().get(pk=powerport1.pk)
-        poweroutlet1 = PowerOutlet.objects.unrestricted().get(pk=poweroutlet1.pk)
+        cable = Cable.objects.get(pk=response.data['id'])
+        powerport1 = PowerPort.objects.get(pk=powerport1.pk)
+        poweroutlet1 = PowerOutlet.objects.get(pk=poweroutlet1.pk)
 
         self.assertEqual(cable.termination_a, powerport1)
         self.assertEqual(cable.termination_b, poweroutlet1)
@@ -1614,11 +1614,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.unrestricted().count(), 1)
+        self.assertEqual(Cable.objects.count(), 1)
 
-        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
-        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
-        interface2 = Interface.objects.unrestricted().get(pk=interface2.pk)
+        cable = Cable.objects.get(pk=response.data['id'])
+        interface1 = Interface.objects.get(pk=interface1.pk)
+        interface2 = Interface.objects.get(pk=interface2.pk)
 
         self.assertEqual(cable.termination_a, interface1)
         self.assertEqual(cable.termination_b, interface2)
@@ -1679,12 +1679,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+            cable = Cable.objects.get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
-        interface2 = Interface.objects.unrestricted().get(pk=interface2.pk)
+        interface1 = Interface.objects.get(pk=interface1.pk)
+        interface2 = Interface.objects.get(pk=interface2.pk)
         self.assertEqual(interface1.connected_endpoint, interface2)
         self.assertEqual(interface2.connected_endpoint, interface1)
 
@@ -1718,11 +1718,11 @@ class ConnectionTest(APITestCase):
         response = self.client.post(url, data, format='json', **self.header)
 
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
-        self.assertEqual(Cable.objects.unrestricted().count(), 1)
+        self.assertEqual(Cable.objects.count(), 1)
 
-        cable = Cable.objects.unrestricted().get(pk=response.data['id'])
-        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
-        circuittermination1 = CircuitTermination.objects.unrestricted().get(pk=circuittermination1.pk)
+        cable = Cable.objects.get(pk=response.data['id'])
+        interface1 = Interface.objects.get(pk=interface1.pk)
+        circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk)
 
         self.assertEqual(cable.termination_a, interface1)
         self.assertEqual(cable.termination_b, circuittermination1)
@@ -1792,12 +1792,12 @@ class ConnectionTest(APITestCase):
             response = self.client.post(url, data, format='json', **self.header)
             self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
-            cable = Cable.objects.unrestricted().get(pk=response.data['id'])
+            cable = Cable.objects.get(pk=response.data['id'])
             self.assertEqual(cable.termination_a.cable, cable)
             self.assertEqual(cable.termination_b.cable, cable)
 
-        interface1 = Interface.objects.unrestricted().get(pk=interface1.pk)
-        circuittermination1 = CircuitTermination.objects.unrestricted().get(pk=circuittermination1.pk)
+        interface1 = Interface.objects.get(pk=interface1.pk)
+        circuittermination1 = CircuitTermination.objects.get(pk=circuittermination1.pk)
         self.assertEqual(interface1.connected_endpoint, circuittermination1)
         self.assertEqual(circuittermination1.connected_endpoint, interface1)
 
@@ -1888,12 +1888,12 @@ class VirtualChassisTest(APIViewTestCases.APIViewTestCase):
             VirtualChassis(name='Virtual Chassis 3', master=devices[6], domain='domain-3'),
         )
         VirtualChassis.objects.bulk_create(virtual_chassis)
-        Device.objects.unrestricted().filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
-        Device.objects.unrestricted().filter(pk=devices[2].pk).update(virtual_chassis=virtual_chassis[0], vc_position=3)
-        Device.objects.unrestricted().filter(pk=devices[4].pk).update(virtual_chassis=virtual_chassis[1], vc_position=2)
-        Device.objects.unrestricted().filter(pk=devices[5].pk).update(virtual_chassis=virtual_chassis[1], vc_position=3)
-        Device.objects.unrestricted().filter(pk=devices[7].pk).update(virtual_chassis=virtual_chassis[2], vc_position=2)
-        Device.objects.unrestricted().filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
+        Device.objects.filter(pk=devices[1].pk).update(virtual_chassis=virtual_chassis[0], vc_position=2)
+        Device.objects.filter(pk=devices[2].pk).update(virtual_chassis=virtual_chassis[0], vc_position=3)
+        Device.objects.filter(pk=devices[4].pk).update(virtual_chassis=virtual_chassis[1], vc_position=2)
+        Device.objects.filter(pk=devices[5].pk).update(virtual_chassis=virtual_chassis[1], vc_position=3)
+        Device.objects.filter(pk=devices[7].pk).update(virtual_chassis=virtual_chassis[2], vc_position=2)
+        Device.objects.filter(pk=devices[8].pk).update(virtual_chassis=virtual_chassis[2], vc_position=3)
 
         cls.update_data = {
             'name': 'Virtual Chassis X',
diff --git a/netbox/dcim/tests/test_filters.py b/netbox/dcim/tests/test_filters.py
index 2418273ba..d4504d586 100644
--- a/netbox/dcim/tests/test_filters.py
+++ b/netbox/dcim/tests/test_filters.py
@@ -16,7 +16,7 @@ from virtualization.models import Cluster, ClusterType
 
 
 class RegionTestCase(TestCase):
-    queryset = Region.objects.unrestricted()
+    queryset = Region.objects.all()
     filterset = RegionFilterSet
 
     @classmethod
@@ -66,7 +66,7 @@ class RegionTestCase(TestCase):
 
 
 class SiteTestCase(TestCase):
-    queryset = Site.objects.unrestricted()
+    queryset = Site.objects.all()
     filterset = SiteFilterSet
 
     @classmethod
@@ -147,21 +147,21 @@ class SiteTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -169,7 +169,7 @@ class SiteTestCase(TestCase):
 
 
 class RackGroupTestCase(TestCase):
-    queryset = RackGroup.objects.unrestricted()
+    queryset = RackGroup.objects.all()
     filterset = RackGroupFilterSet
 
     @classmethod
@@ -223,14 +223,14 @@ class RackGroupTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -245,7 +245,7 @@ class RackGroupTestCase(TestCase):
 
 
 class RackRoleTestCase(TestCase):
-    queryset = RackRole.objects.unrestricted()
+    queryset = RackRole.objects.all()
     filterset = RackRoleFilterSet
 
     @classmethod
@@ -276,7 +276,7 @@ class RackRoleTestCase(TestCase):
 
 
 class RackTestCase(TestCase):
-    queryset = Rack.objects.unrestricted()
+    queryset = Rack.objects.all()
     filterset = RackFilterSet
 
     @classmethod
@@ -384,21 +384,21 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = RackGroup.objects.unrestricted()[:2]
+        groups = RackGroup.objects.all()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
@@ -409,7 +409,7 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = RackRole.objects.unrestricted()[:2]
+        roles = RackRole.objects.all()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -422,14 +422,14 @@ class RackTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -437,7 +437,7 @@ class RackTestCase(TestCase):
 
 
 class RackReservationTestCase(TestCase):
-    queryset = RackReservation.objects.unrestricted()
+    queryset = RackReservation.objects.all()
     filterset = RackReservationFilterSet
 
     @classmethod
@@ -499,14 +499,14 @@ class RackReservationTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = RackGroup.objects.unrestricted()[:2]
+        groups = RackGroup.objects.all()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
@@ -521,14 +521,14 @@ class RackReservationTestCase(TestCase):
         # self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -536,7 +536,7 @@ class RackReservationTestCase(TestCase):
 
 
 class ManufacturerTestCase(TestCase):
-    queryset = Manufacturer.objects.unrestricted()
+    queryset = Manufacturer.objects.all()
     filterset = ManufacturerFilterSet
 
     @classmethod
@@ -567,7 +567,7 @@ class ManufacturerTestCase(TestCase):
 
 
 class DeviceTypeTestCase(TestCase):
-    queryset = DeviceType.objects.unrestricted()
+    queryset = DeviceType.objects.all()
     filterset = DeviceTypeFilterSet
 
     @classmethod
@@ -653,7 +653,7 @@ class DeviceTypeTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.unrestricted()[:2]
+        manufacturers = Manufacturer.objects.all()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -703,7 +703,7 @@ class DeviceTypeTestCase(TestCase):
 
 
 class ConsolePortTemplateTestCase(TestCase):
-    queryset = ConsolePortTemplate.objects.unrestricted()
+    queryset = ConsolePortTemplate.objects.all()
     filterset = ConsolePortTemplateFilterSet
 
     @classmethod
@@ -733,13 +733,13 @@ class ConsolePortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class ConsoleServerPortTemplateTestCase(TestCase):
-    queryset = ConsoleServerPortTemplate.objects.unrestricted()
+    queryset = ConsoleServerPortTemplate.objects.all()
     filterset = ConsoleServerPortTemplateFilterSet
 
     @classmethod
@@ -769,13 +769,13 @@ class ConsoleServerPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class PowerPortTemplateTestCase(TestCase):
-    queryset = PowerPortTemplate.objects.unrestricted()
+    queryset = PowerPortTemplate.objects.all()
     filterset = PowerPortTemplateFilterSet
 
     @classmethod
@@ -805,7 +805,7 @@ class PowerPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -819,7 +819,7 @@ class PowerPortTemplateTestCase(TestCase):
 
 
 class PowerOutletTemplateTestCase(TestCase):
-    queryset = PowerOutletTemplate.objects.unrestricted()
+    queryset = PowerOutletTemplate.objects.all()
     filterset = PowerOutletTemplateFilterSet
 
     @classmethod
@@ -849,7 +849,7 @@ class PowerOutletTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -860,7 +860,7 @@ class PowerOutletTemplateTestCase(TestCase):
 
 
 class InterfaceTemplateTestCase(TestCase):
-    queryset = InterfaceTemplate.objects.unrestricted()
+    queryset = InterfaceTemplate.objects.all()
     filterset = InterfaceTemplateFilterSet
 
     @classmethod
@@ -890,7 +890,7 @@ class InterfaceTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -907,7 +907,7 @@ class InterfaceTemplateTestCase(TestCase):
 
 
 class FrontPortTemplateTestCase(TestCase):
-    queryset = FrontPortTemplate.objects.unrestricted()
+    queryset = FrontPortTemplate.objects.all()
     filterset = FrontPortTemplateFilterSet
 
     @classmethod
@@ -944,7 +944,7 @@ class FrontPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -955,7 +955,7 @@ class FrontPortTemplateTestCase(TestCase):
 
 
 class RearPortTemplateTestCase(TestCase):
-    queryset = RearPortTemplate.objects.unrestricted()
+    queryset = RearPortTemplate.objects.all()
     filterset = RearPortTemplateFilterSet
 
     @classmethod
@@ -985,7 +985,7 @@ class RearPortTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -1000,7 +1000,7 @@ class RearPortTemplateTestCase(TestCase):
 
 
 class DeviceBayTemplateTestCase(TestCase):
-    queryset = DeviceBayTemplate.objects.unrestricted()
+    queryset = DeviceBayTemplate.objects.all()
     filterset = DeviceBayTemplateFilterSet
 
     @classmethod
@@ -1030,13 +1030,13 @@ class DeviceBayTemplateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype_id(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'devicetype_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class DeviceRoleTestCase(TestCase):
-    queryset = DeviceRole.objects.unrestricted()
+    queryset = DeviceRole.objects.all()
     filterset = DeviceRoleFilterSet
 
     @classmethod
@@ -1073,7 +1073,7 @@ class DeviceRoleTestCase(TestCase):
 
 
 class PlatformTestCase(TestCase):
-    queryset = Platform.objects.unrestricted()
+    queryset = Platform.objects.all()
     filterset = PlatformFilterSet
 
     @classmethod
@@ -1114,7 +1114,7 @@ class PlatformTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.unrestricted()[:2]
+        manufacturers = Manufacturer.objects.all()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -1122,7 +1122,7 @@ class PlatformTestCase(TestCase):
 
 
 class DeviceTestCase(TestCase):
-    queryset = Device.objects.unrestricted()
+    queryset = Device.objects.all()
     filterset = DeviceFilterSet
 
     @classmethod
@@ -1295,57 +1295,57 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.unrestricted()[:2]
+        manufacturers = Manufacturer.objects.all()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicetype(self):
-        device_types = DeviceType.objects.unrestricted()[:2]
+        device_types = DeviceType.objects.all()[:2]
         params = {'device_type_id': [device_types[0].pk, device_types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_devicerole(self):
-        device_roles = DeviceRole.objects.unrestricted()[:2]
+        device_roles = DeviceRole.objects.all()[:2]
         params = {'role_id': [device_roles[0].pk, device_roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [device_roles[0].slug, device_roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.unrestricted()[:2]
+        platforms = Platform.objects.all()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rackgroup(self):
-        rack_groups = RackGroup.objects.unrestricted()[:2]
+        rack_groups = RackGroup.objects.all()[:2]
         params = {'rack_group_id': [rack_groups[0].pk, rack_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack(self):
-        racks = Rack.objects.unrestricted()[:2]
+        racks = Rack.objects.all()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.unrestricted()[:2]
+        clusters = Cluster.objects.all()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
@@ -1380,7 +1380,7 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_virtual_chassis_id(self):
-        params = {'virtual_chassis_id': [VirtualChassis.objects.unrestricted().first().pk]}
+        params = {'virtual_chassis_id': [VirtualChassis.objects.first().pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_chassis_member(self):
@@ -1438,14 +1438,14 @@ class DeviceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -1453,7 +1453,7 @@ class DeviceTestCase(TestCase):
 
 
 class ConsolePortTestCase(TestCase):
-    queryset = ConsolePort.objects.unrestricted()
+    queryset = ConsolePort.objects.all()
     filterset = ConsolePortFilterSet
 
     @classmethod
@@ -1520,21 +1520,21 @@ class ConsolePortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1548,7 +1548,7 @@ class ConsolePortTestCase(TestCase):
 
 
 class ConsoleServerPortTestCase(TestCase):
-    queryset = ConsoleServerPort.objects.unrestricted()
+    queryset = ConsoleServerPort.objects.all()
     filterset = ConsoleServerPortFilterSet
 
     @classmethod
@@ -1615,21 +1615,21 @@ class ConsoleServerPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1643,7 +1643,7 @@ class ConsoleServerPortTestCase(TestCase):
 
 
 class PowerPortTestCase(TestCase):
-    queryset = PowerPort.objects.unrestricted()
+    queryset = PowerPort.objects.all()
     filterset = PowerPortFilterSet
 
     @classmethod
@@ -1718,21 +1718,21 @@ class PowerPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1746,7 +1746,7 @@ class PowerPortTestCase(TestCase):
 
 
 class PowerOutletTestCase(TestCase):
-    queryset = PowerOutlet.objects.unrestricted()
+    queryset = PowerOutlet.objects.all()
     filterset = PowerOutletFilterSet
 
     @classmethod
@@ -1818,21 +1818,21 @@ class PowerOutletTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1846,7 +1846,7 @@ class PowerOutletTestCase(TestCase):
 
 
 class InterfaceTestCase(TestCase):
-    queryset = Interface.objects.unrestricted()
+    queryset = Interface.objects.all()
     filterset = InterfaceFilterSet
 
     @classmethod
@@ -1930,21 +1930,21 @@ class InterfaceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -1972,7 +1972,7 @@ class InterfaceTestCase(TestCase):
 
 
 class FrontPortTestCase(TestCase):
-    queryset = FrontPort.objects.unrestricted()
+    queryset = FrontPort.objects.all()
     filterset = FrontPortFilterSet
 
     @classmethod
@@ -2046,21 +2046,21 @@ class FrontPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2074,7 +2074,7 @@ class FrontPortTestCase(TestCase):
 
 
 class RearPortTestCase(TestCase):
-    queryset = RearPort.objects.unrestricted()
+    queryset = RearPort.objects.all()
     filterset = RearPortFilterSet
 
     @classmethod
@@ -2142,21 +2142,21 @@ class RearPortTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2170,7 +2170,7 @@ class RearPortTestCase(TestCase):
 
 
 class DeviceBayTestCase(TestCase):
-    queryset = DeviceBay.objects.unrestricted()
+    queryset = DeviceBay.objects.all()
     filterset = DeviceBayFilterSet
 
     @classmethod
@@ -2220,21 +2220,21 @@ class DeviceBayTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
@@ -2242,7 +2242,7 @@ class DeviceBayTestCase(TestCase):
 
 
 class InventoryItemTestCase(TestCase):
-    queryset = InventoryItem.objects.unrestricted()
+    queryset = InventoryItem.objects.all()
     filterset = InventoryItemFilterSet
 
     @classmethod
@@ -2318,14 +2318,14 @@ class InventoryItemTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -2333,7 +2333,7 @@ class InventoryItemTestCase(TestCase):
 
     def test_device(self):
         # TODO: Allow multiple values
-        device = Device.objects.unrestricted().first()
+        device = Device.objects.first()
         params = {'device_id': device.pk}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': device.name}
@@ -2345,7 +2345,7 @@ class InventoryItemTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_manufacturer(self):
-        manufacturers = Manufacturer.objects.unrestricted()[:2]
+        manufacturers = Manufacturer.objects.all()[:2]
         params = {'manufacturer_id': [manufacturers[0].pk, manufacturers[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'manufacturer': [manufacturers[0].slug, manufacturers[1].slug]}
@@ -2359,7 +2359,7 @@ class InventoryItemTestCase(TestCase):
 
 
 class VirtualChassisTestCase(TestCase):
-    queryset = VirtualChassis.objects.unrestricted()
+    queryset = VirtualChassis.objects.all()
     filterset = VirtualChassisFilterSet
 
     @classmethod
@@ -2414,14 +2414,14 @@ class VirtualChassisTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -2429,7 +2429,7 @@ class VirtualChassisTestCase(TestCase):
 
 
 class CableTestCase(TestCase):
-    queryset = Cable.objects.unrestricted()
+    queryset = Cable.objects.all()
     filterset = CableFilterSet
 
     @classmethod
@@ -2524,28 +2524,28 @@ class CableTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_rack(self):
-        racks = Rack.objects.unrestricted()[:2]
+        racks = Rack.objects.all()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
         params = {'rack': [racks[0].name, racks[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
 
     def test_site(self):
-        site = Site.objects.unrestricted()[:2]
+        site = Site.objects.all()[:2]
         params = {'site_id': [site[0].pk, site[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
         params = {'site': [site[0].slug, site[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 5)
 
     def test_tenant(self):
-        tenant = Tenant.objects.unrestricted()[:2]
+        tenant = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenant[0].pk, tenant[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenant[0].slug, tenant[1].slug]}
@@ -2553,7 +2553,7 @@ class CableTestCase(TestCase):
 
 
 class PowerPanelTestCase(TestCase):
-    queryset = PowerPanel.objects.unrestricted()
+    queryset = PowerPanel.objects.all()
     filterset = PowerPanelFilterSet
 
     @classmethod
@@ -2598,27 +2598,27 @@ class PowerPanelTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack_group(self):
-        rack_groups = RackGroup.objects.unrestricted()[:2]
+        rack_groups = RackGroup.objects.all()[:2]
         params = {'rack_group_id': [rack_groups[0].pk, rack_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
 
 class PowerFeedTestCase(TestCase):
-    queryset = PowerFeed.objects.unrestricted()
+    queryset = PowerFeed.objects.all()
     filterset = PowerFeedFilterSet
 
     @classmethod
@@ -2698,26 +2698,26 @@ class PowerFeedTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_power_panel_id(self):
-        power_panels = PowerPanel.objects.unrestricted()[:2]
+        power_panels = PowerPanel.objects.all()[:2]
         params = {'power_panel_id': [power_panels[0].pk, power_panels[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_rack_id(self):
-        racks = Rack.objects.unrestricted()[:2]
+        racks = Rack.objects.all()[:2]
         params = {'rack_id': [racks[0].pk, racks[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py
index 8223f2e48..e8962da01 100644
--- a/netbox/extras/filters.py
+++ b/netbox/extras/filters.py
@@ -130,83 +130,83 @@ class ConfigContextFilterSet(BaseFilterSet):
     )
     region_id = django_filters.ModelMultipleChoiceFilter(
         field_name='regions',
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         label='Region',
     )
     region = django_filters.ModelMultipleChoiceFilter(
         field_name='regions__slug',
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='sites',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='sites__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         field_name='roles',
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         label='Role',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='roles__slug',
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
         field_name='platforms',
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         label='Platform',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platforms__slug',
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         to_field_name='slug',
         label='Platform (slug)',
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster_groups',
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         label='Cluster group',
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster_groups__slug',
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         label='Cluster group (slug)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
         field_name='clusters',
-        queryset=Cluster.objects.unrestricted(),
+        queryset=Cluster.objects.all(),
         label='Cluster',
     )
     tenant_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='tenant_groups',
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         label='Tenant group',
     )
     tenant_group = django_filters.ModelMultipleChoiceFilter(
         field_name='tenant_groups__slug',
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         label='Tenant group (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
         field_name='tenants',
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         label='Tenant',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
         field_name='tenants__slug',
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         to_field_name='slug',
         label='Tenant (slug)',
     )
diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index 51c281750..c8be8755f 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -145,7 +145,7 @@ class ObjectChangeMiddleware(object):
         # one or more changes being logged.
         if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
             cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
-            purged_count, _ = ObjectChange.objects.unrestricted().filter(
+            purged_count, _ = ObjectChange.objects.filter(
                 time__lt=cutoff
             ).delete()
 
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index fcfcfefb3..9b6de22c6 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -540,7 +540,7 @@ class ConfigContextModel(models.Model):
 
         # Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
         data = OrderedDict()
-        for context in ConfigContext.objects.unrestricted().get_for_object(self):
+        for context in ConfigContext.objects.get_for_object(self):
             data = deepmerge(data, context.data)
 
         # If the object has local config context data defined, merge it last
diff --git a/netbox/extras/tests/test_filters.py b/netbox/extras/tests/test_filters.py
index aed12cd73..72db138e2 100644
--- a/netbox/extras/tests/test_filters.py
+++ b/netbox/extras/tests/test_filters.py
@@ -11,7 +11,7 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType
 
 
 class GraphTestCase(TestCase):
-    queryset = Graph.objects.unrestricted()
+    queryset = Graph.objects.all()
     filterset = GraphFilterSet
 
     @classmethod
@@ -46,7 +46,7 @@ class GraphTestCase(TestCase):
 
 
 class ExportTemplateTestCase(TestCase):
-    queryset = ExportTemplate.objects.unrestricted()
+    queryset = ExportTemplate.objects.all()
     filterset = ExportTemplateFilterSet
 
     @classmethod
@@ -79,7 +79,7 @@ class ExportTemplateTestCase(TestCase):
 
 
 class ConfigContextTestCase(TestCase):
-    queryset = ConfigContext.objects.unrestricted()
+    queryset = ConfigContext.objects.all()
     filterset = ConfigContextFilterSet
 
     @classmethod
@@ -176,54 +176,54 @@ class ConfigContextTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        device_roles = DeviceRole.objects.unrestricted()[:2]
+        device_roles = DeviceRole.objects.all()[:2]
         params = {'role_id': [device_roles[0].pk, device_roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [device_roles[0].slug, device_roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.unrestricted()[:2]
+        platforms = Platform.objects.all()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_group(self):
-        cluster_groups = ClusterGroup.objects.unrestricted()[:2]
+        cluster_groups = ClusterGroup.objects.all()[:2]
         params = {'cluster_group_id': [cluster_groups[0].pk, cluster_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_group': [cluster_groups[0].slug, cluster_groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.unrestricted()[:2]
+        clusters = Cluster.objects.all()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 5e258e46f..8abf2e551 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -276,8 +276,7 @@ class VLANViewSet(CustomFieldModelViewSet):
 
 class ServiceViewSet(ModelViewSet):
     queryset = Service.objects.prefetch_related(
-        Prefetch('ipaddresses', queryset=IPAddress.objects.unrestricted()),
-        'device', 'virtual_machine', 'tags'
+        'device', 'virtual_machine', 'tags', 'ipaddresses'
     )
     serializer_class = serializers.ServiceSerializer
     filterset_class = filters.ServiceFilterSet
diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 5b9042412..0856c9f1c 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -71,12 +71,12 @@ class AggregateFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilt
         label='Prefix',
     )
     rir_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=RIR.objects.unrestricted(),
+        queryset=RIR.objects.all(),
         label='RIR (ID)',
     )
     rir = django_filters.ModelMultipleChoiceFilter(
         field_name='rir__slug',
-        queryset=RIR.objects.unrestricted(),
+        queryset=RIR.objects.all(),
         to_field_name='slug',
         label='RIR (slug)',
     )
@@ -148,40 +148,40 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         label='Mask length',
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VRF.objects.unrestricted(),
+        queryset=VRF.objects.all(),
         label='VRF',
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
-        queryset=VRF.objects.unrestricted(),
+        queryset=VRF.objects.all(),
         to_field_name='rd',
         label='VRF (RD)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     vlan_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VLAN.objects.unrestricted(),
+        queryset=VLAN.objects.all(),
         label='VLAN (ID)',
     )
     vlan_vid = django_filters.NumberFilter(
@@ -189,12 +189,12 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         label='VLAN number (1-4095)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Role.objects.unrestricted(),
+        queryset=Role.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=Role.objects.unrestricted(),
+        queryset=Role.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -290,12 +290,12 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         label='Mask length',
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VRF.objects.unrestricted(),
+        queryset=VRF.objects.all(),
         label='VRF',
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
-        queryset=VRF.objects.unrestricted(),
+        queryset=VRF.objects.all(),
         to_field_name='rd',
         label='VRF (RD)',
     )
@@ -321,24 +321,24 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
     )
     interface = django_filters.ModelMultipleChoiceFilter(
         field_name='interface__name',
-        queryset=Interface.objects.unrestricted(),
+        queryset=Interface.objects.all(),
         to_field_name='name',
         label='Interface (name)',
     )
     interface_id = django_filters.ModelMultipleChoiceFilter(
         field_name='interface',
-        queryset=Interface.objects.unrestricted(),
+        queryset=Interface.objects.all(),
         label='Interface (ID)',
     )
     vminterface = django_filters.ModelMultipleChoiceFilter(
         field_name='vminterface__name',
-        queryset=VMInterface.objects.unrestricted(),
+        queryset=VMInterface.objects.all(),
         to_field_name='name',
         label='VM interface (name)',
     )
     vminterface_id = django_filters.ModelMultipleChoiceFilter(
         field_name='vminterface',
-        queryset=VMInterface.objects.unrestricted(),
+        queryset=VMInterface.objects.all(),
         label='VM interface (ID)',
     )
     assigned_to_interface = django_filters.BooleanFilter(
@@ -390,7 +390,7 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         return queryset.filter(address__net_mask_length=value)
 
     def filter_device(self, queryset, name, value):
-        devices = Device.objects.unrestricted().filter(**{'{}__in'.format(name): value})
+        devices = Device.objects.filter(**{'{}__in'.format(name): value})
         if not devices.exists():
             return queryset.none()
         interface_ids = []
@@ -401,12 +401,12 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
         )
 
     def filter_virtual_machine(self, queryset, name, value):
-        virtual_machines = VirtualMachine.objects.unrestricted().filter(**{'{}__in'.format(name): value})
+        virtual_machines = VirtualMachine.objects.filter(**{'{}__in'.format(name): value})
         if not virtual_machines.exists():
             return queryset.none()
         interface_ids = []
         for vm in virtual_machines:
-            interface_ids.extend(vm.interfaces.unrestricted().values_list('id', flat=True))
+            interface_ids.extend(vm.interfaces.values_list('id', flat=True))
         return queryset.filter(
             vminterface__in=interface_ids
         )
@@ -417,25 +417,25 @@ class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet,
 
 class VLANGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
@@ -451,45 +451,45 @@ class VLANFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Creat
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VLANGroup.objects.unrestricted(),
+        queryset=VLANGroup.objects.all(),
         label='Group (ID)',
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
-        queryset=VLANGroup.objects.unrestricted(),
+        queryset=VLANGroup.objects.all(),
         to_field_name='slug',
         label='Group',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Role.objects.unrestricted(),
+        queryset=Role.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=Role.objects.unrestricted(),
+        queryset=Role.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
@@ -520,22 +520,22 @@ class ServiceFilterSet(BaseFilterSet, CreatedUpdatedFilterSet):
         label='Search',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         to_field_name='name',
         label='Device (name)',
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VirtualMachine.objects.unrestricted(),
+        queryset=VirtualMachine.objects.all(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
-        queryset=VirtualMachine.objects.unrestricted(),
+        queryset=VirtualMachine.objects.all(),
         to_field_name='name',
         label='Virtual machine (name)',
     )
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index 7ccb85d59..b6abe3f2d 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -215,7 +215,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
                 })
 
             # Ensure that the aggregate being added is not covered by an existing aggregate
-            covering_aggregates = Aggregate.objects.unrestricted().filter(
+            covering_aggregates = Aggregate.objects.filter(
                 prefix__net_contains_or_equals=str(self.prefix)
             )
             if self.pk:
@@ -228,7 +228,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
                 })
 
             # Ensure that the aggregate being added does not cover an existing aggregate
-            covered_aggregates = Aggregate.objects.unrestricted().filter(prefix__net_contained=str(self.prefix))
+            covered_aggregates = Aggregate.objects.filter(prefix__net_contained=str(self.prefix))
             if self.pk:
                 covered_aggregates = covered_aggregates.exclude(pk=self.pk)
             if covered_aggregates:
@@ -256,7 +256,7 @@ class Aggregate(ChangeLoggedModel, CustomFieldModel):
         """
         Determine the prefix utilization of the aggregate and return it as a percentage.
         """
-        queryset = Prefix.objects.unrestricted().filter(prefix__net_contained_or_equal=str(self.prefix))
+        queryset = Prefix.objects.filter(prefix__net_contained_or_equal=str(self.prefix))
         child_prefixes = netaddr.IPSet([p.prefix for p in queryset])
         return int(float(child_prefixes.size) / self.prefix.size * 100)
 
@@ -470,7 +470,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         return self.STATUS_CLASS_MAP.get(self.status)
 
     def get_duplicates(self):
-        return Prefix.objects.unrestricted().filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
+        return Prefix.objects.filter(vrf=self.vrf, prefix=str(self.prefix)).exclude(pk=self.pk)
 
     def get_child_prefixes(self):
         """
@@ -478,9 +478,9 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         Prefixes belonging to any VRF.
         """
         if self.vrf is None and self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            return Prefix.objects.unrestricted().filter(prefix__net_contained=str(self.prefix))
+            return Prefix.objects.filter(prefix__net_contained=str(self.prefix))
         else:
-            return Prefix.objects.unrestricted().filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
+            return Prefix.objects.filter(prefix__net_contained=str(self.prefix), vrf=self.vrf)
 
     def get_child_ips(self):
         """
@@ -488,9 +488,9 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         child IPAddresses belonging to any VRF.
         """
         if self.vrf is None and self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            return IPAddress.objects.unrestricted().filter(address__net_host_contained=str(self.prefix))
+            return IPAddress.objects.filter(address__net_host_contained=str(self.prefix))
         else:
-            return IPAddress.objects.unrestricted().filter(address__net_host_contained=str(self.prefix), vrf=self.vrf)
+            return IPAddress.objects.filter(address__net_host_contained=str(self.prefix), vrf=self.vrf)
 
     def get_available_prefixes(self):
         """
@@ -554,7 +554,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
         "container", calculate utilization based on child prefixes. For all others, count child IP addresses.
         """
         if self.status == PrefixStatusChoices.STATUS_CONTAINER:
-            queryset = Prefix.objects.unrestricted().filter(
+            queryset = Prefix.objects.filter(
                 prefix__net_contained=str(self.prefix),
                 vrf=self.vrf
             )
@@ -694,7 +694,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
         return reverse('ipam:ipaddress', args=[self.pk])
 
     def get_duplicates(self):
-        return IPAddress.objects.unrestricted().filter(
+        return IPAddress.objects.filter(
             vrf=self.vrf,
             address__net_host=str(self.address.ip)
         ).exclude(pk=self.pk)
@@ -726,7 +726,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
 
         # Check for primary IP assignment that doesn't match the assigned device/VM
         if self.pk and type(self.assigned_object) is Interface:
-            device = Device.objects.unrestricted().filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
+            device = Device.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if device:
                 if self.assigned_object is None:
                     raise ValidationError({
@@ -738,7 +738,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
                                      f"{self.assigned_object.device} ({self.assigned_object})"
                     })
         elif self.pk and type(self.assigned_object) is VMInterface:
-            vm = VirtualMachine.unrestricted().objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
+            vm = VirtualMachine.objects.filter(Q(primary_ip4=self) | Q(primary_ip6=self)).first()
             if vm:
                 if self.assigned_object is None:
                     raise ValidationError({
@@ -867,7 +867,7 @@ class VLANGroup(ChangeLoggedModel):
         """
         Return the first available VLAN ID (1-4094) in the group.
         """
-        vlan_ids = VLAN.objects.unrestricted().filter(group=self).values_list('vid', flat=True)
+        vlan_ids = VLAN.objects.filter(group=self).values_list('vid', flat=True)
         for i in range(1, 4095):
             if i not in vlan_ids:
                 return i
@@ -994,7 +994,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
 
     def get_members(self):
         # Return all interfaces assigned to this VLAN
-        return Interface.objects.unrestricted().filter(
+        return Interface.objects.filter(
             Q(untagged_vlan_id=self.pk) |
             Q(tagged_vlans=self.pk)
         ).distinct()
diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py
index 213a61fa9..705a7d91a 100644
--- a/netbox/ipam/tests/test_api.py
+++ b/netbox/ipam/tests/test_api.py
@@ -411,7 +411,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase):
         """
         Attempt and fail to delete a VLAN with a Prefix assigned to it.
         """
-        vlan = VLAN.objects.unrestricted().first()
+        vlan = VLAN.objects.first()
         Prefix.objects.create(prefix=IPNetwork('192.0.2.0/24'), vlan=vlan)
 
         self.add_permissions('ipam.delete_vlan')
diff --git a/netbox/ipam/tests/test_filters.py b/netbox/ipam/tests/test_filters.py
index 273fa2083..560313f0a 100644
--- a/netbox/ipam/tests/test_filters.py
+++ b/netbox/ipam/tests/test_filters.py
@@ -9,7 +9,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class VRFTestCase(TestCase):
-    queryset = VRF.objects.unrestricted()
+    queryset = VRF.objects.all()
     filterset = VRFFilterSet
 
     @classmethod
@@ -59,14 +59,14 @@ class VRFTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -74,7 +74,7 @@ class VRFTestCase(TestCase):
 
 
 class RIRTestCase(TestCase):
-    queryset = RIR.objects.unrestricted()
+    queryset = RIR.objects.all()
     filterset = RIRFilterSet
 
     @classmethod
@@ -114,7 +114,7 @@ class RIRTestCase(TestCase):
 
 
 class AggregateTestCase(TestCase):
-    queryset = Aggregate.objects.unrestricted()
+    queryset = Aggregate.objects.all()
     filterset = AggregateFilterSet
 
     @classmethod
@@ -155,7 +155,7 @@ class AggregateTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
 
     def test_rir(self):
-        rirs = RIR.objects.unrestricted()[:2]
+        rirs = RIR.objects.all()[:2]
         params = {'rir_id': [rirs[0].pk, rirs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'rir': [rirs[0].slug, rirs[1].slug]}
@@ -163,7 +163,7 @@ class AggregateTestCase(TestCase):
 
 
 class RoleTestCase(TestCase):
-    queryset = Role.objects.unrestricted()
+    queryset = Role.objects.all()
     filterset = RoleFilterSet
 
     @classmethod
@@ -190,7 +190,7 @@ class RoleTestCase(TestCase):
 
 
 class PrefixTestCase(TestCase):
-    queryset = Prefix.objects.unrestricted()
+    queryset = Prefix.objects.all()
     filterset = PrefixFilterSet
 
     @classmethod
@@ -295,28 +295,28 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vrf(self):
-        vrfs = VRF.objects.unrestricted()[:2]
+        vrfs = VRF.objects.all()[:2]
         params = {'vrf_id': [vrfs[0].pk, vrfs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'vrf': [vrfs[0].rd, vrfs[1].rd]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vlan(self):
-        vlans = VLAN.objects.unrestricted()[:2]
+        vlans = VLAN.objects.all()[:2]
         params = {'vlan_id': [vlans[0].pk, vlans[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         # TODO: Test for multiple values
@@ -324,7 +324,7 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = Role.objects.unrestricted()[:2]
+        roles = Role.objects.all()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -335,14 +335,14 @@ class PrefixTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -350,7 +350,7 @@ class PrefixTestCase(TestCase):
 
 
 class IPAddressTestCase(TestCase):
-    queryset = IPAddress.objects.unrestricted()
+    queryset = IPAddress.objects.all()
     filterset = IPAddressFilterSet
 
     @classmethod
@@ -466,35 +466,35 @@ class IPAddressTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_vrf(self):
-        vrfs = VRF.objects.unrestricted()[:2]
+        vrfs = VRF.objects.all()[:2]
         params = {'vrf_id': [vrfs[0].pk, vrfs[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'vrf': [vrfs[0].rd, vrfs[1].rd]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.unrestricted()[:2]
+        vms = VirtualMachine.objects.all()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_interface(self):
-        interfaces = Interface.objects.unrestricted()[:2]
+        interfaces = Interface.objects.all()[:2]
         params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'interface': ['Interface 1', 'Interface 2']}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_vminterface(self):
-        vminterfaces = VMInterface.objects.unrestricted()[:2]
+        vminterfaces = VMInterface.objects.all()[:2]
         params = {'vminterface_id': [vminterfaces[0].pk, vminterfaces[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'vminterface': ['Interface 1', 'Interface 2']}
@@ -515,14 +515,14 @@ class IPAddressTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -530,7 +530,7 @@ class IPAddressTestCase(TestCase):
 
 
 class VLANGroupTestCase(TestCase):
-    queryset = VLANGroup.objects.unrestricted()
+    queryset = VLANGroup.objects.all()
     filterset = VLANGroupFilterSet
 
     @classmethod
@@ -577,14 +577,14 @@ class VLANGroupTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
@@ -592,7 +592,7 @@ class VLANGroupTestCase(TestCase):
 
 
 class VLANTestCase(TestCase):
-    queryset = VLAN.objects.unrestricted()
+    queryset = VLAN.objects.all()
     filterset = VLANFilterSet
 
     @classmethod
@@ -666,28 +666,28 @@ class VLANTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_group(self):
-        groups = VLANGroup.objects.unrestricted()[:2]
+        groups = VLANGroup.objects.all()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_role(self):
-        roles = Role.objects.unrestricted()[:2]
+        roles = Role.objects.all()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'role': [roles[0].slug, roles[1].slug]}
@@ -698,14 +698,14 @@ class VLANTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -713,7 +713,7 @@ class VLANTestCase(TestCase):
 
 
 class ServiceTestCase(TestCase):
-    queryset = Service.objects.unrestricted()
+    queryset = Service.objects.all()
     filterset = ServiceFilterSet
 
     @classmethod
@@ -768,14 +768,14 @@ class ServiceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.unrestricted()[:2]
+        vms = VirtualMachine.objects.all()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}
diff --git a/netbox/ipam/tests/test_models.py b/netbox/ipam/tests/test_models.py
index 51d1d9684..6091aa70e 100644
--- a/netbox/ipam/tests/test_models.py
+++ b/netbox/ipam/tests/test_models.py
@@ -43,7 +43,7 @@ class TestPrefix(TestCase):
             Prefix(prefix=netaddr.IPNetwork('192.0.2.0/24')),
             Prefix(prefix=netaddr.IPNetwork('192.0.2.0/24')),
         ))
-        duplicate_prefix_pks = [p.pk for p in prefixes[0].get_duplicates().unrestricted()]
+        duplicate_prefix_pks = [p.pk for p in prefixes[0].get_duplicates()]
 
         self.assertSetEqual(set(duplicate_prefix_pks), {prefixes[1].pk, prefixes[2].pk})
 
@@ -227,7 +227,7 @@ class TestIPAddress(TestCase):
             IPAddress(address=netaddr.IPNetwork('192.0.2.1/24')),
             IPAddress(address=netaddr.IPNetwork('192.0.2.1/24')),
         ))
-        duplicate_ip_pks = [p.pk for p in ips[0].get_duplicates().unrestricted()]
+        duplicate_ip_pks = [p.pk for p in ips[0].get_duplicates()]
 
         self.assertSetEqual(set(duplicate_ip_pks), {ips[1].pk, ips[2].pk})
 
diff --git a/netbox/ipam/tests/test_ordering.py b/netbox/ipam/tests/test_ordering.py
index 9427c0cdf..690501e53 100644
--- a/netbox/ipam/tests/test_ordering.py
+++ b/netbox/ipam/tests/test_ordering.py
@@ -86,7 +86,7 @@ class PrefixOrderingTestCase(OrderingTestBase):
         Prefix.objects.bulk_create(prefixes)
 
         # Test
-        self._compare(Prefix.objects.unrestricted(), prefixes)
+        self._compare(Prefix.objects.all(), prefixes)
 
     def test_prefix_complex_ordering(self):
         """
@@ -122,7 +122,7 @@ class PrefixOrderingTestCase(OrderingTestBase):
         Prefix.objects.bulk_create(prefixes)
 
         # Test
-        self._compare(Prefix.objects.unrestricted(), prefixes)
+        self._compare(Prefix.objects.all(), prefixes)
 
 
 class IPAddressOrderingTestCase(OrderingTestBase):
@@ -173,4 +173,4 @@ class IPAddressOrderingTestCase(OrderingTestBase):
         IPAddress.objects.bulk_create(addresses)
 
         # Test
-        self._compare(IPAddress.objects.unrestricted(), addresses)
+        self._compare(IPAddress.objects.all(), addresses)
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 8964004c9..6d0411866 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -729,8 +729,7 @@ class VLANGroupVLANsView(ObjectView):
 
 class VLANListView(ObjectListView):
     queryset = VLAN.objects.prefetch_related(
-        Prefetch('prefixes', Prefix.objects.unrestricted()),
-        'site', 'group', 'tenant', 'role'
+        'site', 'group', 'tenant', 'role', 'prefixes'
     )
     filterset = filters.VLANFilterSet
     filterset_form = forms.VLANFilterForm
@@ -820,9 +819,7 @@ class ServiceListView(ObjectListView):
 
 
 class ServiceView(ObjectView):
-    queryset = Service.objects.prefetch_related(
-        Prefetch('ipaddresses', IPAddress.objects.unrestricted())
-    )
+    queryset = Service.objects.prefetch_related('ipaddresses')
 
     def get(self, request, pk):
 
@@ -834,9 +831,7 @@ class ServiceView(ObjectView):
 
 
 class ServiceEditView(ObjectEditView):
-    queryset = Service.objects.prefetch_related(
-        Prefetch('ipaddresses', IPAddress.objects.unrestricted())
-    )
+    queryset = Service.objects.prefetch_related('ipaddresses')
     model_form = forms.ServiceForm
     template_name = 'ipam/service_edit.html'
 
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 6b58becf0..8971bdb52 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -24,7 +24,7 @@ class ObjectPermissionBackend(ModelBackend):
         Return all permissions granted to the user by an ObjectPermission.
         """
         # Retrieve all assigned and enabled ObjectPermissions
-        object_permissions = ObjectPermission.objects.unrestricted().filter(
+        object_permissions = ObjectPermission.objects.filter(
             Q(users=user_obj) | Q(groups__user=user_obj),
             enabled=True
         ).prefetch_related('object_types')
diff --git a/netbox/secrets/filters.py b/netbox/secrets/filters.py
index fee9b4981..78f25952a 100644
--- a/netbox/secrets/filters.py
+++ b/netbox/secrets/filters.py
@@ -26,22 +26,22 @@ class SecretFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS
         label='Search',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=SecretRole.objects.unrestricted(),
+        queryset=SecretRole.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=SecretRole.objects.unrestricted(),
+        queryset=SecretRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         label='Device (ID)',
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
-        queryset=Device.objects.unrestricted(),
+        queryset=Device.objects.all(),
         to_field_name='name',
         label='Device (name)',
     )
diff --git a/netbox/secrets/tests/test_filters.py b/netbox/secrets/tests/test_filters.py
index a32d22239..b7ac73f1d 100644
--- a/netbox/secrets/tests/test_filters.py
+++ b/netbox/secrets/tests/test_filters.py
@@ -6,7 +6,7 @@ from secrets.models import Secret, SecretRole
 
 
 class SecretRoleTestCase(TestCase):
-    queryset = SecretRole.objects.unrestricted()
+    queryset = SecretRole.objects.all()
     filterset = SecretRoleFilterSet
 
     @classmethod
@@ -33,7 +33,7 @@ class SecretRoleTestCase(TestCase):
 
 
 class SecretTestCase(TestCase):
-    queryset = Secret.objects.unrestricted()
+    queryset = Secret.objects.all()
     filterset = SecretFilterSet
 
     @classmethod
@@ -76,14 +76,14 @@ class SecretTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = SecretRole.objects.unrestricted()[:2]
+        roles = SecretRole.objects.all()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_device(self):
-        devices = Device.objects.unrestricted()[:2]
+        devices = Device.objects.all()[:2]
         params = {'device_id': [devices[0].pk, devices[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'device': [devices[0].name, devices[1].name]}
diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py
index 42137d7ca..af5ee0b2c 100644
--- a/netbox/tenancy/filters.py
+++ b/netbox/tenancy/filters.py
@@ -15,12 +15,12 @@ __all__ = (
 
 class TenantGroupFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         label='Tenant group (ID)',
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         label='Tenant group group (slug)',
     )
@@ -36,13 +36,13 @@ class TenantFilterSet(BaseFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterS
         label='Search',
     )
     group_id = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         field_name='group',
         lookup_expr='in',
         label='Tenant group (ID)',
     )
     group = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         field_name='group',
         lookup_expr='in',
         to_field_name='slug',
@@ -70,24 +70,24 @@ class TenancyFilterSet(django_filters.FilterSet):
     An inheritable FilterSet for models which support Tenant assignment.
     """
     tenant_group_id = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         field_name='tenant__group',
         lookup_expr='in',
         label='Tenant Group (ID)',
     )
     tenant_group = TreeNodeMultipleChoiceFilter(
-        queryset=TenantGroup.objects.unrestricted(),
+        queryset=TenantGroup.objects.all(),
         field_name='tenant__group',
         to_field_name='slug',
         lookup_expr='in',
         label='Tenant Group (slug)',
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         label='Tenant (ID)',
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tenant.objects.unrestricted(),
+        queryset=Tenant.objects.all(),
         field_name='tenant__slug',
         to_field_name='slug',
         label='Tenant (slug)',
diff --git a/netbox/tenancy/tests/test_filters.py b/netbox/tenancy/tests/test_filters.py
index 31540c27b..c78b25083 100644
--- a/netbox/tenancy/tests/test_filters.py
+++ b/netbox/tenancy/tests/test_filters.py
@@ -5,7 +5,7 @@ from tenancy.models import Tenant, TenantGroup
 
 
 class TenantGroupTestCase(TestCase):
-    queryset = TenantGroup.objects.unrestricted()
+    queryset = TenantGroup.objects.all()
     filterset = TenantGroupFilterSet
 
     @classmethod
@@ -52,7 +52,7 @@ class TenantGroupTestCase(TestCase):
 
 
 class TenantTestCase(TestCase):
-    queryset = Tenant.objects.unrestricted()
+    queryset = Tenant.objects.all()
     filterset = TenantFilterSet
 
     @classmethod
@@ -86,7 +86,7 @@ class TenantTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        group = TenantGroup.objects.unrestricted()[:2]
+        group = TenantGroup.objects.all()[:2]
         params = {'group_id': [group[0].pk, group[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [group[0].slug, group[1].slug]}
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 5795eeb7b..2c3963c0a 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -180,7 +180,7 @@ class ActionListFilter(admin.SimpleListFilter):
 
     def lookups(self, request, model_admin):
         options = set()
-        for action_list in ObjectPermission.objects.unrestricted().values_list('actions', flat=True).distinct():
+        for action_list in ObjectPermission.objects.values_list('actions', flat=True).distinct():
             options.update(action_list)
         return [
             (action, action) for action in sorted(options)
@@ -196,7 +196,7 @@ class ObjectTypeListFilter(admin.SimpleListFilter):
     parameter_name = 'object_type'
 
     def lookups(self, request, model_admin):
-        object_types = ObjectPermission.objects.unrestricted().values_list('id', flat=True).distinct()
+        object_types = ObjectPermission.objects.values_list('id', flat=True).distinct()
         content_types = ContentType.objects.filter(pk__in=object_types).order_by('app_label', 'model')
         return [
             (ct.pk, ct) for ct in content_types
@@ -238,7 +238,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     ]
 
     def get_queryset(self, request):
-        return super().get_queryset(request).unrestricted().prefetch_related('object_types', 'users', 'groups')
+        return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
 
     def get_name(self, obj):
         return obj.name or f'Permission #{obj.pk}'
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 56f9f87b4..7c413890b 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -244,8 +244,6 @@ class WritableNestedSerializer(serializers.ModelSerializer):
         if isinstance(data, dict):
             params = dict_to_filter_params(data)
             queryset = self.Meta.model.objects
-            if hasattr(queryset, 'restrict'):
-                queryset = queryset.unrestricted()
             try:
                 return queryset.get(**params)
             except ObjectDoesNotExist:
@@ -274,8 +272,6 @@ class WritableNestedSerializer(serializers.ModelSerializer):
 
         # Look up object by PK
         queryset = self.Meta.model.objects
-        if hasattr(queryset, 'restrict'):
-            queryset = queryset.unrestricted()
         try:
             return queryset.get(pk=int(data))
         except ObjectDoesNotExist:
diff --git a/netbox/utilities/mptt.py b/netbox/utilities/mptt.py
index 25ce01a6c..1bae2053d 100644
--- a/netbox/utilities/mptt.py
+++ b/netbox/utilities/mptt.py
@@ -16,8 +16,4 @@ class TreeManager(Manager.from_queryset(TreeQuerySet), TreeManager_):
     """
     Extend django-mptt's TreeManager to incorporate RestrictedQuerySet().
     """
-    def db_manager(self, using=None, hints=None):
-        manager = super().db_manager(using, hints)
-
-        # Return an unrestricted QuerySet for use by MPTT
-        return manager.unrestricted()
+    pass
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 5a867c04d..e748e7a23 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -1,5 +1,3 @@
-import logging
-
 from django.db.models import Q, QuerySet
 
 from utilities.permissions import permission_is_exempt
@@ -21,44 +19,6 @@ class DummyQuerySet:
 
 class RestrictedQuerySet(QuerySet):
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Initialize the allow_evaluation flag to False. This indicates that the QuerySet has not yet been restricted.
-        self.allow_evaluation = False
-
-    def _check_restriction(self):
-        # Raise a warning if the QuerySet is evaluated without first calling restrict() or unrestricted().
-        if not getattr(self, 'allow_evaluation', False):
-            logger = logging.getLogger('netbox.RestrictedQuerySet')
-            logger.warning(
-                f'Evaluation of RestrictedQuerySet prior to calling restrict() or unrestricted(): {self.model}'
-            )
-
-    def _clone(self):
-
-        # Persist the allow_evaluation flag when cloning the QuerySet.
-        c = super()._clone()
-        c.allow_evaluation = self.allow_evaluation
-
-        return c
-
-    def _fetch_all(self):
-        self._check_restriction()
-        return super()._fetch_all()
-
-    def count(self):
-        self._check_restriction()
-        return super().count()
-
-    def unrestricted(self):
-        """
-        Bypass restriction for the QuerySet. This is necessary in cases where we are not interacting with the objects
-        directly (e.g. when filtering by related object).
-        """
-        self.allow_evaluation = True
-        return self
-
     def restrict(self, user, action='view'):
         """
         Filter the QuerySet to return only objects on which the specified user has been granted the specified
@@ -88,7 +48,4 @@ class RestrictedQuerySet(QuerySet):
                     attrs |= Q(**perm_attrs)
             qs = self.filter(attrs)
 
-        # Allow QuerySet evaluation
-        qs.allow_evaluation = True
-
         return qs
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 98bc8ff02..95946a24a 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -158,10 +158,8 @@ class ModelTestCase(TestCase):
 
     def _get_queryset(self):
         """
-        Return a base queryset suitable for use in test methods. Call unrestricted() if RestrictedQuerySet is in use.
+        Return a base queryset suitable for use in test methods.
         """
-        if hasattr(self.model.objects, 'restrict'):
-            return self.model.objects.unrestricted()
         return self.model.objects.all()
 
 
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index df48e92e6..dde5a8d3f 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -79,8 +79,7 @@ class VirtualMachineViewSet(CustomFieldModelViewSet):
 
 class VMInterfaceViewSet(ModelViewSet):
     queryset = VMInterface.objects.prefetch_related(
-        Prefetch('tagged_vlans', queryset=VLAN.objects.unrestricted()),
-        'virtual_machine', 'tags'
+        'virtual_machine', 'tags', 'tagged_vlans'
     )
     serializer_class = serializers.VMInterfaceSerializer
     filterset_class = filters.VMInterfaceFilterSet
diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py
index 9e8816cb6..7cb37f323 100644
--- a/netbox/virtualization/filters.py
+++ b/netbox/virtualization/filters.py
@@ -40,45 +40,45 @@ class ClusterFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cr
         label='Search',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='site__region',
         lookup_expr='in',
         to_field_name='slug',
         label='Region (slug)',
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         label='Parent group (ID)',
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         label='Parent group (slug)',
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ClusterType.objects.unrestricted(),
+        queryset=ClusterType.objects.all(),
         label='Cluster type (ID)',
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
-        queryset=ClusterType.objects.unrestricted(),
+        queryset=ClusterType.objects.all(),
         to_field_name='slug',
         label='Cluster type (slug)',
     )
@@ -114,38 +114,38 @@ class VirtualMachineFilterSet(
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group',
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         label='Cluster group (ID)',
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group__slug',
-        queryset=ClusterGroup.objects.unrestricted(),
+        queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         label='Cluster group (slug)',
     )
     cluster_type_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type',
-        queryset=ClusterType.objects.unrestricted(),
+        queryset=ClusterType.objects.all(),
         label='Cluster type (ID)',
     )
     cluster_type = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type__slug',
-        queryset=ClusterType.objects.unrestricted(),
+        queryset=ClusterType.objects.all(),
         to_field_name='slug',
         label='Cluster type (slug)',
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Cluster.objects.unrestricted(),
+        queryset=Cluster.objects.all(),
         label='Cluster (ID)',
     )
     region_id = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='cluster__site__region',
         lookup_expr='in',
         label='Region (ID)',
     )
     region = TreeNodeMultipleChoiceFilter(
-        queryset=Region.objects.unrestricted(),
+        queryset=Region.objects.all(),
         field_name='cluster__site__region',
         lookup_expr='in',
         to_field_name='slug',
@@ -153,32 +153,32 @@ class VirtualMachineFilterSet(
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__site',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         label='Site (ID)',
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__site__slug',
-        queryset=Site.objects.unrestricted(),
+        queryset=Site.objects.all(),
         to_field_name='slug',
         label='Site (slug)',
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         label='Role (ID)',
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
-        queryset=DeviceRole.objects.unrestricted(),
+        queryset=DeviceRole.objects.all(),
         to_field_name='slug',
         label='Role (slug)',
     )
     platform_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         label='Platform (ID)',
     )
     platform = django_filters.ModelMultipleChoiceFilter(
         field_name='platform__slug',
-        queryset=Platform.objects.unrestricted(),
+        queryset=Platform.objects.all(),
         to_field_name='slug',
         label='Platform (slug)',
     )
@@ -208,23 +208,23 @@ class VMInterfaceFilterSet(BaseFilterSet):
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__cluster',
-        queryset=Cluster.objects.unrestricted(),
+        queryset=Cluster.objects.all(),
         label='Cluster (ID)',
     )
     cluster = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__cluster__name',
-        queryset=Cluster.objects.unrestricted(),
+        queryset=Cluster.objects.all(),
         to_field_name='name',
         label='Cluster',
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine',
-        queryset=VirtualMachine.objects.unrestricted(),
+        queryset=VirtualMachine.objects.all(),
         label='Virtual machine (ID)',
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
-        queryset=VirtualMachine.objects.unrestricted(),
+        queryset=VirtualMachine.objects.all(),
         to_field_name='name',
         label='Virtual machine',
     )
diff --git a/netbox/virtualization/models.py b/netbox/virtualization/models.py
index edc6fb423..f787aef0e 100644
--- a/netbox/virtualization/models.py
+++ b/netbox/virtualization/models.py
@@ -177,7 +177,7 @@ class Cluster(ChangeLoggedModel, CustomFieldModel):
 
         # If the Cluster is assigned to a Site, verify that all host Devices belong to that Site.
         if self.pk and self.site:
-            nonsite_devices = Device.objects.unrestricted().filter(cluster=self).exclude(site=self.site).count()
+            nonsite_devices = Device.objects.filter(cluster=self).exclude(site=self.site).count()
             if nonsite_devices:
                 raise ValidationError({
                     'site': "{} devices are assigned as hosts for this cluster but are not in site {}".format(
@@ -317,7 +317,7 @@ class VirtualMachine(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
         # Check for a duplicate name on a VM assigned to the same Cluster 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.tenant is None and VirtualMachine.objects.unrestricted().exclude(pk=self.pk).filter(
+        if self.tenant is None and VirtualMachine.objects.exclude(pk=self.pk).filter(
                 name=self.name, tenant__isnull=True
         ):
             raise ValidationError({
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index 4d79602f5..6ddcdf2ef 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -164,7 +164,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         """
         Check that config context data is included by default in the virtual machines list.
         """
-        virtualmachine = VirtualMachine.objects.unrestricted().first()
+        virtualmachine = VirtualMachine.objects.first()
         url = '{}?id={}'.format(reverse('virtualization-api:virtualmachine-list'), virtualmachine.pk)
         self.add_permissions('virtualization.view_virtualmachine')
 
@@ -187,7 +187,7 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase):
         """
         data = {
             'name': 'Virtual Machine 1',
-            'cluster': Cluster.objects.unrestricted().first().pk,
+            'cluster': Cluster.objects.first().pk,
         }
         url = reverse('virtualization-api:virtualmachine-list')
         self.add_permissions('virtualization.add_virtualmachine')
@@ -260,7 +260,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase):
 
         self.add_permissions('virtualization.view_vminterface')
         url = reverse('virtualization-api:vminterface-graphs', kwargs={
-            'pk': VMInterface.objects.unrestricted().first().pk
+            'pk': VMInterface.objects.first().pk
         })
         response = self.client.get(url, **self.header)
 
diff --git a/netbox/virtualization/tests/test_filters.py b/netbox/virtualization/tests/test_filters.py
index 2204e20a2..ad452ec51 100644
--- a/netbox/virtualization/tests/test_filters.py
+++ b/netbox/virtualization/tests/test_filters.py
@@ -8,7 +8,7 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac
 
 
 class ClusterTypeTestCase(TestCase):
-    queryset = ClusterType.objects.unrestricted()
+    queryset = ClusterType.objects.all()
     filterset = ClusterTypeFilterSet
 
     @classmethod
@@ -39,7 +39,7 @@ class ClusterTypeTestCase(TestCase):
 
 
 class ClusterGroupTestCase(TestCase):
-    queryset = ClusterGroup.objects.unrestricted()
+    queryset = ClusterGroup.objects.all()
     filterset = ClusterGroupFilterSet
 
     @classmethod
@@ -70,7 +70,7 @@ class ClusterGroupTestCase(TestCase):
 
 
 class ClusterTestCase(TestCase):
-    queryset = Cluster.objects.unrestricted()
+    queryset = Cluster.objects.all()
     filterset = ClusterFilterSet
 
     @classmethod
@@ -137,42 +137,42 @@ class ClusterTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_group(self):
-        groups = ClusterGroup.objects.unrestricted()[:2]
+        groups = ClusterGroup.objects.all()[:2]
         params = {'group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_type(self):
-        types = ClusterType.objects.unrestricted()[:2]
+        types = ClusterType.objects.all()[:2]
         params = {'type_id': [types[0].pk, types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'type': [types[0].slug, types[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -180,7 +180,7 @@ class ClusterTestCase(TestCase):
 
 
 class VirtualMachineTestCase(TestCase):
-    queryset = VirtualMachine.objects.unrestricted()
+    queryset = VirtualMachine.objects.all()
     filterset = VirtualMachineFilterSet
 
     @classmethod
@@ -291,21 +291,21 @@ class VirtualMachineTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_group(self):
-        groups = ClusterGroup.objects.unrestricted()[:2]
+        groups = ClusterGroup.objects.all()[:2]
         params = {'cluster_group_id': [groups[0].pk, groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_group': [groups[0].slug, groups[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster_type(self):
-        types = ClusterType.objects.unrestricted()[:2]
+        types = ClusterType.objects.all()[:2]
         params = {'cluster_type_id': [types[0].pk, types[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'cluster_type': [types[0].slug, types[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_cluster(self):
-        clusters = Cluster.objects.unrestricted()[:2]
+        clusters = Cluster.objects.all()[:2]
         params = {'cluster_id': [clusters[0].pk, clusters[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         # TODO: 'cluster' should match on name
@@ -313,28 +313,28 @@ class VirtualMachineTestCase(TestCase):
         # self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_region(self):
-        regions = Region.objects.unrestricted()[:2]
+        regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'region': [regions[0].slug, regions[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_site(self):
-        sites = Site.objects.unrestricted()[:2]
+        sites = Site.objects.all()[:2]
         params = {'site_id': [sites[0].pk, sites[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'site': [sites[0].slug, sites[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_role(self):
-        roles = DeviceRole.objects.unrestricted()[:2]
+        roles = DeviceRole.objects.all()[:2]
         params = {'role_id': [roles[0].pk, roles[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'role': [roles[0].slug, roles[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_platform(self):
-        platforms = Platform.objects.unrestricted()[:2]
+        platforms = Platform.objects.all()[:2]
         params = {'platform_id': [platforms[0].pk, platforms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'platform': [platforms[0].slug, platforms[1].slug]}
@@ -351,14 +351,14 @@ class VirtualMachineTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant(self):
-        tenants = Tenant.objects.unrestricted()[:2]
+        tenants = Tenant.objects.all()[:2]
         params = {'tenant_id': [tenants[0].pk, tenants[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant': [tenants[0].slug, tenants[1].slug]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_tenant_group(self):
-        tenant_groups = TenantGroup.objects.unrestricted()[:2]
+        tenant_groups = TenantGroup.objects.all()[:2]
         params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]}
@@ -366,7 +366,7 @@ class VirtualMachineTestCase(TestCase):
 
 
 class VMInterfaceTestCase(TestCase):
-    queryset = VMInterface.objects.unrestricted()
+    queryset = VMInterface.objects.all()
     filterset = VMInterfaceFilterSet
 
     @classmethod
@@ -420,7 +420,7 @@ class VMInterfaceTestCase(TestCase):
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
     def test_virtual_machine(self):
-        vms = VirtualMachine.objects.unrestricted()[:2]
+        vms = VirtualMachine.objects.all()[:2]
         params = {'virtual_machine_id': [vms[0].pk, vms[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
         params = {'virtual_machine': [vms[0].name, vms[1].name]}

From 46ebeba28f8fbb9d43457aa3fa539b29048a581b Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 13:46:40 -0400
Subject: [PATCH 382/505] Set default ordering for user and group API endpoints

---
 netbox/users/api/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index 1c3a92bcc..a971592e0 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -13,13 +13,13 @@ from . import serializers
 #
 
 class UserViewSet(ModelViewSet):
-    queryset = RestrictedQuerySet(model=User).prefetch_related('groups')
+    queryset = RestrictedQuerySet(model=User).prefetch_related('groups').order_by('username')
     serializer_class = serializers.UserSerializer
     filterset_class = filters.UserFilterSet
 
 
 class GroupViewSet(ModelViewSet):
-    queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user'))
+    queryset = RestrictedQuerySet(model=Group).annotate(user_count=Count('user')).order_by('name')
     serializer_class = serializers.GroupSerializer
     filterset_class = filters.GroupFilterSet
 

From b47a9f251d2031a9568de4c66c8c304ff7229948 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 13:47:19 -0400
Subject: [PATCH 383/505] Change ObjectChangeFilterForm user field to be
 API-driven

---
 netbox/extras/forms.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index b61a44f60..a565375c5 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -410,11 +410,13 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
         required=False,
         widget=StaticSelect2()
     )
-    # TODO: Convert to DynamicModelMultipleChoiceField once we have an API endpoint for users
-    user = forms.ModelChoiceField(
-        queryset=User.objects.order_by('username'),
+    user = DynamicModelMultipleChoiceField(
+        queryset=User.objects.all(),
         required=False,
-        widget=StaticSelect2()
+        widget=APISelectMultiple(
+            api_url='/api/users/users/',
+            display_field='username'
+        )
     )
     changed_object_type = forms.ModelChoiceField(
         queryset=ContentType.objects.order_by('model'),

From 84d4b2db7712bbe610e47c33886a8bad6254968f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 13:53:36 -0400
Subject: [PATCH 384/505] Clean up resolution of HTTP verbs to permission
 actions

---
 netbox/utilities/api.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 7c413890b..1a0f912ba 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -17,6 +17,16 @@ from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
 from .utils import dict_to_filter_params, dynamic_import
 
+HTTP_ACTIONS = {
+    'GET': 'view',
+    'OPTIONS': None,
+    'HEAD': 'view',
+    'POST': 'add',
+    'PUT': 'change',
+    'PATCH': 'change',
+    'DELETE': 'delete',
+}
+
 
 class ServiceUnavailable(APIException):
     status_code = 503
@@ -321,18 +331,8 @@ class ModelViewSet(_ModelViewSet):
         if not request.user.is_authenticated:
             return
 
-        # TODO: Reconcile this with TokenPermissions.perms_map
-        action = {
-            'GET': 'view',
-            'OPTIONS': None,
-            'HEAD': 'view',
-            'POST': 'add',
-            'PUT': 'change',
-            'PATCH': 'change',
-            'DELETE': 'delete',
-        }[request.method]
-
         # Restrict the view's QuerySet to allow only the permitted objects
+        action = HTTP_ACTIONS[request.method]
         if action:
             self.queryset = self.queryset.restrict(request.user, action)
 

From 78bb2e12fe33522b788f9624826bb6fd9858887e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:03:19 -0400
Subject: [PATCH 385/505] Clean up migration output

---
 netbox/virtualization/migrations/0016_replicate_interfaces.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index a8960b101..455a82869 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -18,7 +18,7 @@ def replicate_interfaces(apps, schema_editor):
     # Replicate dcim.Interface instances assigned to VirtualMachines
     original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
     if show_output:
-        print(f"\n    Replicating {len(original_interfaces)} VM interfaces...", flush=True)
+        print(f"\n    Replicating {len(original_interfaces)} VM interfaces...", end='', flush=True)
     for i, interface in enumerate(original_interfaces, start=1):
         vminterface = VMInterface(
             virtual_machine=interface.virtual_machine,
@@ -56,8 +56,6 @@ def replicate_interfaces(apps, schema_editor):
     # Verify that all interfaces have been replicated
     replicated_count = VMInterface.objects.count()
     assert replicated_count == original_interfaces.count(), "Replicated interfaces count does not match original count!"
-    if show_output:
-        print(f"\n    Replicated {replicated_count} interfaces ", end='', flush=True)
 
     # Delete all interfaces not assigned to a Device
     Interface.objects.filter(device__isnull=True).delete()

From 37706f1c8730eabea4090d049e72b0ccb0c142a7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:20:56 -0400
Subject: [PATCH 386/505] Use RestrictedQuerySet for default Tag manager

---
 netbox/extras/models/tags.py |  3 +--
 netbox/extras/views.py       | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index b9d7934ce..e86e703fd 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -21,8 +21,7 @@ class Tag(TagBase, ChangeLoggedModel):
         blank=True,
     )
 
-    objects = models.Manager()
-    restricted_objects = RestrictedQuerySet.as_manager()
+    objects = RestrictedQuerySet.as_manager()
 
     csv_headers = ['name', 'slug', 'color', 'description']
 
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index b38b39cd6..d02e65ef3 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -32,7 +32,7 @@ from .scripts import get_scripts, run_script
 #
 
 class TagListView(ObjectListView):
-    queryset = Tag.restricted_objects.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -43,23 +43,23 @@ class TagListView(ObjectListView):
 
 
 class TagEditView(ObjectEditView):
-    queryset = Tag.restricted_objects.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagForm
     template_name = 'extras/tag_edit.html'
 
 
 class TagDeleteView(ObjectDeleteView):
-    queryset = Tag.restricted_objects.all()
+    queryset = Tag.objects.all()
 
 
 class TagBulkImportView(BulkImportView):
-    queryset = Tag.restricted_objects.all()
+    queryset = Tag.objects.all()
     model_form = forms.TagCSVForm
     table = tables.TagTable
 
 
 class TagBulkEditView(BulkEditView):
-    queryset = Tag.restricted_objects.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items', distinct=True)
     ).order_by(
         'name'
@@ -69,7 +69,7 @@ class TagBulkEditView(BulkEditView):
 
 
 class TagBulkDeleteView(BulkDeleteView):
-    queryset = Tag.restricted_objects.annotate(
+    queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items')
     ).order_by(
         'name'

From 9bcfefa31e19a7f88e92c944bf6e289184469366 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:23:50 -0400
Subject: [PATCH 387/505] Fix ordering for Tags

---
 netbox/extras/api/views.py                    |  6 +++---
 netbox/extras/migrations/0047_tag_ordering.py | 17 +++++++++++++++++
 netbox/extras/models/tags.py                  |  3 +++
 netbox/extras/views.py                        | 16 +++++-----------
 4 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 netbox/extras/migrations/0047_tag_ordering.py

diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 501182da5..1e4886634 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -116,9 +116,9 @@ class ExportTemplateViewSet(ModelViewSet):
 #
 
 class TagViewSet(ModelViewSet):
-    queryset = Tag.restricted_objects.annotate(
-        tagged_items=Count('extras_taggeditem_items', distinct=True)
-    )
+    queryset = Tag.objects.annotate(
+        tagged_items=Count('extras_taggeditem_items')
+    ).order_by(*Tag._meta.ordering)
     serializer_class = serializers.TagSerializer
     filterset_class = filters.TagFilterSet
 
diff --git a/netbox/extras/migrations/0047_tag_ordering.py b/netbox/extras/migrations/0047_tag_ordering.py
new file mode 100644
index 000000000..8fecbdad4
--- /dev/null
+++ b/netbox/extras/migrations/0047_tag_ordering.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1rc1 on 2020-07-23 18:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('extras', '0046_update_jsonfield'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='tag',
+            options={'ordering': ['name']},
+        ),
+    ]
diff --git a/netbox/extras/models/tags.py b/netbox/extras/models/tags.py
index e86e703fd..4b5acdc76 100644
--- a/netbox/extras/models/tags.py
+++ b/netbox/extras/models/tags.py
@@ -25,6 +25,9 @@ class Tag(TagBase, ChangeLoggedModel):
 
     csv_headers = ['name', 'slug', 'color', 'description']
 
+    class Meta:
+        ordering = ['name']
+
     def slugify(self, tag, i=None):
         # Allow Unicode in Tag slugs (avoids empty slugs for Tags with all-Unicode names)
         slug = slugify(tag, allow_unicode=True)
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index d02e65ef3..9f3715953 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -33,10 +33,8 @@ from .scripts import get_scripts, run_script
 
 class TagListView(ObjectListView):
     queryset = Tag.objects.annotate(
-        items=Count('extras_taggeditem_items', distinct=True)
-    ).order_by(
-        'name'
-    )
+        items=Count('extras_taggeditem_items')
+    ).order_by(*Tag._meta.ordering)
     filterset = filters.TagFilterSet
     filterset_form = forms.TagFilterForm
     table = tables.TagTable
@@ -60,10 +58,8 @@ class TagBulkImportView(BulkImportView):
 
 class TagBulkEditView(BulkEditView):
     queryset = Tag.objects.annotate(
-        items=Count('extras_taggeditem_items', distinct=True)
-    ).order_by(
-        'name'
-    )
+        items=Count('extras_taggeditem_items')
+    ).order_by(*Tag._meta.ordering)
     table = tables.TagTable
     form = forms.TagBulkEditForm
 
@@ -71,9 +67,7 @@ class TagBulkEditView(BulkEditView):
 class TagBulkDeleteView(BulkDeleteView):
     queryset = Tag.objects.annotate(
         items=Count('extras_taggeditem_items')
-    ).order_by(
-        'name'
-    )
+    ).order_by(*Tag._meta.ordering)
     table = tables.TagTable
 
 

From b734c72be734bb30ff2eb38da0dd820365801754 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:32:30 -0400
Subject: [PATCH 388/505] Fix VirtualChassis search by name

---
 netbox/dcim/filters.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index 4168a19ff..457483273 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -1068,7 +1068,8 @@ class VirtualChassisFilterSet(BaseFilterSet):
         if not value.strip():
             return queryset
         qs_filter = (
-            Q(master__name__icontains=value) |
+            Q(name__icontains=value) |
+            Q(members__name__icontains=value) |
             Q(domain__icontains=value)
         )
         return queryset.filter(qs_filter)

From 7eb688bdcd148acced1cbf09403730e27f84c807 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:46:06 -0400
Subject: [PATCH 389/505] Release v2.9-beta1

---
 docs/release-notes/version-2.9.md | 4 +++-
 netbox/netbox/settings.py         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index e1ac9cb2a..da40da064 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,6 +1,8 @@
 # NetBox v2.9
 
-## v2.9.0 (FUTURE)
+## v2.9-beta1 (2020-07-23)
+
+**WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.
 
 ### New Features
 
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index ee5b39a47..200207672 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.9.0-dev'
+VERSION = '2.9-beta1'
 
 # Hostname
 HOSTNAME = platform.node()

From fe20c30a8198bd5a21c365bb28383c47ac169033 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 23 Jul 2020 14:57:35 -0400
Subject: [PATCH 390/505] Fix parameters for ObjectChangeTestCase

---
 netbox/extras/tests/test_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/extras/tests/test_views.py b/netbox/extras/tests/test_views.py
index cc25bef90..4ff0b59c8 100644
--- a/netbox/extras/tests/test_views.py
+++ b/netbox/extras/tests/test_views.py
@@ -113,7 +113,7 @@ class ObjectChangeTestCase(TestCase):
 
         url = reverse('extras:objectchange_list')
         params = {
-            "user": User.objects.first(),
+            "user": User.objects.first().pk,
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))

From b17e47101c09e1b2b572ece73cbc612abbe15a38 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 27 Jul 2020 10:19:24 -0400
Subject: [PATCH 391/505] Fixes #4905: Fix front port count on device type view

---
 docs/release-notes/version-2.9.md     | 8 ++++++++
 netbox/templates/dcim/devicetype.html | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index da40da064..2856c5a48 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,5 +1,13 @@
 # NetBox v2.9
 
+## v2.9.0 (FUTURE)
+
+### Bug Fixes
+
+* [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
+
+---
+
 ## v2.9-beta1 (2020-07-23)
 
 **WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index b9db8db6f..a9addbee2 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -167,7 +167,7 @@
                     <a href="#interfaces" role="tab" data-toggle="tab">Interfaces {% badge interface_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
-                    <a href="#frontports" role="tab" data-toggle="tab">Front Ports {% badge front_port_table_table.rows|length %}</a>
+                    <a href="#frontports" role="tab" data-toggle="tab">Front Ports {% badge front_port_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
                     <a href="#rearports" role="tab" data-toggle="tab">Rear Ports {% badge rear_port_table.rows|length %}</a>

From a206b422fb07d8dd7467076198cf520a233d9f10 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 27 Jul 2020 14:24:15 -0400
Subject: [PATCH 392/505] Fixes #4912: Fix image attachment API endpoint; add
 API view tests

---
 docs/release-notes/version-2.9.md       |  1 +
 netbox/extras/api/nested_serializers.py |  9 +++++
 netbox/extras/models/models.py          |  2 ++
 netbox/extras/tests/test_api.py         | 46 ++++++++++++++++++++++++-
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 2856c5a48..16e800e70 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
+* [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
 
 ---
 
diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py
index e3fb2e0db..198a5d2f8 100644
--- a/netbox/extras/api/nested_serializers.py
+++ b/netbox/extras/api/nested_serializers.py
@@ -8,6 +8,7 @@ __all__ = [
     'NestedConfigContextSerializer',
     'NestedExportTemplateSerializer',
     'NestedGraphSerializer',
+    'NestedImageAttachmentSerializer',
     'NestedJobResultSerializer',
     'NestedTagSerializer',
 ]
@@ -37,6 +38,14 @@ class NestedGraphSerializer(WritableNestedSerializer):
         fields = ['id', 'url', 'name']
 
 
+class NestedImageAttachmentSerializer(WritableNestedSerializer):
+    url = serializers.HyperlinkedIdentityField(view_name='extras-api:imageattachment-detail')
+
+    class Meta:
+        model = models.ImageAttachment
+        fields = ['id', 'url', 'name', 'image']
+
+
 class NestedTagSerializer(WritableNestedSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='extras-api:tag-detail')
 
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 9b6de22c6..9b5c77fcb 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -387,6 +387,8 @@ class ImageAttachment(models.Model):
         auto_now_add=True
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         ordering = ('name', 'pk')  # name may be non-unique
 
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index fccb03665..c768534a2 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -10,7 +10,7 @@ from rq import Worker
 
 from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Rack, RackGroup, RackRole, Site
 from extras.api.views import ReportViewSet, ScriptViewSet
-from extras.models import ConfigContext, Graph, ExportTemplate, Tag
+from extras.models import ConfigContext, ExportTemplate, Graph, ImageAttachment, Tag
 from extras.reports import Report
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from utilities.testing import APITestCase, APIViewTestCases
@@ -136,6 +136,50 @@ class TagTest(APIViewTestCases.APIViewTestCase):
         Tag.objects.bulk_create(tags)
 
 
+# TODO: Standardize to APIViewTestCase (needs create & update tests)
+class ImageAttachmentTest(
+    APIViewTestCases.GetObjectViewTestCase,
+    APIViewTestCases.ListObjectsViewTestCase,
+    APIViewTestCases.DeleteObjectViewTestCase
+):
+    model = ImageAttachment
+    brief_fields = ['id', 'image', 'name', 'url']
+
+    @classmethod
+    def setUpTestData(cls):
+        ct = ContentType.objects.get_for_model(Site)
+
+        site = Site.objects.create(name='Site 1', slug='site-1')
+
+        image_attachments = (
+            ImageAttachment(
+                content_type=ct,
+                object_id=site.pk,
+                name='Image Attachment 1',
+                image='http://example.com/image1.png',
+                image_height=100,
+                image_width=100
+            ),
+            ImageAttachment(
+                content_type=ct,
+                object_id=site.pk,
+                name='Image Attachment 2',
+                image='http://example.com/image2.png',
+                image_height=100,
+                image_width=100
+            ),
+            ImageAttachment(
+                content_type=ct,
+                object_id=site.pk,
+                name='Image Attachment 3',
+                image='http://example.com/image3.png',
+                image_height=100,
+                image_width=100
+            )
+        )
+        ImageAttachment.objects.bulk_create(image_attachments)
+
+
 class ConfigContextTest(APIViewTestCases.APIViewTestCase):
     model = ConfigContext
     brief_fields = ['id', 'name', 'url']

From bfdb01244dd0c36d85de271257f2248299952d1d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 27 Jul 2020 20:35:00 -0400
Subject: [PATCH 393/505] Refresh configuration docs

---
 docs/configuration/index.md             |   6 +-
 docs/configuration/optional-settings.md | 167 +++++++++++++-----------
 docs/configuration/required-settings.md |  37 ++++--
 3 files changed, 115 insertions(+), 95 deletions(-)

diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index 26b1aa5eb..8b0c4121a 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -1,6 +1,6 @@
 # NetBox Configuration
 
-NetBox's local configuration is stored in `netbox/netbox/configuration.py`. An example configuration is provided at `netbox/netbox/configuration.example.py`. You may copy or rename the example configuration and make changes as appropriate. NetBox will not run without a configuration file.
+NetBox's local configuration is stored in `$INSTALL_ROOT/netbox/netbox/configuration.py`. An example configuration is provided as `configuration.example.py`. You may copy or rename the example configuration and make changes as appropriate. NetBox will not run without a configuration file.
 
 While NetBox has many configuration settings, only a few of them must be defined at the time of installation.
 
@@ -11,8 +11,8 @@ While NetBox has many configuration settings, only a few of them must be defined
 
 ## Changing the Configuration
 
-Configuration settings may be changed at any time. However, the NetBox service must be restarted before the changes will take effect:
+Configuration settings may be changed at any time. However, the WSGI service (e.g. Gunicorn) must be restarted before the changes will take effect:
 
 ```no-highlight
-# sudo supervisorctl restart netbox
+$ sudo systemctl restart netbox
 ```
diff --git a/docs/configuration/optional-settings.md b/docs/configuration/optional-settings.md
index 77286c97d..244ffc120 100644
--- a/docs/configuration/optional-settings.md
+++ b/docs/configuration/optional-settings.md
@@ -4,7 +4,7 @@
 
 NetBox will email details about critical errors to the administrators listed here. This should be a list of (name, email) tuples. For example:
 
-```
+```python
 ADMINS = [
     ['Hank Hill', 'hhill@example.com'],
     ['Dale Gribble', 'dgribble@example.com'],
@@ -17,7 +17,7 @@ ADMINS = [
 
 Default: `('file', 'ftp', 'ftps', 'http', 'https', 'irc', 'mailto', 'sftp', 'ssh', 'tel', 'telnet', 'tftp', 'vnc', 'xmpp')`
 
-A list of permitted URL schemes referenced when rendering links within NetBox. Note that only the schemes specified in this list will be accepted: If adding your own, be sure to replicate the entire default list as well (excluding those schemes which are not desirable).
+A list of permitted URL schemes referenced when rendering links within NetBox. Note that only the schemes specified in this list will be accepted: If adding your own, be sure to replicate all of the default values as well (excluding those schemes which are not desirable).
 
 ---
 
@@ -25,9 +25,9 @@ A list of permitted URL schemes referenced when rendering links within NetBox. N
 
 ## BANNER_BOTTOM
 
-Setting these variables will display content in a banner at the top and/or bottom of the page, respectively. HTML is allowed. To replicate the content of the top banner in the bottom banner, set:
+Setting these variables will display custom content in a banner at the top and/or bottom of the page, respectively. HTML is allowed. To replicate the content of the top banner in the bottom banner, set:
 
-```
+```python
 BANNER_TOP = 'Your banner text'
 BANNER_BOTTOM = BANNER_TOP
 ```
@@ -36,7 +36,7 @@ BANNER_BOTTOM = BANNER_TOP
 
 ## BANNER_LOGIN
 
-The value of this variable will be displayed on the login page above the login form. HTML is allowed.
+This defines custom content to be displayed on the login page above the login form. HTML is allowed.
 
 ---
 
@@ -46,7 +46,7 @@ Default: None
 
 The base URL path to use when accessing NetBox. Do not include the scheme or domain name. For example, if installed at http://example.com/netbox/, set:
 
-```
+```python
 BASE_PATH = 'netbox/'
 ```
 
@@ -56,7 +56,7 @@ BASE_PATH = 'netbox/'
 
 Default: 900
 
-The number of seconds to retain cache entries before automatically invalidating them.
+The number of seconds to cache entries will be retained before expiring.
 
 ---
 
@@ -64,7 +64,11 @@ The number of seconds to retain cache entries before automatically invalidating
 
 Default: 90
 
-The number of days to retain logged changes (object creations, updates, and deletions). Set this to `0` to retain changes in the database indefinitely. (Warning: This will greatly increase database size over time.)
+The number of days to retain logged changes (object creations, updates, and deletions). Set this to `0` to retain
+changes in the database indefinitely.
+
+!!! warning
+    If enabling indefinite changelog retention, it is recommended to periodically delete old entries. Otherwise, the database may eventually exceed capacity.
 
 ---
 
@@ -80,9 +84,11 @@ If True, cross-origin resource sharing (CORS) requests will be accepted from all
 
 ## CORS_ORIGIN_REGEX_WHITELIST
 
-These settings specify a list of origins that are authorized to make cross-site API requests. Use `CORS_ORIGIN_WHITELIST` to define a list of exact hostnames, or `CORS_ORIGIN_REGEX_WHITELIST` to define a set of regular expressions. (These settings have no effect if `CORS_ORIGIN_ALLOW_ALL` is True.) For example:
+These settings specify a list of origins that are authorized to make cross-site API requests. Use
+`CORS_ORIGIN_WHITELIST` to define a list of exact hostnames, or `CORS_ORIGIN_REGEX_WHITELIST` to define a set of regular 
+expressions. (These settings have no effect if `CORS_ORIGIN_ALLOW_ALL` is True.) For example:
 
-```
+```python
 CORS_ORIGIN_WHITELIST = [
     'https://example.com',
 ]
@@ -94,12 +100,13 @@ CORS_ORIGIN_WHITELIST = [
 
 Default: False
 
-This setting enables debugging. This should be done only during development or troubleshooting. Note that only clients
-which access NetBox from a recognized [internal IP address](#internal_ips) will see debugging tools in the user
+This setting enables debugging. Debugging should be enabled only during development or troubleshooting. Note that only
+clients which access NetBox from a recognized [internal IP address](#internal_ips) will see debugging tools in the user
 interface.
 
 !!! warning
-    Never enable debugging on a production system, as it can expose sensitive data to unauthenticated users.
+    Never enable debugging on a production system, as it can expose sensitive data to unauthenticated users and impose a
+    substantial performance penalty.
 
 ---
 
@@ -113,9 +120,9 @@ This parameter serves as a safeguard to prevent some potentially dangerous behav
 
 ## DOCS_ROOT
 
-Default: `$INSTALL_DIR/docs/`
+Default: `$INSTALL_ROOT/docs/`
 
-The file path to NetBox's documentation. This is used when presenting context-sensitive documentation in the web UI. by default, this will be the `docs/` directory within the root NetBox installation path. (Set this to `None` to disable the embedded documentation.)
+The filesystem path to NetBox's documentation. This is used when presenting context-sensitive documentation in the web UI. By default, this will be the `docs/` directory within the root NetBox installation path. (Set this to `None` to disable the embedded documentation.)
 
 ---
 
@@ -123,20 +130,23 @@ The file path to NetBox's documentation. This is used when presenting context-se
 
 In order to send email, NetBox needs an email server configured. The following items can be defined within the `EMAIL` configuration parameter:
 
-* `SERVER` - Host name or IP address of the email server (use `localhost` if running locally)
+* `SERVER` - Hostname or IP address of the email server (use `localhost` if running locally)
 * `PORT` - TCP port to use for the connection (default: `25`)
 * `USERNAME` - Username with which to authenticate
 * `PASSSWORD` - Password with which to authenticate
-* `USE_SSL` - Use SSL when connecting to the server (default: `False`). Mutually exclusive with `USE_TLS`.
-* `USE_TLS` - Use TLS when connecting to the server (default: `False`). Mutually exclusive with `USE_SSL`.
+* `USE_SSL` - Use SSL when connecting to the server (default: `False`)
+* `USE_TLS` - Use TLS when connecting to the server (default: `False`)
 * `SSL_CERTFILE` - Path to the PEM-formatted SSL certificate file (optional)
 * `SSL_KEYFILE` - Path to the PEM-formatted SSL private key file (optional)
 * `TIMEOUT` - Amount of time to wait for a connection, in seconds (default: `10`)
-* `FROM_EMAIL` - Sender address for emails sent by NetBox (default: `root@localhost`)
+* `FROM_EMAIL` - Sender address for emails sent by NetBox
 
-Email is sent from NetBox only for critical events or if configured for [logging](#logging). If you would like to test the email server configuration please use the django function [send_mail()](https://docs.djangoproject.com/en/stable/topics/email/#send-mail):
+!!! note
+    The `USE_SSL` and `USE_TLS` parameters are mutually exclusive.
 
-```
+Email is sent from NetBox only for critical events or if configured for [logging](#logging). If you would like to test the email server configuration, Django provides a convenient [send_mail()](https://docs.djangoproject.com/en/stable/topics/email/#send-mail) fuction accessible within the NetBox shell:
+
+```no-highlight
 # python ./manage.py nbshell
 >>> from django.core.mail import send_mail
 >>> send_mail(
@@ -150,15 +160,23 @@ Email is sent from NetBox only for critical events or if configured for [logging
 
 ---
 
+## ENFORCE_GLOBAL_UNIQUE
+
+Default: False
+
+By default, NetBox will permit users to create duplicate prefixes and IP addresses in the global table (that is, those which are not assigned to any VRF). This behavior can be disabled by setting `ENFORCE_GLOBAL_UNIQUE` to True.
+
+---
+
 ## EXEMPT_VIEW_PERMISSIONS
 
 Default: Empty list
 
-A list of models to exempt from the enforcement of view permissions. Models listed here will be viewable by all users and by anonymous users.
+A list of NetBox models to exempt from the enforcement of view permissions. Models listed here will be viewable by all users, both authenticated and anonymous.
 
 List models in the form `<app>.<model>`. For example:
 
-```
+```python
 EXEMPT_VIEW_PERMISSIONS = [
     'dcim.site',
     'dcim.region',
@@ -168,7 +186,7 @@ EXEMPT_VIEW_PERMISSIONS = [
 
 To exempt _all_ models from view permission enforcement, set the following. (Note that `EXEMPT_VIEW_PERMISSIONS` must be an iterable.)
 
-```
+```python
 EXEMPT_VIEW_PERMISSIONS = ['*']
 ```
 
@@ -177,19 +195,11 @@ EXEMPT_VIEW_PERMISSIONS = ['*']
 
 ---
 
-## ENFORCE_GLOBAL_UNIQUE
-
-Default: False
-
-Enforcement of unique IP space can be toggled on a per-VRF basis. To enforce unique IP space within the global table (all prefixes and IP addresses not assigned to a VRF), set `ENFORCE_GLOBAL_UNIQUE` to True.
-
----
-
 ## HTTP_PROXIES
 
 Default: None
 
-A dictionary of HTTP proxies to use for outbound requests originating from NetBox (e.g. when sending webhooks). Proxies should be specified by schema as per the [Python requests library documentation](https://2.python-requests.org/en/master/user/advanced/). For example:
+A dictionary of HTTP proxies to use for outbound requests originating from NetBox (e.g. when sending webhook requests). Proxies should be specified by schema (HTTP and HTTPS) as per the [Python requests library documentation](https://2.python-requests.org/en/master/user/advanced/). For example:
 
 ```python
 HTTP_PROXIES = {
@@ -202,7 +212,7 @@ HTTP_PROXIES = {
 
 ## INTERNAL_IPS
 
-Default: `('127.0.0.1', '::1',)`
+Default: `('127.0.0.1', '::1')`
 
 A list of IP addresses recognized as internal to the system, used to control the display of debugging output. For
 example, the debugging toolbar will be viewable only when a client is accessing NetBox from one of the listed IP
@@ -212,11 +222,11 @@ addresses (and [`DEBUG`](#debug) is true).
 
 ## LOGGING
 
-By default, all messages of INFO severity or higher will be logged to the console. Additionally, if `DEBUG` is False and email access has been configured, ERROR and CRITICAL messages will be emailed to the users defined in `ADMINS`.
+By default, all messages of INFO severity or higher will be logged to the console. Additionally, if [`DEBUG`](#debug) is False and email access has been configured, ERROR and CRITICAL messages will be emailed to the users defined in [`ADMINS`](#admins).
 
-The Django framework on which NetBox runs allows for the customization of logging, e.g. to write logs to file. Please consult the [Django logging documentation](https://docs.djangoproject.com/en/stable/topics/logging/) for more information on configuring this setting. Below is an example which will write all INFO and higher messages to a file:
+The Django framework on which NetBox runs allows for the customization of logging format and destination. Please consult the [Django logging documentation](https://docs.djangoproject.com/en/stable/topics/logging/) for more information on configuring this setting. Below is an example which will write all INFO and higher messages to a local file:
 
-```
+```python
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
@@ -238,6 +248,7 @@ LOGGING = {
 
 ### Available Loggers
 
+* `netbox.<app>.<model>` - Generic form for model-specific log messages
 * `netbox.auth.*` - Authentication events
 * `netbox.api.views.*` - Views which handle business logic for the REST API
 * `netbox.reports.*` - Report execution (`module.name`)
@@ -258,7 +269,7 @@ Setting this to True will permit only authenticated users to access any part of
 
 Default: 1209600 seconds (14 days)
 
-The liftetime (in seconds) of the authentication cookie issued to a NetBox user upon login.
+The lifetime (in seconds) of the authentication cookie issued to a NetBox user upon login.
 
 ---
 
@@ -274,13 +285,13 @@ Setting this to True will display a "maintenance mode" banner at the top of ever
 
 Default: 1000
 
-An API consumer can request an arbitrary number of objects by appending the "limit" parameter to the URL (e.g. `?limit=1000`). This setting defines the maximum limit. Setting it to `0` or `None` will allow an API consumer to request all objects by specifying `?limit=0`.
+A web user or API consumer can request an arbitrary number of objects by appending the "limit" parameter to the URL (e.g. `?limit=1000`). This parameter defines the maximum acceptable limit. Setting this to `0` or `None` will allow a client to retrieve _all_ matching objects at once with no limit by specifying `?limit=0`.
 
 ---
 
 ## MEDIA_ROOT
 
-Default: $BASE_DIR/netbox/media/
+Default: $INSTALL_ROOT/netbox/media/
 
 The file path to the location where media files (such as image attachments) are stored. By default, this is the `netbox/media/` directory within the base NetBox installation path.
 
@@ -290,7 +301,7 @@ The file path to the location where media files (such as image attachments) are
 
 Default: False
 
-Toggle exposing Prometheus metrics at `/metrics`. See the [Prometheus Metrics](../../additional-features/prometheus-metrics/) documentation for more details.
+Toggle the availability Prometheus-compatible metrics at `/metrics`. See the [Prometheus Metrics](../../additional-features/prometheus-metrics/) documentation for more details.
 
 ---
 
@@ -300,7 +311,8 @@ Toggle exposing Prometheus metrics at `/metrics`. See the [Prometheus Metrics](.
 
 NetBox will use these credentials when authenticating to remote devices via the [NAPALM library](https://napalm-automation.net/), if installed. Both parameters are optional.
 
-Note: If SSH public key authentication has been set up for the system account under which NetBox runs, these parameters are not needed.
+!!! note
+    If SSH public key authentication has been set up on the remote device(s) for the system account under which NetBox runs, these parameters are not needed.
 
 ---
 
@@ -308,16 +320,16 @@ Note: If SSH public key authentication has been set up for the system account un
 
 A dictionary of optional arguments to pass to NAPALM when instantiating a network driver. See the NAPALM documentation for a [complete list of optional arguments](http://napalm.readthedocs.io/en/latest/support/#optional-arguments). An example:
 
-```
+```python
 NAPALM_ARGS = {
     'api_key': '472071a93b60a1bd1fafb401d9f8ef41',
     'port': 2222,
 }
 ```
 
-Note: Some platforms (e.g. Cisco IOS) require an argument named `secret` to be passed in addition to the normal password. If desired, you can use the configured `NAPALM_PASSWORD` as the value for this argument:
+Some platforms (e.g. Cisco IOS) require an argument named `secret` to be passed in addition to the normal password. If desired, you can use the configured `NAPALM_PASSWORD` as the value for this argument:
 
-```
+```python
 NAPALM_USERNAME = 'username'
 NAPALM_PASSWORD = 'MySecretPassword'
 NAPALM_ARGS = {
@@ -340,7 +352,7 @@ The amount of time (in seconds) to wait for NAPALM to connect to a device.
 
 Default: 50
 
-Determine how many objects to display per page within each list of objects.
+The default maximum number of objects to display per page within each list of objects.
 
 ---
 
@@ -401,11 +413,11 @@ Default width (in pixels) of a unit within a rack elevation.
 
 ---
 
-## REMOTE_AUTH_ENABLED
+## REMOTE_AUTH_AUTO_CREATE_USER
 
 Default: `False`
 
-NetBox can be configured to support remote user authentication by inferring user authentication from an HTTP header set by the HTTP reverse proxy (e.g. nginx or Apache). Set this to `True` to enable this functionality. (Local authentication will still take effect as a fallback.)
+If true, NetBox will automatically create local accounts for users authenticated via a remote service. (Requires `REMOTE_AUTH_ENABLED`.)
 
 ---
 
@@ -413,29 +425,13 @@ NetBox can be configured to support remote user authentication by inferring user
 
 Default: `'netbox.authentication.RemoteUserBackend'`
 
-Python path to the custom [Django authentication backend](https://docs.djangoproject.com/en/stable/topics/auth/customizing/) to use for external user authentication. NetBox provides two built-in backends (listed below), though backends may also be provided via other packages.
+This is the Python path to the custom [Django authentication backend](https://docs.djangoproject.com/en/stable/topics/auth/customizing/) to use for external user authentication. NetBox provides two built-in backends (listed below), though custom authentication backends may also be provided by other packages or plugins.
 
 * `netbox.authentication.RemoteUserBackend`
 * `netbox.authentication.LDAPBackend`
 
 ---
 
-## REMOTE_AUTH_HEADER
-
-Default: `'HTTP_REMOTE_USER'`
-
-When remote user authentication is in use, this is the name of the HTTP header which informs NetBox of the currently authenticated user. (Requires `REMOTE_AUTH_ENABLED`.)
-
----
-
-## REMOTE_AUTH_AUTO_CREATE_USER
-
-Default: `False`
-
-If true, NetBox will automatically create local accounts for users authenticated via a remote service. (Requires `REMOTE_AUTH_ENABLED`.)
-
----
-
 ## REMOTE_AUTH_DEFAULT_GROUPS
 
 Default: `[]` (Empty list)
@@ -452,6 +448,22 @@ A mapping of permissions to assign a new user account when created using remote
 
 ---
 
+## REMOTE_AUTH_ENABLED
+
+Default: `False`
+
+NetBox can be configured to support remote user authentication by inferring user authentication from an HTTP header set by the HTTP reverse proxy (e.g. nginx or Apache). Set this to `True` to enable this functionality. (Local authentication will still take effect as a fallback.)
+
+---
+
+## REMOTE_AUTH_HEADER
+
+Default: `'HTTP_REMOTE_USER'`
+
+When remote user authentication is in use, this is the name of the HTTP header which informs NetBox of the currently authenticated user. (Requires `REMOTE_AUTH_ENABLED`.)
+
+---
+
 ## RELEASE_CHECK_TIMEOUT
 
 Default: 86,400 (24 hours)
@@ -462,17 +474,18 @@ The number of seconds to retain the latest version that is fetched from the GitH
 
 ## RELEASE_CHECK_URL
 
-Default: None
+Default: None (disabled)
 
-The releases of this repository are checked to detect new releases, which are shown on the home page of the web interface. You can change this to your own fork of the NetBox repository, or set it to `None` to disable the check. The URL provided **must** be compatible with the GitHub API.
+This parameter defines the URL of the repository that will be checked periodically for new NetBox releases. When a new release is detected, a message will be displayed to administrative users on the home page. This can be set to the official repository (`'https://api.github.com/repos/netbox-community/netbox/releases'`) or a custom fork. Set this to `None` to disable automatic update checks.
 
-Use `'https://api.github.com/repos/netbox-community/netbox/releases'` to check for release in the official NetBox repository.
+!!! note
+    The URL provided **must** be compatible with the [GitHub REST API](https://docs.github.com/en/rest).
 
 ---
 
 ## REPORTS_ROOT
 
-Default: $BASE_DIR/netbox/reports/
+Default: `$INSTALL_ROOT/netbox/reports/`
 
 The file path to the location where custom reports will be kept. By default, this is the `netbox/reports/` directory within the base NetBox installation path.
 
@@ -480,7 +493,7 @@ The file path to the location where custom reports will be kept. By default, thi
 
 ## SCRIPTS_ROOT
 
-Default: $BASE_DIR/netbox/scripts/
+Default: `$INSTALL_ROOT/netbox/scripts/`
 
 The file path to the location where custom scripts will be kept. By default, this is the `netbox/scripts/` directory within the base NetBox installation path.
 
@@ -490,7 +503,7 @@ The file path to the location where custom scripts will be kept. By default, thi
 
 Default: None
 
-Session data is used to track authenticated users when they access NetBox. By default, NetBox stores session data in the PostgreSQL database. However, this inhibits authentication to a standby instance of NetBox without write access to the database. Alternatively, a local file path may be specified here and NetBox will store session data as files instead of using the database. Note that the user as which NetBox runs must have read and write permissions to this path.
+HTTP session data is used to track authenticated users when they access NetBox. By default, NetBox stores session data in its PostgreSQL database. However, this inhibits authentication to a standby instance of NetBox without write access to the database. Alternatively, a local file path may be specified here and NetBox will store session data as files instead of using the database. Note that the NetBox system user must have read and write permissions to this path.
 
 ---
 
@@ -518,21 +531,19 @@ If `STORAGE_BACKEND` is not defined, this setting will be ignored.
 
 Default: UTC
 
-The time zone NetBox will use when dealing with dates and times. It is recommended to use UTC time unless you have a specific need to use a local time zone. [List of available time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
+The time zone NetBox will use when dealing with dates and times. It is recommended to use UTC time unless you have a specific need to use a local time zone. Please see the [list of available time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
 
 ---
 
 ## Date and Time Formatting
 
-You may define custom formatting for date and times. For detailed instructions on writing format strings, please see [the Django documentation](https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date).
+You may define custom formatting for date and times. For detailed instructions on writing format strings, please see [the Django documentation](https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date). Default formats are listed below.
 
-Defaults:
-
-```
+```python
 DATE_FORMAT = 'N j, Y'               # June 26, 2016
-SHORT_DATE_FORMAT = 'Y-m-d'          # 2016-06-27
+SHORT_DATE_FORMAT = 'Y-m-d'          # 2016-06-26
 TIME_FORMAT = 'g:i a'                # 1:23 p.m.
 SHORT_TIME_FORMAT = 'H:i:s'          # 13:23:00
 DATETIME_FORMAT = 'N j, Y g:i a'     # June 26, 2016 1:23 p.m.
-SHORT_DATETIME_FORMAT = 'Y-m-d H:i'  # 2016-06-27 13:23
+SHORT_DATETIME_FORMAT = 'Y-m-d H:i'  # 2016-06-26 13:23
 ```
diff --git a/docs/configuration/required-settings.md b/docs/configuration/required-settings.md
index 053e2d3d4..d54b13e38 100644
--- a/docs/configuration/required-settings.md
+++ b/docs/configuration/required-settings.md
@@ -2,7 +2,12 @@
 
 ## ALLOWED_HOSTS
 
-This is a list of valid fully-qualified domain names (FQDNs) that is used to reach the NetBox service. Usually this is the same as the hostname for the NetBox server, but can also be different (e.g. when using a reverse proxy serving the NetBox website under a different FQDN than the hostname of the NetBox server). NetBox will not permit access to the server via any other hostnames (or IPs). The value of this option is also used to set `CSRF_TRUSTED_ORIGINS`, which restricts `HTTP POST` to the same set of hosts (more about this [here](https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-CSRF_TRUSTED_ORIGINS)). Keep in mind that NetBox, by default, has `USE_X_FORWARDED_HOST = True` (in `netbox/netbox/settings.py`) which means that if you're using a reverse proxy, it's the FQDN used to reach that reverse proxy which needs to be in this list (more about this [here](https://docs.djangoproject.com/en/stable/ref/settings/#allowed-hosts)).
+This is a list of valid fully-qualified domain names (FQDNs) and/or IP addresses that can be used to reach the NetBox service. Usually this is the same as the hostname for the NetBox server, but can also be different; for example, when using a reverse proxy serving the NetBox website under a different FQDN than the hostname of the NetBox server. To help guard against [HTTP Host header attackes](https://docs.djangoproject.com/en/3.0/topics/security/#host-headers-virtual-hosting), NetBox will not permit access to the server via any other hostnames (or IPs).
+
+!!! note
+    This parameter must always be defined as a list or tuple, even if only value is provided.
+
+The value of this option is also used to set `CSRF_TRUSTED_ORIGINS`, which restricts POST requests to the same set of hosts (more about this [here](https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-CSRF_TRUSTED_ORIGINS)). Keep in mind that NetBox, by default, sets `USE_X_FORWARDED_HOST` to true, which means that if you're using a reverse proxy, it's the FQDN used to reach that reverse proxy which needs to be in this list (more about this [here](https://docs.djangoproject.com/en/stable/ref/settings/#allowed-hosts)).
 
 Example:
 
@@ -10,18 +15,24 @@ Example:
 ALLOWED_HOSTS = ['netbox.example.com', '192.0.2.123']
 ```
 
+If you are not yet sure what the domain name and/or IP address of the NetBox installation will be, and are comfortable accepting the risks in doing so, you can set this to a wildcard (asterisk) to allow all host values:
+
+```
+ALLOWED_HOSTS = ['*']
+```
+
 ---
 
 ## DATABASE
 
-NetBox requires access to a PostgreSQL database service to store data. This service can run locally or on a remote system. The following parameters must be defined within the `DATABASE` dictionary:
+NetBox requires access to a PostgreSQL 9.6 or later database service to store data. This service can run locally on the NetBox server or on a remote system. The following parameters must be defined within the `DATABASE` dictionary:
 
 * `NAME` - Database name
 * `USER` - PostgreSQL username
 * `PASSWORD` - PostgreSQL password
 * `HOST` - Name or IP address of the database server (use `localhost` if running locally)
-* `PORT` - TCP port of the PostgreSQL service; leave blank for default port (5432)
-* `CONN_MAX_AGE` - Lifetime of a [persistent database connection](https://docs.djangoproject.com/en/stable/ref/databases/#persistent-connections), in seconds (150-300 is recommended)
+* `PORT` - TCP port of the PostgreSQL service; leave blank for default port (TCP/5432)
+* `CONN_MAX_AGE` - Lifetime of a [persistent database connection](https://docs.djangoproject.com/en/stable/ref/databases/#persistent-connections), in seconds (300 is the default)
 
 Example:
 
@@ -57,7 +68,7 @@ Redis is configured using a configuration setting similar to `DATABASE` and thes
 * `DEFAULT_TIMEOUT` - Connection timeout in seconds
 * `SSL` - Use SSL connection to Redis
 
-Example:
+An example configuration is provided below:
 
 ```python
 REDIS = {
@@ -81,8 +92,9 @@ REDIS = {
 ```
 
 !!! note
-    If you are upgrading from a version prior to v2.7, please note that the Redis connection configuration settings have
-    changed. Manual modification to bring the `REDIS` section inline with the above specification is necessary
+    If you are upgrading from a NetBox release older than v2.7.0, please note that the Redis connection configuration
+    settings have changed. Manual modification to bring the `REDIS` section inline with the above specification is
+    necessary
 
 !!! warning
     It is highly recommended to keep the task and cache databases separate. Using the same database number on the
@@ -125,17 +137,14 @@ REDIS = {
 ```
 
 !!! note
-    It is possible to have only one or the other Redis configurations to use Sentinel functionality. It is possible
-    for example to have the tasks database use sentinel via `HOST`/`PORT` and for caching to use Sentinel via
-    `SENTINELS`/`SENTINEL_SERVICE`.
-
+    It is permissible to use Sentinel for only one database and not the other.
 
 ---
 
 ## SECRET_KEY
 
-This is a secret cryptographic key is used to improve the security of cookies and password resets. The key defined here should not be shared outside of the configuration file. `SECRET_KEY` can be changed at any time, however be aware that doing so will invalidate all existing sessions.
+This is a secret, random string used to assist in the creation new cryptographic hashes for passwords and HTTP cookies. The key defined here should not be shared outside of the configuration file. `SECRET_KEY` can be changed at any time, however be aware that doing so will invalidate all existing sessions.
 
-Please note that this key is **not** used for hashing user passwords or for the encrypted storage of secret data in NetBox.
+Please note that this key is **not** used directly for hashing user passwords or for the encrypted storage of secret data in NetBox.
 
-`SECRET_KEY` should be at least 50 characters in length and contain a random mix of letters, digits, and symbols. The script located at `netbox/generate_secret_key.py` may be used to generate a suitable key.
+`SECRET_KEY` should be at least 50 characters in length and contain a random mix of letters, digits, and symbols. The script located at `$INSTALL_ROOT/netbox/generate_secret_key.py` may be used to generate a suitable key.

From a770dd48368b31341a44683c58717dbddeaeb022 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 09:18:13 -0400
Subject: [PATCH 394/505] Updated circuits documentation

---
 docs/models/circuits/circuit.md            | 18 +++++++++++++++++-
 docs/models/circuits/circuittermination.md | 11 +++++------
 docs/models/circuits/circuittype.md        |  4 +---
 docs/models/circuits/provider.md           |  4 ++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/docs/models/circuits/circuit.md b/docs/models/circuits/circuit.md
index 47320495d..9421f94fb 100644
--- a/docs/models/circuits/circuit.md
+++ b/docs/models/circuits/circuit.md
@@ -1,3 +1,19 @@
 # Circuits
 
-A circuit represents a single _physical_ link connecting exactly two endpoints. (A circuit with more than two endpoints is a virtual circuit, which is not currently supported by NetBox.) Each circuit belongs to a provider and must be assigned a circuit ID which is unique to that provider.
+A communications circuit represents a single _physical_ link connecting exactly two endpoints, commonly referred to as its A and Z terminations. A circuit in NetBox may have zero, one, or two terminations defined. It is common to have only one termination defined when you don't necessarily care about the details of the provider side of the circuit, e.g. for Internet access circuits. Both terminations would likely be modeled for circuits which connect one customer site to another.
+
+Each circuit is associated with a provider and a user-defined type. For example, you might have Internet access circuits delivered to each site by one provider, and private MPLS circuits delivered by another. Each circuit must be assigned a circuit ID, each of which must be unique per provider.
+
+Each circuit is also assigned one of the following operational statuses:
+
+* Planned
+* Provisioning
+* Active
+* Offline
+* Deprovisioning
+* Decommissioned
+
+Circuits also have optional fields for annotating their installation date and commit rate, and may be assigned to NetBox tenants.
+
+!!! note
+    NetBox currently models only physical circuits: those which have exactly two endpoints. It is common to layer virtualized constructs (_virtual circuits_) such as MPLS or EVPN tunnels on top of these, however NetBox does not yet support virtual circuit modeling.
diff --git a/docs/models/circuits/circuittermination.md b/docs/models/circuits/circuittermination.md
index a39236314..1c0dbfe18 100644
--- a/docs/models/circuits/circuittermination.md
+++ b/docs/models/circuits/circuittermination.md
@@ -1,11 +1,10 @@
 # Circuit Terminations
 
-A circuit may have one or two terminations, annotated as the "A" and "Z" sides of the circuit. A single-termination circuit can be used when you don't know (or care) about the far end of a circuit (for example, an Internet access circuit which connects to a transit provider). A dual-termination circuit is useful for tracking circuits which connect two sites.
+The association of a circuit with a particular site and/or device is modeled separately as a circuit termination. A circuit may have up to two terminations, labeled A and Z. A single-termination circuit can be used when you don't know (or care) about the far end of a circuit (for example, an Internet access circuit which connects to a transit provider). A dual-termination circuit is useful for tracking circuits which connect two sites.
 
-Each circuit termination is tied to a site, and may optionally be connected via a cable to a specific device interface or pass-through port. Each termination can be assigned a separate downstream and upstream speed independent from one another. Fields are also available to track cross-connect and patch panel details.
+Each circuit termination is tied to a site, and may optionally be connected via a cable to a specific device interface or port within that site. Each termination must be assigned a port speed, and can optionally be assigned an upstream speed if it differs from the downstream speed (a common scenario with e.g. DOCSIS cable modems). Fields are also available to track cross-connect and patch panel details.
+
+In adherence with NetBox's philosophy of closely modeling the real world, a circuit may terminate only to a physical interface. For example, circuits may not terminate to LAG interfaces, which are virtual in nature. In such cases, a separate physical circuit is associated with each LAG member interface and each needs to be modeled discretely.
 
 !!! note
-    A circuit represents a physical link, and cannot have more than two endpoints. When modeling a multi-point topology, each leg of the topology must be defined as a discrete circuit.
-
-!!! note
-    A circuit may terminate only to a physical interface. Circuits may not terminate to LAG interfaces, which are virtual interfaces: You must define each physical circuit within a service bundle separately and terminate it to its actual physical interface.
+    A circuit in NetBox represents a physical link, and cannot have more than two endpoints. When modeling a multi-point topology, each leg of the topology must be defined as a discrete circuit, with one end terminating within the provider's infrastructure.
diff --git a/docs/models/circuits/circuittype.md b/docs/models/circuits/circuittype.md
index a9ae117b8..aa8258e04 100644
--- a/docs/models/circuits/circuittype.md
+++ b/docs/models/circuits/circuittype.md
@@ -1,10 +1,8 @@
 # Circuit Types
 
-Circuits are classified by type. For example, you might define circuit types for:
+Circuits are classified by functional type. These types are completely customizable, and are typically used to convey the type of service being delivered over a circuit. For example, you might define circuit types for:
 
 * Internet transit
 * Out-of-band connectivity
 * Peering
 * Private backhaul
-
-Circuit types are fully customizable.
\ No newline at end of file
diff --git a/docs/models/circuits/provider.md b/docs/models/circuits/provider.md
index c8e19f6cd..e0847b72f 100644
--- a/docs/models/circuits/provider.md
+++ b/docs/models/circuits/provider.md
@@ -1,5 +1,5 @@
 # Providers
 
-A provider is any entity which provides some form of connectivity. While this obviously includes carriers which offer Internet and private transit service, it might also include Internet exchange (IX) points and even organizations with whom you peer directly.
+A circuit provider is any entity which provides some form of connectivity of among sites or organizations within a site. While this obviously includes carriers which offer Internet and private transit service, it might also include Internet exchange (IX) points and even organizations with whom you peer directly. Each circuit within NetBox must be assigned a provider and a circuit ID which is unique to that provider.
 
-Each provider may be assigned an autonomous system number (ASN), an account number, and relevant contact information.
+Each provider may be assigned an autonomous system number (ASN), an account number, and contact information.

From 31c156f792eb7acb08fc2816339ed31e70afc74c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 09:48:55 -0400
Subject: [PATCH 395/505] Updated cable documentation

---
 docs/media/models/dcim_cable_trace.png | Bin 0 -> 14950 bytes
 docs/models/dcim/cable.md              |  41 +++++++++++++++++--------
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 docs/media/models/dcim_cable_trace.png

diff --git a/docs/media/models/dcim_cable_trace.png b/docs/media/models/dcim_cable_trace.png
new file mode 100644
index 0000000000000000000000000000000000000000..9597c88286aa86fe2f308b9fce5cefa33beceb82
GIT binary patch
literal 14950
zcmbVzcU%))yDc375fufbBLX4<(rc(nFVdx}NC^l?2_<w?5T)b=1JYGOCqyLlCZeE%
zlmJ0`CqU>BLa2A}eUIlm<=%7e{UiLCnZ2Kx*|TS_^{i)2++8DWMtXL7GBPqoU7g#e
zWMt$^!0*l(8eq@2^Oq^e$P`6&Z>yUJjjU!fzOitwBNA_MEO5}U-G8Pobcg>dugvAP
zYu{N@=#vUwBVOA)GUeoFN`J{BC^)aZ@lrSDs|4sT6O;Xgj*6K##U%G-4!9u6<c(X=
zJvSS?{mEc`tSdKmB%~(?#1pc+9$`<EsU+@?Rjv_EKs`sw9>#)C&ug6Fd-i|-2VBA>
z;r=U2&fxLMCig-7q~yba4K7h6zXLywLp-O{%zDH6;BJ~+3uN*n{lhwU;qpkz@tMnO
zaHjwcKa9gc^YpIVN@Yjx=8vcqc$*_v3$7MNRGLaqy+Vu`H(C=xJ?50W)_|@qU&w!Y
zE_aJa!gVpEp5UIhW{g@<$&E+YKiMweh$Fv*Uu%-BuVzIli0^H@Pl-O7tY25fbKs8^
zAMU(hXtVn^({d(1#MxeR{A2z8$f|ePf$edWm1U}xk>aA^$r;p1XM!e258e=^TvT5V
z-A1R!DxXyGIJQ17?!8xcoP7VsfG$dw(c=*EhS@VnLZbmXKgIVnH|U_Dp!tQBWwn)&
zihm0iff2$)h_N!_kap{>#M${^9rtFLU-ow&PpQTXFb0ctB?Ks6d6(^w{?k%5aN^}1
zr42d_pXK){4p;1?_J(tIe$ZK1Scr#CkMtbpsLD^bcl4;P!ZSwrGA%~hGB40K`Q9CT
zm1b8n7kn7?WY!56zWBBEX(<n07}Yqx$m}xqohL)*CBKWIg*TM?IR5TJDlvRxk#>{%
zs&GNK{9;_r#t%)Ib4}BK;f2S~7c&deFkLyk=<IDit>~}w6DFjI`oj9c9M$Dg>Uh1%
z$|3xVgqim&lfm4IVatK1aZKGuwp^{tWt~ZiUi;&F<bM^)9pOzw<_kK#?Vzd=c2}+J
zYL`_Vdd_uEBpT<@V+$_hTlUU|tIfUKwi1Jyv|Y_NXj}yz*LdflPn_Mm4g+`hSmo!&
zd3wMd4|Xb_7+jixKc%%gdH1@mCPDS4$+vs@p7yJ`74GK6?B<|FfyT(|UqoUD&XUZ8
z{k)|j?!AW<c^8eov;YDauEIq3$V_yuTSZEfBQ8*2s9=I;coWXU1pjQ)0Q<Dg=rF5g
zkYUb{gDG?<fge8=f{xda4E!uoTAl3A_IWjSzSF(`9A^aD{A(!kKifbbpy!`$|2nn(
zq6npjY4Qt4+SIvqj~{#hMml8fO-Jtj+M;~t$@XW5gDeK|jLA*XPS58kX$`e{wv#8b
zl&+ktWp)v|Nu1lIs`WP&V-7!xtLAo7>JT41!@=1Pxa1{jmyYpz;aw85T6Ydk20ltb
z=cU5eTdP`orwzGs@w2#G`qR6%U+zMX9zh_GTPIn;0;&rFllLyJI))Dq<$AY1FQi;*
zjzL4a^<FZd95}0T{2%NbcM-X)x14f9=B+QhZP}d_0m3c^d0|#7h(V{fye9c&H|rNS
z2{E&x&r0Q;ULO&QvJ05SBy(@?Cs=8#2%jvM_7E4I5?9F}#ujHI{i9$Geg`j&)^m?}
zcvfoV<&Hxk9S0PpKg9Kn;9tj+tJG8jTMw@GHXPX0?`JKBi4J*GDH2AS7ME8`VwF4>
z_*z^0nO?BdA1j1ycbC3*;tATDE83jm5fVi=tGpVuxk+H8MqFUugR!8;h%(o%e*h0(
z=-|YH(|HStbFN!T+a?x51RK8d4Wpq!eY$-ITh^r9aAL?(Y50f6HrlEPt`44z*K*vX
zi8iH1^9kz}97jWlM{ESeQaBYjVRYo9fQTwrlhB93!J#$Na}}m9+GUb|NG;dZ<4N;g
z0!ZYnmZq7ewzq9u@zAlNQ23*O?w-OPXS};3c55|>juvs@hPaN1k+r;#jcj9n-7E-l
zH57&MeL6ppvKv3a{MwTP64XT;0PEfeWN5aW_iyv${l=WqXwGfZg{wSDnDn~|TQi0Q
zq+KyU-pPMez>=D*LnnoBc`~49{_u(pGB#|!{#D*kbVGvo0j&Dk&@r_s()Cu=T;<Sm
z6aE*CCzq<#u$`!hr<~8$M4tzj84A*U1fjSB(^9Js<@L;YzwtmMH`(!f&DgXi<lf;s
zIm&~Og>D1R6l^#Z)K)uOBm$n6j$010Bp=)zY3CJT5?$D~#&xRjz}5<3)vr*!>o$%L
zL^U|%OtxyjyP@C+Fmp$l-CQcfoaSR{?r3RC(9dA54ol&V$!_sMG&*rn+S-7TtdwSF
zi0+XZJNeSq^PP%9PUa)A2uW13_mx`DpdLkO3Zz4(`0%Z_Okn)R^)b38n@PPTSp#9m
zYNv)Nqs%j7@E%&k0UZJ&;h9eMm@b87nbFpI1lk>4`m@9`I$vFJ^09Z#qwGud!pYTU
z;BQzH%nkC(0e*i@8HJAOBg^tAKr`IKfBM!UUH(`FF556lm_l!(xkGHOLE5*%R1(0h
zP;jaOY>fgjex;9H+sD?&{qo3JHHN?tcq)>(BII!KwWspP>IM88c7~yFLP&e&^EIsz
zztD_lsUi=gj{N_OvDDkb?jVoCk5z&JB!~RFsNvP#qLD&RsqV(?YdW@9>>nK5{gyQE
zw0!Bx-TBtK#Bq3!Yj}B_n_4{+ACl_)d4kynx`HXHTfC=e(AC+E{2sn`_On;;7vsij
zIvicp9vni|h`!2^HCY<p?4*l&-&c1r<Gyu<A9{VtcAVbno=*=~j5@2s&pWQlCwl+8
z>VU*~PNZDfd8%;<yVfD-&n;fhQUys}vaX=*fMnj)bA!Xrq)1s7B7;#roy)R*cG+B9
z9bCRQceV*cp@%n)I}NA|i5JL;6*pV^KNU+j6EBdlE{4wtsN3j1NT5J^w~WrwhGeyN
z>&HDx`9(E~@L^H15_n>Y?@J|i{PV;~k}2`T*KvpKB~P~`A%bOXype?o#QpPz8RMSK
z&Iht?4cw1GA;BNQYvP<`uUU8D`h9>dD)bzM5KXBPxPk5y=9|>I0*PwHU-Y80#7cJI
zuh~XgQkO_zBFUo(b#w!5C#n#rRCR{XjLiF(e3JD}Nj4=Q)FWyH2kD_aUEGiE_6!nr
zf2LX*D=y&^Wd73UzLxabs(8k2l6g9U<Na>l5y_F|{m?=ON%_~27z4y+!0j%r7XHi>
zN$`6CFg4PM9pVzxJdgiIgbgOyGyefI$PrP0;3g7S%>iin124>K?7*`~U_Jk5&wm1(
z|I(RvUl<`|G$F($<t1&R<+In-2E=SS3vT?#+2rd^(yWJ!d9{LCLY`mG`{g+XEYNqw
zPxswBEbMv@8I%79$H)<W9wIOr3`ygJfkh`z&r;U*hyvJt9^_oi*Q9we#i2vFWVboU
zV=t(q`ur3;0rVC58X^EIzogSCqN(F8=DY@i5|~<cE&|=^9xg5WMHf6^B;Fq^isn0d
zbCwP0AL^h`>#||2pC002Od=|@&|uUQtvDl=LmapOrgpXzU<p-);wr%mrx9j;1y?%I
z`#FP!nZ0-4_~b=O!@95VYcoYCbisx9q)YDq<UWb1NTLMuW{bomu+<|69IS0+ik6A2
zj)4;ayo`vH8MDsrGZ`5iJfHJSo|gt}Of9S4Y*;(AijsyIy{r^F{)LASs#;d!<}#H4
z<|!nn><a=;oc(aTX^4j3CgX%<;hVHF`@62OJ|}I@rFtuhrKoe@VCP@2CMKL56x@2>
zaxjH;L>U8D;K|27a)LZ)Rz%lriUdh%oS4dH+RFjR)B_w`h0ZtA8idvrlrMCG(nAsk
zhnI6(R*Rn2u#D(YVJKNKP^|ZFl9<F9&=5-Jq2*R+b*`ApcYSnHhVb=s(?uO7b6|*t
zc<Lt;3*Ir-?8I2fmcZo$lCU^&Qu{?-`*$#hk6Zn%ixr}%L{6E9jFDQ`sRv{<z1UlD
zzgQWz^>{(&`9x8V!Ca)8f(HphJJnX*j18;CElZ*YjkO!^Nqud@x=fptOHt(DDk`g^
z`@yF?pmpM4mE^wt;(;-CV1V-}6aVW;5j@9ob<sfjs7Ta~S|l0|4{0tw^484EJU+kh
zsjFG9dE}OhoQzx;%Ezs(a`-U;4`GC$;@M<EWAA7>^{eU=Xh{><EsWt?Q+{Cq>fy~x
z^HU?<CpYg^?P66xNr)DGVd9WviOdt!15f*(le7TIBtB@%%<=T(sN`#0kXi)s4?s|l
zxrZCy`MAwm20Mp2jhC*4VWrFJt~u0gPP1M$?(J#by2f>o!EvngvRRplfdnZIGnELv
ztzTl5$SJke;5-c{FdEtdS3(!adXqFWRFD4o!+Y$adex=KoY1KUeG1q0Dtb)6;F{5b
zin+-eP=EY6<;(9T274d0)xc+t;c}N}P14G0`L;UOxKDN+RhZH1r1o>DL)6K3smgXo
zrq@A4Yilgmu#XsokkHyla@7uZVAn|+aoCL;8iI+rWFqb|*&HYm8LYHfYt32f8Y0Wf
zyD0!V=wHK&bZ{wdH2pBtOm*12a;GzI@Lo_qg7RtAWQ)+Up`-uTk#AC}0odni^)-B9
z+xEuSQs4S{rl77NoK>4~N!b@wiyuAAe{DBqi8saFTk)0iH(Jj)in=~r_VqW(d#(m;
z>j`gpwLTw>4i(L9`A#|iVBh{gXZsp51+{WBLTXafrS2r~E^TL6#4a6AVkol?@fHH^
z){rpD?|!9fwZaN*(5vW<jpL##nuoRo?|myW_oO5KWt_zd2caM97<&5m*?saDmr@Ng
zx#c_X#w|N+Lb`62*oT~b@8s4bf*L<BT50++Q9P(#?h|CPNyPp8u%h0%g#KT?@aQqg
zdX-nZnc}2#@^h;uTT7Lv4B4L@G0(j9xwG7whm=N|pyN@_Ytvs13(hBHHk#ty#?ht~
zy9dR7EtjMjJrfU&!;8Y)!bCGeMy&gwohX~3Vk)nWK%&5;-%wxkT&|Z)Kf(5Bjq=xe
zZL!>X;6&oVC+(}b)ELlNum?%Fj>^4B<se$*JyB(w1kc8j=3K?%E}E=o?{E6Of7CDQ
zK1lbb{(kD4)F8d9$kMP9^Y?@*aU=?$H{lauW8eFltHj}-s}id#u9<8Zg&mx{Y}eY^
z|CX2Zs=9yOoss^yf5OLr%A*M@0bi+0?lF9P%96XO!6BlK%xC6bZCz<99NJ<gWd!G2
z><k3|rAoK9C5J2>q6yr76r80fGh(Sym}?1nT^NRsC2HpgezFz+6{>%L4S&o<Dy}wj
zyJ>w~Zj`j^5nk%7sNHJ04sq6a(`bXkhtu$mx4|rZYw>4l^~w>R{uR`Y0xud8F5bZl
zUpR}Qa5bH=)wo_fptoZS9@#zO*}uKh&~4aJDG7sz4Dj~uva^~b*L7Y_Dd6NJd}APG
z{(dNYFf1oa%{%dR3GtoI@n~yPk}Vf+a0V#{yBUQ`YZ#o?$tauOuW2+_3m7u#_^PO`
z7}GdtUp`rtK)^Cw5j0=7jlYhtJBQGx0(-<+7o9C*$V4X?9-A^4;_np&mJ$bTWqV8V
z(-|-<?olPQ$ZO_F!!}QC3UY5i3d3^vCrA@T7Py>O8oK6g3N)u!%@BpY5gi_Tl@TLL
z(&wIsrYLvcc)5VuYO#aKzFk(P3RbsJK|)scph&0uFhNogbhFuN8RTjE?Tb7dGhdpY
z<#`Ul5Q$b*xXOwUwT8PLf3>_fQ};cS23+;!wY<AU39fXaA$joPcit?KDD+L?%}dX#
z&;8E9&g&d-#RF&QEul=AGp4CWOjI+0S8bn|_t-lWOI9IgHAV=l_AU3pNp3v4xEU+6
zBN(dFb$;l%Q8zUvj0y~|Jo=dQ(_kQcjLwzBi_EDe^Azx9FwFQcTY5XsH~vInr&&<?
z%!*=ai(UQ`>eDQgNR9A}AIY9`&t@hv=+Q@^W7ep2Sz#j+&(Vs~;e#glZ~7MGcROwr
zx8*rE(;h@x&Z;FO<m^%0;I*gFDLq`NMoSC6dm{b@inQqwOuI}0uA;Fh32^nb^&Qz1
z?L)?UNwJBNRs-d}dwxt;DnECc8-nP-q(s~L>P?5%J}z2pC_5=dNidrUlQEfRTG_x8
z{E-2CU@AD&W5J##j&JnLUGs%J8ZgldS+HiLhh+F4=IlE#oSxlQcf<yKqrb?a@GgV#
zJgY$T&u?OvFzl1qaOzMl<JmF2+f4yN+18Y5>%}sKo{t}<i}rk(om1o)Ckt7vbZlkj
zI3-H;4KT|yKb9dG5ykv`su<{&d~oKWev;YzJ~urNCPVHT)9WF3Rp^{~i${y>lEHZk
zO0|PD<7G~C0{6OaT4vgEV0P&)9IMIFD786jqf3qmA;Z+~S&sBR@AHU=S8p<_xt%v(
z-z)ZP)kj#M$i_b$Y@H%_sLL{vl!z02)_rHxLv>lS)C!5)AIqsEx2MY^9B%z3T60u%
zXBh6i)EAsOV;c=zCnY6j!D1mncLF}=7hT(k;W{@^z1;UBbH@$N1RYATciaK#c1SQ?
zn)AGxuDWT}7HOl6-{*eZd2}>)1A<q^Q0NfJ5OEWLd~lbfk+IlB_HP;lJD@}S(HH;;
z0bncts1xjfF7fO<u>CKz5m;n?D;lRGcY6E}(*yXA7NBJS6zSg-3ZUZ|K)X20tHV@M
zer#swIi4EDHoP*$N;`vdcXNZD>AYPOXkni{9&MFsH83crth2D|?YUqad0rz(;OZtI
z`JryV_@a4+ukqqvL4XEmb@lcPpaeR^=_mtw;Q!p@v&e=2DayY$xyB91jQ`z<{!0_M
z@r)sZlLZ^`>*yp)`^>G31|ROu*|53(m0Q?neHhJ%B+Xer^&(R^qmvOE{&SFgyy1f~
zCMU1PGPbHO#MKpwrndvcsb{xRzv4bzjbBn@XS}V0r?KbII^Vu~%ZqL{W={(nV*Fg9
zf&=H{N{+Wb&r{k&d(48|41OZ@UT^UBdbk5m2X+r6^Nr)xFYl1XBWh}>y70QX%-Miv
z6<@(Yi*{nP7`M0TBV<iC-VK#m?s{w<yLX<)#I_e)0wT~`_=Peps;K<5wd9y2s*iDq
zvg+U)YrYPW4OOmG8c+gV)u7O<fttB{uHeS*bh=LVS&k|Y^^6$8bG%(lW274IE*xs{
z*dVFB_2-KlCTY0Z2muQW_cx!Ds`mAo%Vc0%xzRg1H47Ut*9>2kk`)S=pQZPdCIg$Z
zz#N!`2=ScwGl`XrEO<m$i{7IsW~GOk-vrg5;Im!4$8{qOd?~z0j==27?3uN_U(a=L
zl{Zzov&Z6#G^%9QAPek)Imsle!SD92USqY8bsxev+%+{Q97n55W*EIAT^MzL;)9@>
z-I9GqdZ9W6!em$-Y8L9`?>zJ3ev`nt@ej0L<zmMXg~7PZjLJ0xTb7Nt=Q$m@c3gqP
z)^i^Q(%xQ^XZq(KGhRI$K(_LlaC3;2u7PoLo%U<*#Kp-TPi_Q~T@G|^J6b`3H|%aB
z%5bv@B+)!n<4VtQ)o+k(-AUhN=%PGK%b9U$_0F}WvfBL6P>M@O7092PA!eq~4Q5l`
zrt9IWJb9vPe5kb<1xm1aTt<$tS0ibQEl6c$q2nNPUfl+?X2X<`>2$w9eZRW4bv(m2
zewaE3ub$pL*k}!!gP$SLA!^{)b&=O{sFn^cVsrmmvP<3K3$q=I)JfKxFeV2-gPz6c
zX26COnn68Jcc_KmGG#f`Ff6qP4c9+g&5%;kUwmF9bDUK<bD;b}oe9ww8Hwh$U39Or
zH3hrhIXmTPBqB?P@nEhddVBF;GNrORJ|_dI=4;!4T%`CzTlMvrTDiuyhK?|u9{pbv
zB@g<UdB+_-9fjFmz}aySmx0lUV5fFeJ7UL_N|AW1-Qt)dz=!*9_XK~jc(>eIyCPSh
z2DPW3+g69_yWrTYOaTV4rBCd`Dl_^d$azo<b?p)AHjj$54!3Gu6$N5^-odIv_TO^C
zn)y18K>6Q#JV1LIH65&XTVi(5UEOq7!8V*IKd(cm{ozQiGl-8G!&LYtT4`ZL6RJ7p
z?rj8~239fp{;jTZX2meioln)EHT8r0s#4UL&WpRn^dlbW*-};ZIz#Q9UiwRnJwNA;
zDe_4bs@EW5Uf=x1DuHK&g~{^LZ2nwHd*R|5(A_P2f8ru)UA3n1Mv970S9Vt)Tg^y~
zg4_ot@YC9pRdutO?K)~5esh@3OwP`3S9wYa)%0Z}6!y{=qFZ}|H;+*i`mi;dOjbB%
z5!%Br7V;#lz)xXpJqibnch?gPHW*C|abyY>&<LYgN|i5Ob!p(EL4sOp2R$lsSXv?+
z$KHdaVy4U_g4PXcB?7;=JW+SS$?vT^<ER{$V8T~SUKDRpo;a!Q>b9O%V}Ey;kvgmp
zI5)j_+{{<GJ-R3BqNtkL*d6sYvdn!XFHz{GK_q$&mG9#eVSDHha!#kF1HbZuV~<t7
zX(}Q8aQji2#uL}Z)t9w=9|iiWP!jFHsK=t!H@nzg1V}B#*rg5=F2os}#Wge$GG;Ra
z;eJm=lir1g7Hq4oy~*iyBA&Er$xh^QxtcYu?_NFTekFDIl+k?HJ%JCJ>z6cnWs*4j
z%wc<e6Xc5j`D(~^b;oy=2Uu9t>x5(Kuwebj<*jGuK5x}d-*<Tbph`n1?5F-lY_-_2
zeWdga1|9xWC^#P%`v(f9;s2lo-$f?AXB&F|pvC`VlRudAzmM{#$!}QtPbZp>G?&e6
zlFLMfyYsfcRexH|_@!s?u47G9*PWt38Trg6Ce%$-5vue+eOSoB%&84KbP^Py_S$$w
zw!oP-HSX@Z``(9lqZ_$fFHQJky=ng)i~qk-`h@(y05|~M{}v7a><houqJKcYUR7iN
zMKLYS^g?kT2kVqvV3>F<X&+wP$#d{E=8K=ll|Ifc`9s)L;<}w#@^&qu#gaPdaHk*|
z8#W!t@$~yalf>Ts<y=b484EJRXh)JEL01&dh-$<wRJGc3l<V7zi5n=kVEg!=TCXcB
z*PdX#;d9E(RqoasU2TDLcDM}jY#xKGUT&_IY8Rbb2a8L93O`1Vcol^{hD95i?r6;z
zy7BPbw3b#CM;I$D{W8Ms!o_bUR{wM<ed;*Ax$2eO#uFaw=O3>TDX!MCIwjn<54;9H
zqR?vx*K!YcWzu$ETK&NL1}CbI5P#^WWnIpW*zPTOuMXbqCk$zIz{GLUwb;77%G?)<
z4@R`IhP`JTT04^_84(Ti;5&|~lCPDYt0@XAFqXek3Gl7yZcY4)2{U=LpO&{>#c~y<
zRpiSHTK_`aDYjbJ=6vdpQCyDlNRJ%P_WR&87rhgeLS#(LC3Jt8#g$}GEM4V8s+M0g
zk92=r#55AX!Q5&hdbQOg|I*PWq1na=rR?Kf_{FkR&ly}rQPp&D+{Vm3eL1XZV<*Il
z581mpo~hko_R4Vd*X9^@HfvZaZyW80@y%|4Kldefe1i2Q6r3g$BaDQid8d-C;x8gC
zu%Ykb3%Q5Q-*9Eh;e)KIqs5i)h|+Tb-^dTN@ox6P38Z59s7zPd0=$kFdE}Np%7;<-
z6%J9(&g&jb#mn1hYldv;1sCFpX<=*qak$N=-VSy8V0+EDk@7bsnqM_-botKjKluKD
z)ggbrNBlVGLr`n%d!kG`@0oDFuXp<P>)$||Hu!}g?xdv|hL<BrHa?a#6*Q6RvYurE
ztO(@J!-M|1#j0)--FKFmjxK$!SOsvr)@bqOgZV20_T@fHIN2k_l%*(4%k93pO;g)7
z6dE!|yQPK{@vbm>rL3(Y6jXdzN~8wi2QxarT;vW8!fJR>a0b3@t6Cb>MGbE48_#VV
z>sH4h<`tVq!Ic;5rpgHOg<CqS+BxZ^a;qKbJUPrVc3TO~luKd;oRtjsStmS6;IqG)
zrdU!#v3`S!?%8$tA`{+EfmLHjPjrq3T^WZKtNkd4@*r%Z^QNAfCo1mjZaO^PE2*W|
zH_%GY7?^ue)Jq0Abk$pwO)T-_bj46()i5`@$Ytd>Cug38!+Qxm8lB_iRwez2b8(^8
zpogTK#HGNZ<Zg>x>rwxzv20nbZ0t4-CYTrb>aA)c4|W^<>V5k2aLIa*KI=p(LX5Lt
zZ{@j$4d~&hrNlN@EHzF{xhc=NAXm4;tVlZV`=x+TPus3H068!6<rAIM+0vV29iNto
zvQpb27CIDTEv$bXcJQDq>V`!tSn0u&B1m_){Ks5UDUvE>iAgdn$$E$O&(WXCXfy&B
z7$pR=T@4hM-rtifARmPO($%%NiP$EW7=pULxc71CSNIITJtF-BI}j<MCKCll8X2f%
z*Nl@r2l!I^mkP9#(9cZ?)wOeoK_{!rYLS+7xj00~6^v~2wCesN{Ky+!Z{Ri}0<$^{
zSu&sfuADZ}fjQbBLXSvIYZEbOE@Nl6i0%a2R52FJmK~!~N%U0eag@Kfh7D`Ki%|os
zmh<JRFJ<Nq*AbqQHi5jzy9#=<m^H?CTQ$`~*D6C{Yd>bmPct1L(cEHzaE~RvXf*Zn
zd)!zf0_z?W5xs=5v^Q56&(6&A8>q_|!bSU+(^a#_m=BLB*O>Bx1mg2$s$^740j1`B
z^E<Cn4!&C_eVMT83A9*|7+UOQa<{hvko<z^^BFP%xb36Rf^o%Y#N5a4fP7MO0Y(MR
z)OqK5^!*Zudg+72w(*H#%+PMnbWiN(Fw_~R0Jf@MH#F>tKkE1E8<HD+_dXOv><S{r
zC(w!#TUSAz@3o5`=NP|(VeeIzM6Z1reaMG&@^DmS%}!C2zvAs{g>kLciv4-t7)qfP
z?v(;Py1sCsY{MJA2!{}4n09GVS(X;|5Uc(V?KqbnrG@nT(jL0z{k+cT%(WJ=+Ti{K
zE{SSS1CzIRdn6p!P3GC`{afsun7>lF+3Og}_HKuVW9YN$5{m(?XYi%IV$6j8h;exb
zVqj!Ifvz^(!>Gf^eY*HI%I~`WAwmTA`qJ!Z0N$T*XgtL8!@}<6)~_Dj3`WOuapLPL
z?^ctZme7JY7Cybd^)X0XqpnFZ^XCKzUAIJ<RguP%q*0t!2rGIq5;SJ(sk9pX%Vqg*
zX>);VbCTQgC!?Q$66W!I<?+oYlcfv<0VK+=Pl0aWxbi1B*E)ebIRC^y$#BZ>fTr^y
zs1k{k85F^Z$xlD826d=d0}_5u(<)rCSF(ylWs{WDJe70b^b!O3{rcxvf78(U0%ugr
zhw!qJl4aHhD(LC9GXf!i5`5$b6v$78LWu+NjUQJ|TiONpe@ts%>)XfQVqIHfM44ld
z9H#|?(yy@fxyYSQ&(UA$3R?or&MX&_%V=abNj8c%_aC>9=ZXyg`u3-1=&vhg6NJuN
z;yKG;RHO1r^GQG({}5~FLpA7q%@J~f`1LS;biW7@YIcxfzX^!!ANY_#>$FMDa%(2U
z7gpV6#ihaf4Mazxjg=9-4pXR(i243Gzeju%@poNZ!ZgQOBD$^sS@|80(Z$%1&mwn@
zXuBPnr#8!T&cn*j>UhLM?-Jgs_GM~ac3j{#CzSe?%j3oEn_?sVoz?b#tlKq;cKxNA
zIwInFmTO`svpnZ4tejIvWQ53lf`DH5T^@0}0y^A$xW>b4e+8CUPT)o+0nM#SQ_mry
z{L9}E*ViNXy5P>IO_3_oc^${+PAfbTuE!NgX(J+X$h|dz2&&Tp4Y0}zr~~#F&}mc8
z`sIU8M_OQiu9ZvWaKfoM!#<me93jGlfxc)d2>8Yl%5G6oLSu1Mbq_^_fl~q%6QGvl
z5121(C4?vtA`BQPx4Gl1*wY#k1VY$-2oyN1&LQUE`D?w80Rf{PMusU$7MP{}``>>N
zI8Iel8jLgDk_nRk>3DmB;E(IOnID;e^)ihw!79~pWt0)MA_o(^ArdJ~f!QPb<FJrE
zHFW$dbNY8q^><;8;t$7){>SF=hjaaH^Y{~LCo%?o%u{&mQ_b`BxQ(Fk5SSBzoP{VA
zM{iCJ9e(L2ykWCFRzmyVh}?FgP8|cyka+KjU<*_P_S8NR>OOp>b?c<@gSIL^tee@7
zwNd;`kBG!M<xt-Zz%yjB<#c0dg)NLkV$WcYre@9gEx`rP0`8EjecC0ZrBA_9OmyXw
zL6GlB!QbUlZ+8GiKXX*57NpyydHvg>R9&u5kiOrCNArbI{*D?@ou5-vKWW!FzV3lK
z0_p)V6TbDv{ql_^DF0@%O0Gsnbx+W6g8pwYlUJwICwGoNWCheb2QmsyNvxQRVh%an
zF8*BH^N5iNf=LWrpT0o30+L~m^yg6@p<VbvNW1;L$hjlO*WjV|-VX?CTI0>~qorSt
zM}5vFm}|&9meNF|X+TA;@j-R_3oJQcpIOr26@`(S>>(8Bm9|$#dOLc-HpS#(Cn-z|
zB>^K944Ythb;|uRPa@zR5ydC8Q^3T|KYYoQ<zuJqJu+dYu>u13Bx3WDxA)8@xzvsO
zFp5{95z}|JmB@V-HwqTR68x^g8>+eigTji=F5=>=sl(LbgTNb7T-(QarVnz~w~OaX
zosTN!03Hn!V**~tt60h4ywN_1B$I)`p#U|zseX^97Jq_5c6;<s%F{~N!#btnYoGuk
z)@?;T&A7A2FF2p@K1qJz!x!$OI;)&Pet|IFaYh}6qJY2P%I<VF>t-JY?$r492s7Yr
zk6x!cVo6ggB~m@flwQ!>|B}?Tc3psOU+)rSMb#ysWZN*S)f+s@$Xkm$2(9PyPqDs7
z;gNgfV+u_9Q}YEfrn$8jT4yP!60}eLSIaQIQr!MLGVffBLn-3%0cnp^7!VzH5%H5_
zaI-JmB2{*Mz-QhyIw09th_EAC=3C--KOit&ZRFx@z7Hh=&Ul+wfI&o`4Zmu`(BpE~
zIC~Ro<m}9Y8A+?UF`iSId{0!XYGy!B`j^d;R>wyUeq>gP$IKgzj>YfkE2q?m2`q9s
zv+&B}LAno+0jB`+GSjMcM{Mwi<s2sPc4NF;niliWfVIi`fmE94*w@0<d&}4J!&F95
zDhx0&W*u8oVd>#cti`L|Rd_xA-e<PggOsf3%hhACXy^~GB+!zw=+Y5)MJvd2D=nm3
zFNk5B3Oi!X|NHHH^&A~Tv@@=R%u4{W>MJkmzPDwo)c0EWXEaAv<@2)(Ed;hnXdX+K
zLLqxCn97l=$}gY}J_K=<tA8+inI=$R@z8Gp@;Vg5-THA3;FcnJg<Q6v{qk^?(zDm;
z)1T3t>fE|8OL1A|o{fN^%hyv5e}r~Jrz}&emmNm<?>$!==@wZ11)lvOn^m;zY?`l@
zoqqhQv;3Y8gAKMH{mNxlEMp00<bVG45relA@2=VGC>Um0+NU?Sc8y-3G+A$+gJZ~Y
z#+pvsNnG{<@{QJuD964@y@}uUmPj<TKvn{~uyD^CyPD+&Qpc{o_|`VC2|F1^*uo3?
zd69(<U6nfxNFgBi*q@QXLHy(CH^Fj`l?X-SVVxWa)N43$3{dW`i7&IvHoV$v{PeBZ
z2Y4F%nI3QEmnp$#Olq08Qt_PzWtR|;LAJXeIcg!C0+oi1=Nkz*KZ^!r!6_}kS|I4|
z_Aqm`MOBddbnZoHjEM3x{IV2GWwO3w1P4ff*&Wkx=gPvcmWmwj_DrrES)VSwxr{HR
zl68V3E?K(OTVN$2Qts}9<K+YN$*PO&6{~RJh(W+#k$*(&Sbtr#=*?*+S&LK@xxi6m
zf2KiH{KSOfL}Bilj!4CrHqA|QijNTK;4XHiD>&P>F>R)LMIVC?Ye`9fL`j9{oaF#4
zL#wK&vI_f?%mym;2!mf-Yuh}uhSBK6+3@Mt<O5v#sm2XSl?5b!OyJ$xq`G>QPPs&a
z$(c86&u+Z3o4hPSR!W6L+?7NS9#RLbcJizb?gwz5Fld>V_l3*s{<Q;Z-pzM%=gQV>
zu9!pjq^(PxmSoW!6n4o;bNgCa!SUR6$&O$*v7aJ?eIH)FTMvXzuDAXWsZw3FIxyb)
zs1c?pY)*IgsrqFT&rzP-$my2*7k&%%w;D2e|If(tFCzS@vx5Q?ME(bB{{LZXNqOW4
z5BwYJ{v;BxIP^RmEHbsQw{Kz;=cV8LVX6t$wmROd<~T4;XIq)5<}lHcz`x;tS&!Yv
zZB;?4i~-ArDPZp)=v6o<kVJ!=>%R7_Lqqx;6oS4@O{Pf_x$Q|u;>XQzQm%~33I-h|
z5t*GY&9=>nEZB(KhZ+4+EF)d9Ot^6`$>FF?{G{s5fh(tjbwD2$YlE-~Um%n$mni9_
z2YDo^62@zOyEj~N56fGg)qT8lY7?#UW6jzi18~0X;R2numspimH@D)$#V|kz!M%L<
z)37JDPLlex;V^$ke9)Ow&eA83o*p(0aYp`-$06-@^iRDX4*^&>$@uBA-hS%+s0P?#
zMNb4|a~23A^fj8nC`7R9uahOf`eAG4xcx0gyL=L$MQDywFL04}S%g^EU*I5Vjr6()
z#!EFE+{aiCpyPpqwVBnnfiZNR@zj|-3GA|cmQelnD4{`>YoT4T@zkMP*OMtUMhV2i
z!#!7>c<^A<<Figq2P(4>Hf~AmI!tytc<UCBP_?QFFv8il#6Rvy0_4;5tr%LH5kV^k
z@Ss^DJF(%G5Ek$Q-ynGbX4NA?@=4gPrdquuUs(72$+2CSW;S<w3#S_Y>oqu|A!7?^
z%!*Z&9wEYv$t7(GotOhx>F*dcKX!|oOQnPqRmYIna<I%3zLbxM-2<p?B-$q0DlCG8
zUss*2ove=MJ`NguTjKb9C_+#r{%$yG;F09deU<q#g%hhD6QN)M7&ja2IL*po|3@58
z_R(Fx&JWsc9w+x5q4_RhJ?ET|kx1{+zM+{VeD_Uuj^&fquQyR{T%fJoHJP)hrQP#C
zA{bGd1-C3?C7w=5Y2*`rEIcp_a!$X~`C`GyL7@oRt3O>8R#(>evAE)a2y12I!x{-u
zr493EP^-3B#_^bw*H-cD3ZWsxLfn6ssTlv=KD8#Q6LIvihg#bJ^dwC_9IN#7D}%}<
z<=t0|VF5l~&EfN6IGNcE&FFq3McF-UiL-!GxA)q<Ln~fodxNV_0g$tAFkrwA3a-0d
z_rJd<oeEeZt`6z`UQ&}j_imlc5vflFBmID^5HE+!KrSxh!(N3h(D9q8LOhBZGaiLb
z78$$q0T4>=wAfzX%!rkxPGBU2(YOobbQ`jUPQ<M*z0f@OOBL$ak~YJ(I@`g5USnt(
zWotYYyD9+Q1*ZmY>kSF@*at!9jH_fcrLRZ_dG#Cbe-T+7v&%JKk@G<%`mL==sI=_O
z1~-{TBt5QHl;3Xii}q;t5C3w3>m*Y|i~=*>RIAH-JjgYfcszBgb>(U(E{(mWvcbX~
zo{ZqcsW5?|xQzQ62YZX_K(1b5rz0fV0EmHiI>ipg3J)$}bUR&mKp^+q{x#%$i?}Vl
zRmYAx|L@k>6Rbs}0UVTw5DHA6l>0P~73*-AalT7ap>GV?ns;gP2OIm!iQph~qFA}@
zR`2@AS~=qo<n<$m@WVARb(`J+$(j}9R_(>liN!|;x&=-iTvg$a#1vwPley?dPhW!S
z;nu?9y&IJg^9-*}IVd!(S28%gDSSRI<Y{U1-taeCncD>p1&w_~mL_qY*WTZq1{8et
zJ6I!jnOm8fgPqY#jOqb|u`X@<2tSY=?(mzj_wwB2mL|NqDiOXts4Ic;9}0|ROi3-C
z#&GpeVH9{hk(#Yt6U=slHW*`pw?A5LY~M?=L<-v*z^(m#sAQ0N+>1vw;iddw8!c(=
zQE>Xj{8A8@%eM1z{B4{YuSNPDxtPSI#16MQb}oua4gAut8+iQseO#LPLO>7KsTm=q
zQBQRh1flA(oqI}aG$Hp!{#_I00DGG((||82Kh%u(QscN@?yi$lqdiDYh63HSD}23^
zL*|Px&*eji!PDA9OFX`o-R8B`vfmP5cPKv_wcJRki}aUc?%^U1uGh=g!}ci|Ol_>*
zZiS%SMcwT^^M>3vg*V4^FD(mr0G7t_XO<6HOxLiR1AdlnClnu(^*XAsMcsp*2KUnM
z=sGv~uj+4z6^yOsG6PwYB;RTxsiaVNZ#j&VaM&AqcfD><nN-xMr3rx|jiME$7f@on
zo@a-E=XcrHYaxXma(7@mRW3snA9~pStlRpnCFN%jZOx6lI(16I=KI*@dZ}PWoe)^H
z?)l}V{W!jF?)HQa<Bxg+qFpd-&p(wv>XJ`k^(DYkA{S#nm9pf^P`&PjPUhMdr@jlx
zyC!q?6e;W3bZo1P-olyc@$^r&?hXlE9%;Y77?NKSEt}<XzRHRHa68*J*{Y=8jgdUK
z_HcYMS5X5yDywsFJZYiB@wP$9hzY^`W1QXWyuU?^PsdA01^jjWUEK#r$yKu^FaXyk
zBBFGd@pO4ho#GB-*%oTLQ}#D599YUfwQGL#-9}eM*s&_7Du$8Tl(M9Hn@?1HbuFmw
zx!#y=xT|02PJd{>chDtzu*9c(?|c<|bX}n?2K%E!cI-{w`Bykb?_Qnv04>cF-C10#
z6yoy)K_YhF+Z0@J{ro$PO@kVYK;zfST-0w&%9oKLjpA=aSyI1_CBekL<kCM!GhW_b
z&z$V^XrKhkC`;2Bb@bkLXzoJL@_91zjQLg=UfVv|s}I_x=BZc9xIZOU;{(fyMhhar
zpq9Y`ni!i(%VpiC{>?G8r(Ti5sNRM7Zyt{+kPyy8@e`P;`-)9Vr_hmtBuyvKE4bG2
zN9xe1lPR!>#qiA+f>WME`N#1gH|dUAWnvyWu|-!*m>FBMj^$WYBTV%TLEr?<#j6Zi
z^?M`j+&tH15XkuwY-YQizk_?eOV)RHFs$0i?MUMyQ0$>X^f#M*&N1)1^^O<F5|n$n
znFbZNgtl)+*{h{ll?as+0Opx341{=hpSye;6a46R|I`}%7^XQ6vp`lHJrz-`7uX#1
z5=EWRVkEXIvg$vL9&^D7lU7I%1(H&W3ApMTkPFlSqE-xs8)g@+m&TgcDtl4XqI39N
ze>;I}8?-LYIf-J=f{gHSaKB%YXR5B74k+|l!(>qgw&jU&siPYidPDAq3^rTWTKlMT
z8?|$a;#}!TFz8H%zl(9n;v4MtT6Z1EVF_B>-N}A#*X_;je4x!vbJ)16sj$+jhnZ-k
zwBwg<)n9672y6(t<5rq~JQV-U_aCgxKn3i7a%=pHL-@b*aR6N7A4y`#%l(P$L42||
zua>>%&q*4<p}{r2#dcbcDyc45ux|X=_}=-;#w4un$TpM2%=>RPjQ{A4n1-ME$Ek5z
zf&0g)@w>_0zyX%_tXnLxJ~nK$5Wk4k2L?=evOUnMP3Wq?vGVYqltEI2OWha1@^Ov(
zhFn!lg;@O1=QEA9O7V1e)`-zTJfx{nZd9N;ooavCt?HoMJ1AG*x(laX5Obr*2~NuW
zty=}p`YyJAxs}?!?j1KI!m4BZvM0oht$*gI=Y?Yni@5gh*vmv4R!U#5A6rth^QE0<
zFr_m`q|1@Qn+GDbD}Ogw&p5B?;gkrGPHa$#_hXJM%pqp`lo^vXsY6W<8?dA2+Yb$J
zo72)d_@nu5iBy(fc|&jZGhX++pDmlm@Sj>pidsA#oJBsjA2Uknba=JxZpfKA8z!nB
ziT=@*)Q<OzpR`S*#oRE%s}di-dRH%dY@bhzyAwWfWz#3scj@;%4NO*Djlsr?Jx)nb
zCp}?H=srmB$?-Id+!>#!@0=mx5NbA+O}Q_LxZNz<S*J;>FRq^P91Kd5`MGxzH}swX
zgW`*fo0e~47#(Q8YYbKP@N87&!Sr8@tZQ2`Jb>j~Zc&k%W~=Tg-znh8<~~#wQv#k+
zT<i~ZY@X;s1p-?u6zX*rM=Pns1KEno*vUdeXOark_Q&=JqUqW5{;v`o#2aDT19eTQ
z6k)$Bt?$B%>m)W<aMs3ZS=qx1!}zXRp)$|hmk(}ynn<Nsy5{M>g^5Lb)`*c~So-Pr
zLYG%dm775-5r237Xre#X7RuY9Saoi3=K#^weP!BnqP_;9rU=&BO$AEX^C}2WjnOi%
zP}$6&YJvVEZzIhh0gY?i%go5`{>)}&hi2t)ka&u6b*axJQW%!Aj#L_d`jH77k`wIt
zgX9I&^fi*>B;N8Ey6Nx&KB9|E@PrJhlMKSm>&sUbW}RMiCpzN80tJch053qbEmzS*
z_AsgHeHAyN=Ig<rip!U#QBfab6*>%NzpGojeq;v1>Ku@0flG#u4}Cq@dHUVy?|I8X
z7s-yR@^N`JG(*g6BBVJhM)cH#J6<5Rj}MR0EJ-yH<eU|Ix{ad!oyI(NTZ}`)3btqM
zbaMs1F$em7|9dujxyO?$ff5%u@zsK5RveTy!%O)!N*e?9y0dN8-by_60a?2gDo<BM
ztkAy2zq>p;|9|@y{<c(|I-UOGi~4)U{El*3P5*r>znfexDx8_)KNHQ1nGJpt1sow5
ni_V?ev;MaqWEO=IPRI{vk5Cnjb-;(CWMsN`jBb}}+>icWnh920

literal 0
HcmV?d00001

diff --git a/docs/models/dcim/cable.md b/docs/models/dcim/cable.md
index 8b00a999d..753ab6f7f 100644
--- a/docs/models/dcim/cable.md
+++ b/docs/models/dcim/cable.md
@@ -1,19 +1,34 @@
 # Cables
 
-A cable represents a physical connection between two termination points, such as between a console port and a patch panel port, or between two network interfaces. Cables can be traced through pass-through ports to form a complete path between two endpoints. In the example below, three individual cables comprise a path between the two connected endpoints.
+All connections between device components in NetBox are represented using cables. A cable represents a direct physical connection between two termination points, such as between a console port and a patch panel port, or between two network interfaces.
 
-```
-|<------------------------------------------ Cable Path ------------------------------------------->|
+Each cable must have two endpoints defined. These endpoints are sometimes referenced as A and B for clarity, however cables are direction-agnostic and the order in which terminations are made has no meaning. Cables may be connected to the following objects:
 
-  Device A                   Patch Panel A                 Patch Panel B                  Device B
-+-----------+               +-------------+               +-------------+               +-----------+
-| Interface | --- Cable --- | Front Port  |               | Front Port  | --- Cable --- | Interface |
-+-----------+               +-------------+               +-------------+               +-----------+
-                            +-------------+               +-------------+
-                            |  Rear Port  | --- Cable --- |  Rear Port  |
-                            +-------------+               +-------------+
-```
+* Circuit terminations
+* Console ports
+* Console server ports
+* Interfaces
+* Pass-through ports (front and rear)
+* Power feeds
+* Power outlets
+* Power ports
 
-All connections between device components in NetBox are represented using cables. However, defining the actual cable plant is optional: Components can be be directly connected using cables with no type or other attributes assigned.
+Each cable may be assigned a type, label, length, and color. Each cable is also assigned one of three operational statuses:
 
-Cables are also used to associated ports and interfaces with circuit terminations. To do this, first create the circuit termination, then navigate the desired component and connect a cable between the two.
+* Active (default)
+* Planned
+* Decommissioning
+
+## Tracing Cables
+
+A cable may be traced from either of its endpoints by clicking the "trace" button. (A REST API endpoint also provides this functionality.) NetBox will follow the path of connected cables from this termination across the directly connected cable to the far-end termination. If the cable connects to a pass-through port, and the peer port has another cable connected, NetBox will continue following the cable path until it encounters a non-pass-through or unconnected termination point. The entire path will be displayed to the user.
+
+In the example below, three individual cables comprise a path between devices A and D:
+
+![Cable path](../../media/models/dcim_cable_trace.png)
+
+Traced from Interface 1 on Device A, NetBox will show the following path:
+
+* Cable 1: Interface 1 to Front Port 1
+* Cable 2: Rear Port 1 to Rear Port 2
+* Cable 3: Front Port 2 to Interface 2

From b8783078eb9b9306411810d3b46fe9c0f61c0712 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 10:39:49 -0400
Subject: [PATCH 396/505] Updated documentation for device components

---
 docs/models/dcim/consoleport.md       |  4 ++--
 docs/models/dcim/consoleserverport.md |  4 ++--
 docs/models/dcim/devicebay.md         |  7 ++++---
 docs/models/dcim/frontport.md         |  4 +---
 docs/models/dcim/interface.md         | 11 +++++++----
 docs/models/dcim/inventoryitem.md     |  6 +++++-
 docs/models/dcim/poweroutlet.md       |  6 +++++-
 docs/models/dcim/powerport.md         |  6 ++++--
 docs/models/dcim/rearport.md          |  5 +++--
 9 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/docs/models/dcim/consoleport.md b/docs/models/dcim/consoleport.md
index 4d3a089c5..1a0782f25 100644
--- a/docs/models/dcim/consoleport.md
+++ b/docs/models/dcim/consoleport.md
@@ -1,5 +1,5 @@
 ## Console Ports
 
-A console port provides connectivity to the physical console of a device. Console ports are typically used for temporary access by someone who is physically near the device, or for remote out-of-band access via a console server.
+A console port provides connectivity to the physical console of a device. These are typically used for temporary access by someone who is physically near the device, or for remote out-of-band access provided via a networked console server. Each console port may be assigned a physical type.
 
-Console ports can be connected to console server ports.
+Cables can connect console ports to console server ports or pass-through ports.
diff --git a/docs/models/dcim/consoleserverport.md b/docs/models/dcim/consoleserverport.md
index 55aefd733..da1ee8986 100644
--- a/docs/models/dcim/consoleserverport.md
+++ b/docs/models/dcim/consoleserverport.md
@@ -1,5 +1,5 @@
 ## Console Server Ports
 
-A console server is a device which provides remote access to the local consoles of connected devices. This is typically done to provide remote out-of-band access to network devices.
+A console server is a device which provides remote access to the local consoles of connected devices. They are typically used to provide remote out-of-band access to network devices. Each console server port may be assigned a physical type.
 
-Console server ports can be connected to console ports.
+Cables can connect console server ports to console ports or pass-through ports.
diff --git a/docs/models/dcim/devicebay.md b/docs/models/dcim/devicebay.md
index cdcd5657d..2aea14a7a 100644
--- a/docs/models/dcim/devicebay.md
+++ b/docs/models/dcim/devicebay.md
@@ -1,7 +1,8 @@
 ## Device Bays
 
-Device bays represent the ability of a device to house child devices. For example, you might install four blade servers into a 2U chassis. The chassis would appear in the rack elevation as a 2U device with four device bays. Each server within it would be defined as a 0U device installed in one of the device bays. Child devices do not appear within rack elevations or the "Non-Racked Devices" list within the rack view.
+Device bays represent a space or slot within a parent device in which a child device may be installed. For example, a 2U parent chassis might house four individual blade servers. The chassis would appear in the rack elevation as a 2U device with four device bays, and each server within it would be defined as a 0U device installed in one of the device bays. Child devices do not appear within rack elevations or count as consuming rack units.
 
-Child devices are first-class Devices in their own right: that is, fully independent managed entities which don't share any control plane with the parent.  Just like normal devices, child devices have their own platform (OS), role, tags, and interfaces.  You cannot create a LAG between interfaces in different child devices.
+Child devices are first-class Devices in their own right: That is, they are fully independent managed entities which don't share any control plane with the parent.  Just like normal devices, child devices have their own platform (OS), role, tags, and components.  LAG interfaces may not group interfaces belonging to different child devices.
 
-Therefore, Device bays are **not** suitable for modeling chassis-based switches and routers.  These should instead be modeled as a single Device, with the line cards as Inventory Items.
+!!! note
+    Device bays are **not** suitable for modeling line cards (such as those commonly found in chassis-based routers and switches), as these components depend on the control plane of the parent device to operate. Instead, line cards and similarly non-autonomous hardware should be modeled as inventory items within a device, with any associated interfaces or other components assigned directly to the device.
diff --git a/docs/models/dcim/frontport.md b/docs/models/dcim/frontport.md
index 12b9cfc16..0b753c012 100644
--- a/docs/models/dcim/frontport.md
+++ b/docs/models/dcim/frontport.md
@@ -1,5 +1,3 @@
 ## Front Ports
 
-Front ports are pass-through ports used to represent physical cable connections that comprise part of a longer path. For example, the ports on the front face of a UTP patch panel would be modeled in NetBox as front ports.
-
-Each front port is mapped to a specific rear port on the same device. A single rear port may be mapped to multiple rear ports.
\ No newline at end of file
+Front ports are pass-through ports used to represent physical cable connections that comprise part of a longer path. For example, the ports on the front face of a UTP patch panel would be modeled in NetBox as front ports. Each port is assigned a physical type, and must be mapped to a specific rear port on the same device. A single rear port may be mapped to multiple rear ports, using numeric positions to annotate the specific alignment of each.
diff --git a/docs/models/dcim/interface.md b/docs/models/dcim/interface.md
index cbccbec8d..be43ac2a6 100644
--- a/docs/models/dcim/interface.md
+++ b/docs/models/dcim/interface.md
@@ -1,9 +1,12 @@
 ## Interfaces
 
-Interfaces connect to one another in a symmetric manner: If interface A connects to interface B, interface B therefore connects to interface A. Each type of connection can be classified as either *planned* or *connected*.
+Interfaces in NetBox represent network interfaces used to exchange data with connected devices. On modern networks, these are most commonly Ethernet, but other types are supported as well. Each interface must be assigned a type, and may optionally be assigned a MAC address, MTU, and IEEE 802.1Q mode (tagged or access). Each interface can also be enabled or disabled, and optionally designated as management-only (for out-of-band management).
 
-Each interface is a assigned a type denoting its physical properties. Two special types exist: the "virtual" type can be used to designate logical interfaces (such as SVIs), and the "LAG" type can be used to desinate link aggregation groups to which physical interfaces can be assigned.
+Interfaces may be physical or virtual in nature, but only physical interfaces may be connected via cables. Cables can connect interfaces to pass-through ports, circuit terminations, or other interfaces.
 
-Each interface can also be enabled or disabled, and optionally designated as management-only (for out-of-band management). Fields are also provided to store an interface's MTU and MAC address.
+Physical interfaces may be arranged into a link aggregation group (LAG) and associated with a parent LAG (virtual) interface. Like all virtual interfaces, LAG interfaces cannot be connected physically.
 
-VLANs can be assigned to each interface as either tagged or untagged. (An interface may have only one untagged VLAN.)
+IP addresses can be assigned to interfaces. VLANs can also be assigned to each interface as either tagged or untagged. (An interface may have only one untagged VLAN.)
+
+!!! note
+    Although devices and virtual machines both can have interfaces, a separate model is used for each. Thus, device interfaces have some properties that are not present on virtual machine interfaces and vice versa.
diff --git a/docs/models/dcim/inventoryitem.md b/docs/models/dcim/inventoryitem.md
index b113dce1e..237bad92c 100644
--- a/docs/models/dcim/inventoryitem.md
+++ b/docs/models/dcim/inventoryitem.md
@@ -1,3 +1,7 @@
 # Inventory Items
 
-Inventory items represent hardware components installed within a device, such as a power supply or CPU or line card. Currently, these are used merely for inventory tracking, although future development might see their functionality expand. Like device types, each item can optionally be assigned a manufacturer.
+Inventory items represent hardware components installed within a device, such as a power supply or CPU or line card. Inventory items are distinct from other device components in that they cannot be templatized on a device type, and cannot be connected by cables. They are intended to be used primarily for inventory purposes.
+
+Each inventory item can be assigned a manufacturer, part ID, serial number, and asset tag (all optional). A boolean toggle is also provided to indicate whether each item was entered manually or discovered automatically (by some process outside of NetBox).
+
+Inventory items are hierarchical in nature, such that any individual item may be designated as the parent for other items. For example, an inventory item might be created to represent a line card which houses several SFP optics, each of which exists as a child item within the device.
diff --git a/docs/models/dcim/poweroutlet.md b/docs/models/dcim/poweroutlet.md
index 0ec93856e..e9ef307bd 100644
--- a/docs/models/dcim/poweroutlet.md
+++ b/docs/models/dcim/poweroutlet.md
@@ -1,3 +1,7 @@
 ## Power Outlets
 
-Power outlets represent the ports on a PDU that supply power to other devices. Power outlets are downstream-facing towards power ports. A power outlet can be associated with a power port on the same device and a feed leg (i.e. in a case of a three-phase supply). This indicates which power port supplies power to a power outlet.
+Power outlets represent the outlets on a power distribution unit (PDU) or other device that supply power to dependent devices. Each power port may be assigned a physical type, and may be associated with a specific feed leg (where three-phase power is used) and/or a specific upstream power port. This association can be used to model the distribution of power within a device.
+
+For example, imagine a PDU with one power port which draws from a three-phase feed and 48 power outlets arranged into three banks of 16 outlets each. Outlets 1-16 would be associated with leg A on the port, and outlets 17-32 and 33-48 would be associated with legs B and C, respectively.
+
+Cables can connect power outlets only to downstream power ports. (Pass-through ports cannot be used to model power distribution.)
diff --git a/docs/models/dcim/powerport.md b/docs/models/dcim/powerport.md
index 6027fa98b..1948920d0 100644
--- a/docs/models/dcim/powerport.md
+++ b/docs/models/dcim/powerport.md
@@ -1,6 +1,8 @@
 ## Power Ports
 
-A power port is the inlet of a device where it draws its power. Power ports are upstream-facing towards power outlets. Alternatively, a power port can connect to a power feed – as mentioned in the power feed section – to indicate the power source of a PDU's inlet.
+A power port represents the inlet of a device where it draws its power, i.e. the connection port(s) on a device's power supply. Each power port may be assigned a physical type, as well as allocated and maximum draw values (in watts). These values can be used to calculate the overall utilization of an upstream power feed.
 
 !!! info
-    If the draw of a power port is left empty, it will be dynamically calculated based on the power outlets associated with that power port. This is usually the case on the power ports of devices that supply power, like a PDU.
+    When creating a power port on a device which supplies power to downstream devices, the allocated and maximum draw numbers should be left blank. Utilization will be calculated by taking the sum of all power ports of devices connected downstream.
+
+Cables can connect power ports only to power outlets or power feeds. (Pass-through ports cannot be used to model power distribution.)
diff --git a/docs/models/dcim/rearport.md b/docs/models/dcim/rearport.md
index 8c8136338..41c5b3037 100644
--- a/docs/models/dcim/rearport.md
+++ b/docs/models/dcim/rearport.md
@@ -1,5 +1,6 @@
 ## Rear Ports
 
-Like front ports, rear ports are pass-through ports which represent the end of a particular cable segment in a path. Each rear port is defined with a number of positions: rear ports with more than one position can be mapped to multiple front ports. This can be useful for modeling instances where multiple paths share a common cable (for example, six different fiber connections sharing a 12-strand MPO cable).
+Like front ports, rear ports are pass-through ports which represent the continuation of a path from one cable to the next. Each rear port is defined with its physical type and a number of positions: Rear ports with more than one position can be mapped to multiple front ports. This can be useful for modeling instances where multiple paths share a common cable (for example, six discrete two-strand fiber connections sharing a 12-strand MPO cable).
 
-Note that front and rear ports need not necessarily reside on the actual front or rear device face. This terminology is used primarily to distinguish between the two components in a pass-through port pairing.
+!!! note
+    Front and rear ports need not necessarily reside on the actual front or rear device face. This terminology is used primarily to distinguish between the two components in a pass-through port pairing.

From 06161275034ee5316f00da3127e4a6bb7a8a4f96 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 11:04:57 -0400
Subject: [PATCH 397/505] Update device type and component template
 documentation

---
 docs/models/dcim/consoleporttemplate.md       |  2 +-
 docs/models/dcim/consoleserverporttemplate.md |  2 +-
 docs/models/dcim/devicetype.md                | 12 ++++--------
 docs/models/dcim/frontporttemplate.md         |  2 +-
 docs/models/dcim/interfacetemplate.md         |  2 +-
 docs/models/dcim/manufacturer.md              |  2 +-
 docs/models/dcim/poweroutlettemplate.md       |  2 +-
 docs/models/dcim/powerporttemplate.md         |  2 +-
 docs/models/dcim/rearporttemplate.md          |  2 +-
 9 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/docs/models/dcim/consoleporttemplate.md b/docs/models/dcim/consoleporttemplate.md
index 86281cb92..3462ff253 100644
--- a/docs/models/dcim/consoleporttemplate.md
+++ b/docs/models/dcim/consoleporttemplate.md
@@ -1,3 +1,3 @@
 ## Console Port Templates
 
-A template for a console port that will be created on all instantiations of the parent device type.
+A template for a console port that will be created on all instantiations of the parent device type. Each console port can be assigned a physical type.
diff --git a/docs/models/dcim/consoleserverporttemplate.md b/docs/models/dcim/consoleserverporttemplate.md
index ed99adb11..cc4e8bcd3 100644
--- a/docs/models/dcim/consoleserverporttemplate.md
+++ b/docs/models/dcim/consoleserverporttemplate.md
@@ -1,3 +1,3 @@
 ## Console Server Port Templates
 
-A template for a console server port that will be created on all instantiations of the parent device type.
+A template for a console server port that will be created on all instantiations of the parent device type. Each console server port can be assigned a physical type.
diff --git a/docs/models/dcim/devicetype.md b/docs/models/dcim/devicetype.md
index 1a10cee41..a7e00dbc6 100644
--- a/docs/models/dcim/devicetype.md
+++ b/docs/models/dcim/devicetype.md
@@ -1,18 +1,14 @@
 # Device Types
 
-A device type represents a particular make and model of hardware that exists in the real world. Device types define the physical attributes of a device (rack height and depth) and its individual components (console, power, and network interfaces).
+A device type represents a particular make and model of hardware that exists in the real world. Device types define the physical attributes of a device (rack height and depth) and its individual components (console, power, network interfaces, and so on).
 
-Device types are instantiated as devices installed within racks. For example, you might define a device type to represent a Juniper EX4300-48T network switch with 48 Ethernet interfaces. You can then create multiple devices of this type named "switch1," "switch2," and so on. Each device will inherit the components (such as interfaces) of its device type at the time of creation. (However, changes made to a device type will **not** apply to instances of that device type retroactively.)
+Device types are instantiated as devices installed within sites and/or equipment racks. For example, you might define a device type to represent a Juniper EX4300-48T network switch with 48 Ethernet interfaces. You can then create multiple _instances_ of this type named "switch1," "switch2," and so on. Each device will automatically inherit the components (such as interfaces) of its device type at the time of creation. However, changes made to a device type will **not** apply to instances of that device type retroactively.
 
 Some devices house child devices which share physical resources, like space and power, but which functional independently from one another. A common example of this is blade server chassis. Each device type is designated as one of the following:
 
 * A parent device (which has device bays)
-* A child device (which must be installed in a device bay)
+* A child device (which must be installed within a device bay)
 * Neither
 
 !!! note
-    This parent/child relationship is **not** suitable for modeling chassis-based devices, wherein child members share a common control plane.
-
-    For that application you should create a single Device for the chassis, and add Interfaces directly to it.  Interfaces can be created in bulk using range patterns, e.g. "Gi1/[1-24]".
-
-    Add Inventory Items if you want to record the line cards themselves as separate entities.  There is no explicit relationship between each interface and its line card, but it may be implied by the naming (e.g. interfaces "Gi1/x" are on line card 1)
+    This parent/child relationship is **not** suitable for modeling chassis-based devices, wherein child members share a common control plane. Instead, line cards and similarly non-autonomous hardware should be modeled as inventory items within a device, with any associated interfaces or other components assigned directly to the device.
diff --git a/docs/models/dcim/frontporttemplate.md b/docs/models/dcim/frontporttemplate.md
index b32349519..03de0eae4 100644
--- a/docs/models/dcim/frontporttemplate.md
+++ b/docs/models/dcim/frontporttemplate.md
@@ -1,3 +1,3 @@
 ## Front Port Templates
 
-A template for a front-facing pass-through port that will be created on all instantiations of the parent device type.
+A template for a front-facing pass-through port that will be created on all instantiations of the parent device type. Front ports may have a physical type assigned, and must be associated with a corresponding rear port and position. This association will be automatically replicated when the device type is instantiated.
diff --git a/docs/models/dcim/interfacetemplate.md b/docs/models/dcim/interfacetemplate.md
index 07fc3a65b..d9b30dd87 100644
--- a/docs/models/dcim/interfacetemplate.md
+++ b/docs/models/dcim/interfacetemplate.md
@@ -1,3 +1,3 @@
 ## Interface Templates
 
-A template for an interface that will be created on all instantiations of the parent device type.
+A template for a network interface that will be created on all instantiations of the parent device type. Each interface may be assigned a physical or virtual type, and may be designated as "management-only."
diff --git a/docs/models/dcim/manufacturer.md b/docs/models/dcim/manufacturer.md
index cee89291d..df227ee17 100644
--- a/docs/models/dcim/manufacturer.md
+++ b/docs/models/dcim/manufacturer.md
@@ -1,3 +1,3 @@
 # Manufacturers
 
-Each device type must be assigned to a manufacturer. The model number of a device type must be unique to its manufacturer.
+A manufacturer represents the "make" of a device; e.g. Cisco or Dell. Each device type must be assigned to a manufacturer. (Inventory items and platforms may also be associated with manufacturers.) Each manufacturer must have a unique name and may have a description assigned to it.
diff --git a/docs/models/dcim/poweroutlettemplate.md b/docs/models/dcim/poweroutlettemplate.md
index e5b54af23..6f81891f1 100644
--- a/docs/models/dcim/poweroutlettemplate.md
+++ b/docs/models/dcim/poweroutlettemplate.md
@@ -1,3 +1,3 @@
 ## Power Outlet Templates
 
-A template for a power outlet that will be created on all instantiations of the parent device type.
+A template for a power outlet that will be created on all instantiations of the parent device type. Each power outlet can be assigned a physical type, and its power source may be mapped to a specific feed leg and power port template. This association will be automatically replicated when the device type is instantiated.
diff --git a/docs/models/dcim/powerporttemplate.md b/docs/models/dcim/powerporttemplate.md
index b6e64be01..947f146ae 100644
--- a/docs/models/dcim/powerporttemplate.md
+++ b/docs/models/dcim/powerporttemplate.md
@@ -1,3 +1,3 @@
 ## Power Port Templates
 
-A template for a power port that will be created on all instantiations of the parent device type.
+A template for a power port that will be created on all instantiations of the parent device type. Each power port can be assigned a physical type, as well as a maximum and allocated draw in watts.
diff --git a/docs/models/dcim/rearporttemplate.md b/docs/models/dcim/rearporttemplate.md
index 448c0befd..71d9a200b 100644
--- a/docs/models/dcim/rearporttemplate.md
+++ b/docs/models/dcim/rearporttemplate.md
@@ -1,3 +1,3 @@
 ## Rear Port Templates
 
-A template for a rear-facing pass-through port that will be created on all instantiations of the parent device type.
+A template for a rear-facing pass-through port that will be created on all instantiations of the parent device type. Each rear port may have a physical type and one or more front port templates assigned to it. The number of positions associated with a rear port determines how many front ports can be assigned to it (the maximum is 64).

From 1e4615aa75b580c3a2ef6abcb3472ac93c35cf4d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 11:32:32 -0400
Subject: [PATCH 398/505] Update device documentation

---
 docs/models/dcim/device.md         | 12 ++++++++++--
 docs/models/dcim/devicerole.md     |  2 +-
 docs/models/dcim/platform.md       |  6 ++++--
 docs/models/dcim/virtualchassis.md |  7 +++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/docs/models/dcim/device.md b/docs/models/dcim/device.md
index 9ec2875da..df14c0e07 100644
--- a/docs/models/dcim/device.md
+++ b/docs/models/dcim/device.md
@@ -1,7 +1,15 @@
 # Devices
 
-Every piece of hardware which is installed within a rack exists in NetBox as a device. Devices are measured in rack units (U) and can be half depth or full depth. A device may have a height of 0U: These devices do not consume vertical rack space and cannot be assigned to a particular rack unit. A common example of a 0U device is a vertically-mounted PDU.
+Every piece of hardware which is installed within a site or rack exists in NetBox as a device. Devices are measured in rack units (U) and can be half depth or full depth. A device may have a height of 0U: These devices do not consume vertical rack space and cannot be assigned to a particular rack unit. A common example of a 0U device is a vertically-mounted PDU.
 
 When assigning a multi-U device to a rack, it is considered to be mounted in the lowest-numbered rack unit which it occupies. For example, a 3U device which occupies U8 through U10 is said to be mounted in U8. This logic applies to racks with both ascending and descending unit numbering.
 
-A device is said to be full depth if its installation on one rack face prevents the installation of any other device on the opposite face within the same rack unit(s). This could be either because the device is physically too deep to allow a device behind it, or because the installation of an opposing device would impede airflow.
+A device is said to be full-depth if its installation on one rack face prevents the installation of any other device on the opposite face within the same rack unit(s). This could be either because the device is physically too deep to allow a device behind it, or because the installation of an opposing device would impede airflow.
+
+Each device must be instantiated from a pre-created device type, and its default components (console ports, power ports, interfaces, etc.) will be created automatically. (The device type associated with a device may be changed after its creation, however its components will not be updated retroactively.)
+
+Each device must be assigned a site, device role, and operational status, and may optionally be assigned to a specific rack within a site. A platform, serial number, and asset tag may optionally be assigned to each device.
+
+Device names must be unique within a site, unless the device has been assigned to a tenant. Devices may also be unnamed.
+
+When a device has one or more interfaces with IP addresses assigned, a primary IP for the device can be designated, for both IPv4 and IPv6.
diff --git a/docs/models/dcim/devicerole.md b/docs/models/dcim/devicerole.md
index 315f81356..13b8f021e 100644
--- a/docs/models/dcim/devicerole.md
+++ b/docs/models/dcim/devicerole.md
@@ -1,3 +1,3 @@
 # Device Roles
 
-Devices can be organized by functional roles. These roles are fully customizable. For example, you might create roles for core switches, distribution switches, and access switches.
+Devices can be organized by functional roles, which are fully customizable by the user. For example, you might create roles for core switches, distribution switches, and access switches within your network.
diff --git a/docs/models/dcim/platform.md b/docs/models/dcim/platform.md
index 19528da13..a860904b5 100644
--- a/docs/models/dcim/platform.md
+++ b/docs/models/dcim/platform.md
@@ -1,7 +1,9 @@
 # Platforms
 
-A platform defines the type of software running on a device or virtual machine. This can be helpful when it is necessary to distinguish between, for instance, different feature sets. Note that two devices of the same type may be assigned different platforms: for example, one Juniper MX240 running Junos 14 and another running Junos 15.
+A platform defines the type of software running on a device or virtual machine. This can be helpful to model when it is necessary to distinguish between different versions or feature sets. Note that two devices of the same type may be assigned different platforms: For example, one Juniper MX240 might run Junos 14 while another runs Junos 15.
 
-The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform.
+Platforms may optionally be limited by manufacturer: If a platform is assigned to a particular manufacturer, it can only be assigned to devices with a type belonging to that manufacturer.
+
+The platform model is also used to indicate which [NAPALM](https://napalm-automation.net/) driver and any associated arguments NetBox should use when connecting to a remote device. The name of the driver along with optional parameters are stored with the platform.
 
 The assignment of platforms to devices is an optional feature, and may be disregarded if not desired.
diff --git a/docs/models/dcim/virtualchassis.md b/docs/models/dcim/virtualchassis.md
index e1707918b..b2a7d3bc9 100644
--- a/docs/models/dcim/virtualchassis.md
+++ b/docs/models/dcim/virtualchassis.md
@@ -1,5 +1,8 @@
 # Virtual Chassis
 
-A virtual chassis represents a set of devices which share a single control plane: a stack of switches which are managed as a single device, for example. Each device in the virtual chassis is assigned a position and (optionally) a priority. Exactly one device is designated the virtual chassis master: This device will typically be assigned a name, secrets, services, and other attributes related to its management.
+A virtual chassis represents a set of devices which share a common control plane. A common example of this is a stack of switches which are connected and configured to operate as a single device. A virtual chassis must be assigned a name and may be assigned a domain.
 
-It's important to recognize the distinction between a virtual chassis and a chassis-based device. For instance, a virtual chassis is not used to model a chassis switch with removable line cards such as the Juniper EX9208, as its line cards are _not_ physically separate devices capable of operating independently.
+Each device in the virtual chassis is referred to as a VC member, and assigned a position and (optionally) a priority. VC member devices commonly reside within the same rack, though this is not a requirement. One of the devices may be designated as the VC master: This device will typically be assigned a name, secrets, services, and other attributes related to managing the VC.
+
+!!! note
+    It's important to recognize the distinction between a virtual chassis and a chassis-based device. A virtual chassis is **not** suitable for modeling a chassis-based switch with removable line cards (such as the Juniper EX9208), as its line cards are _not_ physically autonomous devices.

From d1a505d07f85a8d52fb9faf6339dcd39cb6f028a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jul 2020 12:54:21 -0400
Subject: [PATCH 399/505] Fixes #4914: Fix toggling cable status under device
 view

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/templates/dcim/cable.html  | 6 ++++--
 netbox/templates/dcim/device.html | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 16e800e70..7145d679b 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,6 +6,7 @@
 
 * [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
 * [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
+* [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
 
 ---
 
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index 91c7b1a94..03188163d 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -49,11 +49,13 @@
                 <table class="table table-hover panel-body attr-table">
                     <tr>
                         <td>Type</td>
-                        <td>{{ cable.get_type_display }}</td>
+                        <td>{{ cable.get_type_display|placeholder }}</td>
                     </tr>
                     <tr>
                         <td>Status</td>
-                        <td>{{ cable.get_status_display }}</td>
+                        <td>
+                            <span class="label label-{{ cable.get_status_class }}">{{ cable.get_status_display }}</span>
+                        </td>
                     </tr>
                     <tr>
                         <td>Label</td>
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 2f82ce5e8..ff3cc71f8 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -975,7 +975,7 @@ function toggleConnection(elem) {
                 xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
             },
             data: {
-                'status': 'False'
+                'status': 'planned'
             },
             context: this,
             success: function() {
@@ -994,7 +994,7 @@ function toggleConnection(elem) {
                 xhr.setRequestHeader("X-CSRFToken", "{{ csrf_token }}");
             },
             data: {
-                'status': 'True'
+                'status': 'connected'
             },
             context: this,
             success: function() {

From 73f9d615bcbfe5ad122f55e92744bbd56e313330 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 29 Jul 2020 09:43:13 -0400
Subject: [PATCH 400/505] Fixes #4921: Render non-viewable devices as
 unavailable space in rack elevations

---
 docs/release-notes/version-2.9.md |  1 +
 netbox/dcim/api/views.py          |  1 +
 netbox/dcim/elevations.py         | 19 +++++++++++++++----
 netbox/dcim/models/__init__.py    |  5 ++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 7145d679b..fc56dfa09 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -7,6 +7,7 @@
 * [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
 * [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
 * [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
+* [#4921](https://github.com/netbox-community/netbox/issues/4921) - Render non-viewable devices as unavailable space in rack elevations
 
 ---
 
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 038907b97..81407f000 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -176,6 +176,7 @@ class RackViewSet(CustomFieldModelViewSet):
             # Render and return the elevation as an SVG drawing with the correct content type
             drawing = rack.get_elevation_svg(
                 face=data['face'],
+                user=request.user,
                 unit_width=data['unit_width'],
                 unit_height=data['unit_height'],
                 legend_width=data['legend_width'],
diff --git a/netbox/dcim/elevations.py b/netbox/dcim/elevations.py
index ea780b2d9..cef95a7b6 100644
--- a/netbox/dcim/elevations.py
+++ b/netbox/dcim/elevations.py
@@ -14,10 +14,11 @@ class RackElevationSVG:
     Use this class to render a rack elevation as an SVG image.
 
     :param rack: A NetBox Rack instance
+    :param user: User instance. If specified, only devices viewable by this user will be fully displayed.
     :param include_images: If true, the SVG document will embed front/rear device face images, where available
     :param base_url: Base URL for links within the SVG document. If none, links will be relative.
     """
-    def __init__(self, rack, include_images=True, base_url=None):
+    def __init__(self, rack, user=None, include_images=True, base_url=None):
         self.rack = rack
         self.include_images = include_images
         if base_url is not None:
@@ -25,7 +26,14 @@ class RackElevationSVG:
         else:
             self.base_url = ''
 
-    def _get_device_description(self, device):
+        # Determine the subset of devices within this rack that are viewable by the user, if any
+        permitted_devices = self.rack.devices
+        if user is not None:
+            permitted_devices = permitted_devices.restrict(user, 'view')
+        self.permitted_device_ids = permitted_devices.values_list('pk', flat=True)
+
+    @staticmethod
+    def _get_device_description(device):
         return '{} ({}) — {} ({}U) {} {}'.format(
             device.name,
             device.device_role,
@@ -174,10 +182,13 @@ class RackElevationSVG:
             text_cordinates = (x_offset + (unit_width / 2), y_offset + end_y / 2)
 
             # Draw the device
-            if device and device.face == face:
+            if device and device.face == face and device.pk in self.permitted_device_ids:
                 self._draw_device_front(drawing, device, start_cordinates, end_cordinates, text_cordinates)
-            elif device and device.device_type.is_full_depth:
+            elif device and device.device_type.is_full_depth and device.pk in self.permitted_device_ids:
                 self._draw_device_rear(drawing, device, start_cordinates, end_cordinates, text_cordinates)
+            elif device:
+                # Devices which the user does not have permission to view are rendered only as unavailable space
+                drawing.add(drawing.rect(start_cordinates, end_cordinates, class_='blocked'))
             else:
                 # Draw shallow devices, reservations, or empty units
                 class_ = 'slot'
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 3deea8140..5932dac88 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -750,6 +750,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
     def get_elevation_svg(
             self,
             face=DeviceFaceChoices.FACE_FRONT,
+            user=None,
             unit_width=settings.RACK_ELEVATION_DEFAULT_UNIT_WIDTH,
             unit_height=settings.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT,
             legend_width=RACK_ELEVATION_LEGEND_WIDTH_DEFAULT,
@@ -760,6 +761,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         Return an SVG of the rack elevation
 
         :param face: Enum of [front, rear] representing the desired side of the rack elevation to render
+        :param user: User instance to be used for evaluating device view permissions. If None, all devices
+            will be included.
         :param unit_width: Width in pixels for the rendered drawing
         :param unit_height: Height of each rack unit for the rendered drawing. Note this is not the total
             height of the elevation
@@ -767,7 +770,7 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
         :param include_images: Embed front/rear device images where available
         :param base_url: Base URL for links and images. If none, URLs will be relative.
         """
-        elevation = RackElevationSVG(self, include_images=include_images, base_url=base_url)
+        elevation = RackElevationSVG(self, user=user, include_images=include_images, base_url=base_url)
 
         return elevation.render(face, unit_width, unit_height, legend_width)
 

From 55ee3db5bc3a26c2f2e8c3647eae4501a0a5b73c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 29 Jul 2020 12:12:00 -0400
Subject: [PATCH 401/505] #4919: Allow adding/changing assigned permissions
 within group and user admin views

---
 docs/release-notes/version-2.9.md |  4 ++
 netbox/users/admin.py             | 83 +++++++++++++++++++------------
 netbox/users/models.py            |  9 ++--
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index fc56dfa09..a13a7ef2a 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -2,6 +2,10 @@
 
 ## v2.9.0 (FUTURE)
 
+### Enhancements
+
+* [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
+
 ### Bug Fixes
 
 * [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 2c3963c0a..6e8684aae 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -9,6 +9,49 @@ from extras.admin import order_content_types
 from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig
 
 
+#
+# Inline models
+#
+
+class ObjectPermissionInline(admin.TabularInline):
+    exclude = None
+    extra = 3
+    readonly_fields = ['object_types', 'actions', 'constraints']
+    verbose_name = 'Permission'
+    verbose_name_plural = 'Permissions'
+
+    def get_queryset(self, request):
+        return super().get_queryset(request).prefetch_related('objectpermission__object_types')
+
+    @staticmethod
+    def object_types(instance):
+        # Don't call .values_list() here because we want to reference the pre-fetched object_types
+        return ', '.join([ot.name for ot in instance.objectpermission.object_types.all()])
+
+    @staticmethod
+    def actions(instance):
+        return ', '.join(instance.objectpermission.actions)
+
+    @staticmethod
+    def constraints(instance):
+        return instance.objectpermission.constraints
+
+
+class GroupObjectPermissionInline(ObjectPermissionInline):
+    model = AdminGroup.object_permissions.through
+
+
+class UserObjectPermissionInline(ObjectPermissionInline):
+    model = AdminUser.object_permissions.through
+
+
+class UserConfigInline(admin.TabularInline):
+    model = UserConfig
+    readonly_fields = ('data',)
+    can_delete = False
+    verbose_name = 'Preferences'
+
+
 #
 # Users & groups
 #
@@ -24,40 +67,13 @@ class GroupAdmin(admin.ModelAdmin):
     list_display = ('name', 'user_count')
     ordering = ('name',)
     search_fields = ('name',)
+    inlines = [GroupObjectPermissionInline]
 
-    def user_count(self, obj):
+    @staticmethod
+    def user_count(obj):
         return obj.user_set.count()
 
 
-class UserConfigInline(admin.TabularInline):
-    model = UserConfig
-    readonly_fields = ('data',)
-    can_delete = False
-    verbose_name = 'Preferences'
-
-
-class ObjectPermissionInline(admin.TabularInline):
-    model = AdminUser.object_permissions.through
-    fields = ['object_types', 'actions', 'constraints']
-    readonly_fields = fields
-    extra = 0
-    verbose_name = 'Permission'
-    verbose_name_plural = 'Permissions'
-
-    def object_types(self, instance):
-        return ', '.join(instance.objectpermission.object_types.values_list('model', flat=True))
-
-    def actions(self, instance):
-        return ', '.join(instance.objectpermission.actions)
-
-    def constraints(self, instance):
-        return instance.objectpermission.constraints
-
-    def has_add_permission(self, request, obj):
-        # Don't allow the creation of new ObjectPermission assignments via this form
-        return False
-
-
 @admin.register(AdminUser)
 class UserAdmin(UserAdmin_):
     list_display = [
@@ -71,7 +87,7 @@ class UserAdmin(UserAdmin_):
         }),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
     )
-    inlines = [ObjectPermissionInline, UserConfigInline]
+    inlines = [UserObjectPermissionInline, UserConfigInline]
     filter_horizontal = ('groups',)
 
 
@@ -241,7 +257,10 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
         return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
 
     def get_name(self, obj):
-        return obj.name or f'Permission #{obj.pk}'
+        return '{}: {}'.format(
+            ', '.join([ot.name for ot in obj.object_types.all()]),
+            ', '.join(obj.actions)
+        )
     get_name.short_description = 'Name'
 
     def list_models(self, obj):
diff --git a/netbox/users/models.py b/netbox/users/models.py
index b8c799d65..a531ba867 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -16,6 +16,8 @@ from utilities.utils import flatten_dict
 
 
 __all__ = (
+    'AdminGroup',
+    'AdminUser',
     'ObjectPermission',
     'Token',
     'UserConfig',
@@ -278,9 +280,4 @@ class ObjectPermission(models.Model):
         verbose_name = "permission"
 
     def __str__(self):
-        if self.name:
-            return self.name
-        return '{}: {}'.format(
-            ', '.join(self.object_types.values_list('model', flat=True)),
-            ', '.join(self.actions)
-        )
+        return self.name or f'Permission #{self.pk}'

From 95348b1044ba0be99a989dee6591df12e68087e0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 29 Jul 2020 16:27:38 -0400
Subject: [PATCH 402/505] Update site and rack documentation

---
 docs/models/dcim/rack.md            | 16 +++++++++++++---
 docs/models/dcim/rackgroup.md       |  4 ++--
 docs/models/dcim/rackreservation.md |  2 +-
 docs/models/dcim/rackrole.md        |  2 +-
 docs/models/dcim/site.md            | 12 +++++++-----
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/docs/models/dcim/rack.md b/docs/models/dcim/rack.md
index 39858b823..e5e52cc07 100644
--- a/docs/models/dcim/rack.md
+++ b/docs/models/dcim/rack.md
@@ -1,8 +1,10 @@
 # Racks
 
-The rack model represents a physical two- or four-post equipment rack in which equipment is mounted. Each rack must be assigned to a site. Rack height is measured in *rack units* (U); racks are commonly between 42U and 48U tall, but NetBox allows you to define racks of arbitrary height. A toggle is provided to indicate whether rack units are in ascending or descending order.
+The rack model represents a physical two- or four-post equipment rack in which devices can be installed. Each rack must be assigned to a site, and may optionally be assigned to a rack group and/or tenant. Racks can also be organized by user-defined functional roles.
 
-Each rack is assigned a name and (optionally) a separate facility ID. This is helpful when leasing space in a data center your organization does not own: The facility will often assign a seemingly arbitrary ID to a rack (for example, "M204.313") whereas internally you refer to is simply as "R113." A unique serial number may also be associated with each rack.
+Rack height is measured in *rack units* (U); racks are commonly between 42U and 48U tall, but NetBox allows you to define racks of arbitrary height. A toggle is provided to indicate whether rack units are in ascending (from the ground up) or descending order.
+
+Each rack is assigned a name and (optionally) a separate facility ID. This is helpful when leasing space in a data center your organization does not own: The facility will often assign a seemingly arbitrary ID to a rack (for example, "M204.313") whereas internally you refer to is simply as "R113." A unique serial number and asset tag may also be associated with each rack.
 
 A rack must be designated as one of the following types:
 
@@ -12,4 +14,12 @@ A rack must be designated as one of the following types:
 * Wall-mounted frame
 * Wall-mounted cabinet
 
-Each rack has two faces (front and rear) on which devices can be mounted. Rail-to-rail width may be 19 or 23 inches.
+Similarly, each rack must be assigned an operational status, which is one of the following:
+
+* Reserved
+* Available
+* Planned
+* Active
+* Deprecated
+
+Each rack has two faces (front and rear) on which devices can be mounted. Rail-to-rail width may be 10, 19, 21, or 23 inches. The outer width and depth of a rack or cabinet can also be annotated in millimeters or inches.
diff --git a/docs/models/dcim/rackgroup.md b/docs/models/dcim/rackgroup.md
index f5b2428e6..974285f71 100644
--- a/docs/models/dcim/rackgroup.md
+++ b/docs/models/dcim/rackgroup.md
@@ -1,7 +1,7 @@
 # Rack Groups
 
-Racks can be arranged into groups. As with sites, how you choose to designate rack groups will depend on the nature of your organization. For example, if each site represents a campus, each group might represent a building within a campus. If each site represents a building, each rack group might equate to a floor or room.
+Racks can be organized into groups, which can be nested into themselves similar to regions. As with sites, how you choose to designate rack groups will depend on the nature of your organization. For example, if each site represents a campus, each group might represent a building within a campus. If each site represents a building, each rack group might equate to a floor or room.
 
-Each rack group must be assigned to a parent site, and rack groups may optionally be nested to achieve a multi-level hierarchy.
+Each rack group must be assigned to a parent site, and rack groups may optionally be nested within a site to model a multi-level hierarchy. For example, you might have a tier of rooms beneath a tier of floors, all belonging to the same parent building (site).
 
 The name and facility ID of each rack within a group must be unique. (Racks not assigned to the same rack group may have identical names and/or facility IDs.)
diff --git a/docs/models/dcim/rackreservation.md b/docs/models/dcim/rackreservation.md
index 09de55553..0ed9651a0 100644
--- a/docs/models/dcim/rackreservation.md
+++ b/docs/models/dcim/rackreservation.md
@@ -1,3 +1,3 @@
 # Rack Reservations
 
-Users can reserve units within a rack for future use. Multiple non-contiguous rack units can be associated with a single reservation (but reservations cannot span multiple racks). A rack reservation may optionally designate a specific tenant.
+Users can reserve specific units within a rack for future use. An arbitrary set of units within a rack can be associated with a single reservation, but reservations cannot span multiple racks. A description is required for each reservation, reservations may optionally be associated with a specific tenant.
diff --git a/docs/models/dcim/rackrole.md b/docs/models/dcim/rackrole.md
index 63e9c1469..1375ce692 100644
--- a/docs/models/dcim/rackrole.md
+++ b/docs/models/dcim/rackrole.md
@@ -1,3 +1,3 @@
 # Rack Roles
 
-Each rack can optionally be assigned a functional role. For example, you might designate a rack for compute or storage resources, or to house colocated customer devices. Rack roles are fully customizable.
+Each rack can optionally be assigned a user-defined functional role. For example, you might designate a rack for compute or storage resources, or to house colocated customer devices. Rack roles are fully customizable and may be color-coded.
diff --git a/docs/models/dcim/site.md b/docs/models/dcim/site.md
index b13056a99..6617b950c 100644
--- a/docs/models/dcim/site.md
+++ b/docs/models/dcim/site.md
@@ -1,13 +1,15 @@
 # Sites
 
-How you choose to use sites will depend on the nature of your organization, but typically a site will equate to a building or campus. For example, a chain of banks might create a site to represent each of its branches, a site for its corporate headquarters, and two additional sites for its presence in two colocation facilities.
+How you choose to employ sites when modeling your network may vary depending on the nature of your organization, but generally a site will equate to a building or campus. For example, a chain of banks might create a site to represent each of its branches, a site for its corporate headquarters, and two additional sites for its presence in two colocation facilities.
 
-Each site must be assigned one of the following operational statuses:
+Each site must be assigned a unique name and may optionally be assigned to a region and/or tenant. The following operational statuses are available:
 
-* Active
 * Planned
+* Staging
+* Active
+* Decommissioning
 * Retired
 
-The site model provides a facility ID field which can be used to annotate a facility ID (such as a datacenter name) associated with the site. Each site may also have an autonomous system (AS) number and time zone associated with it. (Time zones are provided by the [pytz](https://pypi.org/project/pytz/) package.)
+The site model also provides a facility ID field which can be used to annotate a facility ID (such as a datacenter name) associated with the site. Each site may also have an autonomous system (AS) number and time zone associated with it. (Time zones are provided by the [pytz](https://pypi.org/project/pytz/) package.)
 
-The site model also includes several fields for storing contact and address information.
+The site model also includes several fields for storing contact and address information as well as geolocation data (GPS coordinates).

From cea6c98f5422bab68e903fea4a3e70fc8d26c462 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 10:05:29 -0400
Subject: [PATCH 403/505] Fixes #4930: Replicate label values when
 instantiating device type components

---
 docs/release-notes/version-2.9.md                |  1 +
 netbox/dcim/models/device_component_templates.py | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index a13a7ef2a..78668234b 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -12,6 +12,7 @@
 * [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
 * [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
 * [#4921](https://github.com/netbox-community/netbox/issues/4921) - Render non-viewable devices as unavailable space in rack elevations
+* [#4930](https://github.com/netbox-community/netbox/issues/4930) - Replicate label values when instantiating device type components
 
 ---
 
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index 7e96a8016..492fe3762 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -100,6 +100,7 @@ class ConsolePortTemplate(ComponentTemplateModel):
         return ConsolePort(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type
         )
 
@@ -122,6 +123,7 @@ class ConsoleServerPortTemplate(ComponentTemplateModel):
         return ConsoleServerPort(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type
         )
 
@@ -156,6 +158,7 @@ class PowerPortTemplate(ComponentTemplateModel):
         return PowerPort(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type,
             maximum_draw=self.maximum_draw,
             allocated_draw=self.allocated_draw
@@ -205,6 +208,7 @@ class PowerOutletTemplate(ComponentTemplateModel):
         return PowerOutlet(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type,
             power_port=power_port,
             feed_leg=self.feed_leg
@@ -239,6 +243,7 @@ class InterfaceTemplate(ComponentTemplateModel):
         return Interface(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type,
             mgmt_only=self.mgmt_only
         )
@@ -293,6 +298,7 @@ class FrontPortTemplate(ComponentTemplateModel):
         return FrontPort(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type,
             rear_port=rear_port,
             rear_port_position=self.rear_port_position
@@ -320,6 +326,7 @@ class RearPortTemplate(ComponentTemplateModel):
         return RearPort(
             device=device,
             name=self.name,
+            label=self.label,
             type=self.type,
             positions=self.positions
         )
@@ -336,5 +343,6 @@ class DeviceBayTemplate(ComponentTemplateModel):
     def instantiate(self, device):
         return DeviceBay(
             device=device,
-            name=self.name
+            name=self.name,
+            label=self.label
         )

From 7b45d06631c263e7ea950d1cad8c8541305f3871 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 10:08:36 -0400
Subject: [PATCH 404/505] Fixes #4931: Fix DoesNotExist exception when deleting
 devices

---
 docs/release-notes/version-2.9.md       | 1 +
 netbox/dcim/models/device_components.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 78668234b..7e11d5e87 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -13,6 +13,7 @@
 * [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
 * [#4921](https://github.com/netbox-community/netbox/issues/4921) - Render non-viewable devices as unavailable space in rack elevations
 * [#4930](https://github.com/netbox-community/netbox/issues/4930) - Replicate label values when instantiating device type components
+* [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
 
 ---
 
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 6764f8bcf..4779b867a 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -71,11 +71,16 @@ class ComponentModel(models.Model):
 
     def to_objectchange(self, action):
         # Annotate the parent Device
+        try:
+            device = self.device
+        except ObjectDoesNotExist:
+            # The parent Device has already been deleted
+            device = None
         return ObjectChange(
             changed_object=self,
             object_repr=str(self),
             action=action,
-            related_object=self.device,
+            related_object=device,
             object_data=serialize_object(self)
         )
 

From d42a37f86679e6c4a33e842fe15799f0bc6171fb Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 11:36:46 -0400
Subject: [PATCH 405/505] Update docs for tags, config contexts

---
 docs/additional-features/context-data.md |  3 --
 docs/additional-features/tags.md         |  3 --
 docs/models/extras/configcontext.md      | 64 +++++++++++++++++++++++-
 docs/models/extras/tag.md                | 22 ++++----
 mkdocs.yml                               |  4 +-
 5 files changed, 73 insertions(+), 23 deletions(-)
 delete mode 100644 docs/additional-features/context-data.md
 delete mode 100644 docs/additional-features/tags.md

diff --git a/docs/additional-features/context-data.md b/docs/additional-features/context-data.md
deleted file mode 100644
index 432203f92..000000000
--- a/docs/additional-features/context-data.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Context Data
-
-{!docs/models/extras/configcontext.md!}
diff --git a/docs/additional-features/tags.md b/docs/additional-features/tags.md
deleted file mode 100644
index 0609524f4..000000000
--- a/docs/additional-features/tags.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tagging
-
-{!docs/models/extras/tag.md!}
diff --git a/docs/models/extras/configcontext.md b/docs/models/extras/configcontext.md
index 380e631d8..af81cfbf9 100644
--- a/docs/models/extras/configcontext.md
+++ b/docs/models/extras/configcontext.md
@@ -1,5 +1,65 @@
 # Configuration Contexts
 
-Sometimes it is desirable to associate arbitrary data with a group of devices to aid in their configuration. For example, you might want to associate a set of syslog servers for all devices at a particular site. Context data enables the association of arbitrary data to devices and virtual machines grouped by region, site, role, platform, and/or tenant. Context data is arranged hierarchically, so that data with a higher weight can be entered to override more general lower-weight data. Multiple instances of data are automatically merged by NetBox to present a single dictionary for each object.
+Sometimes it is desirable to associate additional data with a group of devices or virtual machines to aid in automated configuration. For example, you might want to associate a set of syslog servers for all devices within a particular region. Context data enables the association of extra user-defined data with devices and virtual machines grouped by one or more of the following assignments:
 
-Devices and Virtual Machines may also have a local config context defined. This local context will always overwrite the rendered config context objects for the Device/VM. This is useful in situations were the device requires a one-off value different from the rest of the environment.
+* Region
+* Site
+* Role
+* Platform
+* Cluster group
+* Cluster
+* Tenant group
+* Tenant
+* Tag
+
+## Hierarchical Rendering
+
+Context data is arranged hierarchically, so that data with a higher weight can be entered to override lower-weight data. Multiple instances of data are automatically merged by NetBox to present a single dictionary for each object.
+
+For example, suppose we want to specify a set of syslog and NTP servers for all devices within a region. We could create a config context instance with a weight of 1000 assigned to the region, with the following JSON data:
+
+```json
+{
+    "ntp-servers": [
+        "172.16.10.22",
+        "172.16.10.33"
+    ],
+    "syslog-servers": [
+        "172.16.9.100",
+        "172.16.9.101"
+    ]
+}
+```
+
+But suppose there's a problem at one particular site within this region preventing traffic from reaching the regional syslog server. Devices there need to use a local syslog server instead of the two defined above. We'll create a second config context assigned only to that site with a weight of 2000 and the following data:
+
+```json
+{
+    "syslog-servers": [
+        "192.168.43.107"
+    ]
+}
+```
+
+When the context data for a device at this site is rendered, the second, higher-weight data overwrite the first, resulting in the following:
+
+```json
+{
+    "ntp-servers": [
+        "172.16.10.22",
+        "172.16.10.33"
+    ],
+    "syslog-servers": [
+        "192.168.43.107"
+    ]
+}
+```
+
+Data from the higher-weight context overwrites conflicting data from the lower-weight context, while the non-conflicting portion of the lower-weight context (the list of NTP servers) is preserved.
+
+## Local Context Data
+
+Devices and virtual machines may also have a local config context defined. This local context will _always_ take precedence over any separate config context objects which apply to the device/VM. This is useful in situations where we need to call out a specific deviation in the data for a particular object.
+
+!!! warning
+    If you find that you're routinely defining local context data for many individual devices or virtual machines, custom fields may offer a more effective solution.
diff --git a/docs/models/extras/tag.md b/docs/models/extras/tag.md
index f94957616..29cc8b757 100644
--- a/docs/models/extras/tag.md
+++ b/docs/models/extras/tag.md
@@ -1,24 +1,20 @@
 # Tags
 
-Tags are free-form text labels which can be applied to a variety of objects within NetBox. Tags are created on-demand as they are assigned to objects. Use commas to separate tags when adding multiple tags to an object (for example: `Inventoried, Monitored`). Use double quotes around a multi-word tag when adding only one tag, e.g. `"Core Switch"`.
+Tags are user-defined labels which can be applied to a variety of objects within NetBox. They can be used to establish dimensions of organization beyond the relationships built into NetBox. For example, you might create a tag to identify a particular ownership or condition across several types of objects.
 
-Each tag has a label and a URL-friendly slug. For example, the slug for a tag named "Dunder Mifflin, Inc." would be `dunder-mifflin-inc`. The slug is generated automatically and makes tags easier to work with as URL parameters.
+Each tag has a label, color, and a URL-friendly slug. For example, the slug for a tag named "Dunder Mifflin, Inc." would be `dunder-mifflin-inc`. The slug is generated automatically and makes tags easier to work with as URL parameters. Each tag can also be assigned a description indicating its purpose.
 
 Objects can be filtered by the tags they have applied. For example, the following API request will retrieve all devices tagged as "monitored":
 
-```
+```no-highlight
 GET /api/dcim/devices/?tag=monitored
 ```
 
-Tags are included in the API representation of an object as a list of plain strings:
+The `tag` filter can be specified multiple times to match only objects which have _all_ of the specified tags assigned:
 
+```no-highlight
+GET /api/dcim/devices/?tag=monitored&tag=deprecated
 ```
-{
-    ...
-    "tags": [
-        "Core Switch",
-        "Monitored"
-    ],
-    ...
-}
-```
+
+!!! note
+    Tags have changed substantially in NetBox v2.9. They are no longer created on-demand when editing an object, and their representation in the REST API now includes a complete depiction of the tag rather than only its label.
diff --git a/mkdocs.yml b/mkdocs.yml
index 091a3af5c..9de863b4c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -44,7 +44,7 @@ nav:
     - Additional Features:
         - Caching: 'additional-features/caching.md'
         - Change Logging: 'additional-features/change-logging.md'
-        - Context Data: 'additional-features/context-data.md'
+        - Context Data: 'models/extras/configcontext.md'
         - Custom Fields: 'additional-features/custom-fields.md'
         - Custom Links: 'additional-features/custom-links.md'
         - Custom Scripts: 'additional-features/custom-scripts.md'
@@ -53,7 +53,7 @@ nav:
         - NAPALM: 'additional-features/napalm.md'
         - Prometheus Metrics: 'additional-features/prometheus-metrics.md'
         - Reports: 'additional-features/reports.md'
-        - Tags: 'additional-features/tags.md'
+        - Tags: 'models/extras/tag.md'
         - Webhooks: 'additional-features/webhooks.md'
     - Plugins:
         - Using Plugins: 'plugins/index.md'

From 96d2a8b30aa7313bfd03036edaaea22938ca82ea Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 12:55:51 -0400
Subject: [PATCH 406/505] Update IPAM model documentation

---
 docs/core-functionality/ipam.md |  1 +
 docs/models/ipam/aggregate.md   | 21 +++++++++++++++++----
 docs/models/ipam/ipaddress.md   | 11 +++++++----
 docs/models/ipam/prefix.md      |  6 +++---
 docs/models/ipam/rir.md         |  6 +++---
 docs/models/ipam/vlan.md        |  4 ++--
 docs/models/ipam/vlangroup.md   |  4 +++-
 docs/models/ipam/vrf.md         |  6 +++---
 8 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/docs/core-functionality/ipam.md b/docs/core-functionality/ipam.md
index 38572cb25..e5ab22f19 100644
--- a/docs/core-functionality/ipam.md
+++ b/docs/core-functionality/ipam.md
@@ -6,6 +6,7 @@
 ---
 
 {!docs/models/ipam/prefix.md!}
+{!docs/models/ipam/role.md!}
 
 ---
 
diff --git a/docs/models/ipam/aggregate.md b/docs/models/ipam/aggregate.md
index f43209619..ff5a50a39 100644
--- a/docs/models/ipam/aggregate.md
+++ b/docs/models/ipam/aggregate.md
@@ -1,6 +1,18 @@
 # Aggregates
 
-The first step to documenting your IP space is to define its scope by creating aggregates. Aggregates establish the root of your IP address hierarchy by defining the top-level allocations that you're interested in managing. Most organizations will want to track some commonly-used private IP spaces, such as:
+IP addressing is by nature hierarchical. The first few levels of the IPv4 hierarchy, for example, look like this:
+
+* 0.0.0.0/0
+    * 0.0.0.0/1
+        * 0.0.0.0/2
+        * 64.0.0.0/2
+    * 128.0.0.0/1
+        * 128.0.0.0/2
+        * 192.0.0.0/2
+
+This hierarchy comprises 33 tiers of addressing, from /0 all the way down to individual /32 address (and much, much further to /128 for IPv6). Of course, most organizations are concerned with only relatively small portions of the total IP space, so tracking the uppermost of these tiers isn't necessary.
+
+NetBox allows us to specify the portions of IP space that are interesting to us by defining _aggregates_. Typically, an aggregate will correspond to either an allocation of public (globally routable) IP space granted by a regional authority, or a private (internally-routable) designation. Common private designations include:
 
 * 10.0.0.0/8 (RFC 1918)
 * 100.64.0.0/10 (RFC 6598)
@@ -8,8 +20,9 @@ The first step to documenting your IP space is to define its scope by creating a
 * 192.168.0.0/16 (RFC 1918)
 * One or more /48s within fd00::/8 (IPv6 unique local addressing)
 
-In addition to one or more of these, you'll want to create an aggregate for each globally-routable space your organization has been allocated. These aggregates should match the allocations recorded in public WHOIS databases.
+Each aggregate is assigned to a RIR. For "public" aggregates, this will be the real-world authority which has granted your organization permission to use the specified IP space on the public Internet. For "private" aggregates, this will be a statutory authority, such as RFC 1918. Each aggregate can also annotate that date on which it was allocated, where applicable.
 
-Each IP prefix will be automatically arranged under its parent aggregate if one exists. Note that it's advised to create aggregates only for IP ranges actually allocated to your organization (or marked for private use): There is no need to define aggregates for provider-assigned space which is only used on Internet circuits, for example.
+Prefixes are automatically arranged beneath their parent aggregates in NetBox. Typically you'll want to create aggregates only for the prefixes and IP addresses that your organization actually manages: There is no need to define aggregates for provider-assigned space which is only used on Internet circuits, for example.
 
-Aggregates cannot overlap with one another: They can only exist side-by-side. For instance, you cannot define both 10.0.0.0/8 and 10.16.0.0/16 as aggregates, because they overlap. 10.16.0.0/16 in this example would be created as a prefix and automatically grouped under 10.0.0.0/8. Remember, the purpose of aggregates is to establish the root of your IP addressing hierarchy.
+!!! note
+    Because aggregates represent swaths of the global IP space, they cannot overlap with one another: They can only exist side-by-side. For instance, you cannot define both 10.0.0.0/8 and 10.16.0.0/16 as aggregates, because they overlap. 10.16.0.0/16 in this example would be created as a container prefix and automatically grouped under the 10.0.0.0/8 aggregate. Remember, the purpose of aggregates is to establish the root of your IP addressing hierarchy.
diff --git a/docs/models/ipam/ipaddress.md b/docs/models/ipam/ipaddress.md
index cbe12553d..04ac417db 100644
--- a/docs/models/ipam/ipaddress.md
+++ b/docs/models/ipam/ipaddress.md
@@ -2,16 +2,16 @@
 
 An IP address comprises a single host address (either IPv4 or IPv6) and its subnet mask. Its mask should match exactly how the IP address is configured on an interface in the real world.
 
-Like prefixes, an IP address can optionally be assigned to a VRF (otherwise, it will appear in the "global" table). IP addresses are automatically organized under parent prefixes within their respective VRFs.
+Like a prefix, an IP address can optionally be assigned to a VRF (otherwise, it will appear in the "global" table). IP addresses are automatically arranged under parent prefixes within their respective VRFs according to the IP hierarchy.
 
-Also like prefixes, each IP address can be assigned a status and a role. Statuses are hard-coded in NetBox and include the following:
+Each IP address can also be assigned an operational status and a functional role. Statuses are hard-coded in NetBox and include the following:
 
 * Active
 * Reserved
 * Deprecated
 * DHCP
 
-Each IP address can optionally be assigned a special role. Roles are used to indicate some special attribute of an IP address: for example, it is used as a loopback, or is a virtual IP maintained using VRRP. (Note that this differs in purpose from a _functional_ role, and thus cannot be customized.) Available roles include:
+Roles are used to indicate some special attribute of an IP address; for example, use as a loopback or as the the virtual IP for a VRRP group. (Note that functional roles are conceptual in nature, and thus cannot be customized by the user.) Available roles include:
 
 * Loopback
 * Secondary
@@ -21,7 +21,10 @@ Each IP address can optionally be assigned a special role. Roles are used to ind
 * HSRP
 * GLBP
 
-An IP address can be assigned to a device or virtual machine interface, and an interface may have multiple IP addresses assigned to it. Further, each device and virtual machine may have one of its interface IPs designated as its primary IP address (one for IPv4 and one for IPv6).
+An IP address can be assigned to any device or virtual machine interface, and an interface may have multiple IP addresses assigned to it. Further, each device and virtual machine may have one of its interface IPs designated as its primary IP per address family (one for IPv4 and one for IPv6).
+
+!!! note
+    When primary IPs are set for both IPv4 and IPv6, NetBox will prefer IPv6. This can be changed by setting the `PREFER_IPV4` configuration parameter.
 
 ## Network Address Translation (NAT)
 
diff --git a/docs/models/ipam/prefix.md b/docs/models/ipam/prefix.md
index 9ab5382a5..bd5e9695f 100644
--- a/docs/models/ipam/prefix.md
+++ b/docs/models/ipam/prefix.md
@@ -2,7 +2,7 @@
 
 A prefix is an IPv4 or IPv6 network and mask expressed in CIDR notation (e.g. 192.0.2.0/24). A prefix entails only the "network portion" of an IP address: All bits in the address not covered by the mask must be zero. (In other words, a prefix cannot be a specific IP address.)
 
-Prefixes are automatically arranged by their parent aggregates. Additionally, each prefix can be assigned to a particular site and VRF (routing table). All prefixes not assigned to a VRF will appear in the "global" table.
+Prefixes are automatically organized by their parent aggregates. Additionally, each prefix can be assigned to a particular site and virtual routing and forwarding instance (VRF). Each VRF represents a separate IP space or routing table. All prefixes not assigned to a VRF are considered to be in the "global" table.
 
 Each prefix can be assigned a status and a role. These terms are often used interchangeably so it's important to recognize the difference between them. The **status** defines a prefix's operational state. Statuses are hard-coded in NetBox and can be one of the following:
 
@@ -13,6 +13,6 @@ Each prefix can be assigned a status and a role. These terms are often used inte
 
 On the other hand, a prefix's **role** defines its function. Role assignment is optional and roles are fully customizable. For example, you might create roles to differentiate between production and development infrastructure.
 
-A prefix may also be assigned to a VLAN. This association is helpful for identifying which prefixes are included when reviewing a list of VLANs.
+A prefix may also be assigned to a VLAN. This association is helpful for associating address space with layer two domains. A VLAN may have multiple prefixes assigned to it.
 
-The prefix model include a "pool" flag. If enabled, NetBox will treat this prefix as a range (such as a NAT pool) wherein every IP address is valid and assignable. This logic is used for identifying available IP addresses within a prefix. If this flag is disabled, NetBox will assume that the first and last (broadcast) address within the prefix are unusable.
+The prefix model include an "is pool" flag. If enabled, NetBox will treat this prefix as a range (such as a NAT pool) wherein every IP address is valid and assignable. This logic is used when identifying available IP addresses within a prefix. If this flag is disabled, NetBox will assume that the first and last (broadcast) address within an IPv4 prefix are unusable.
diff --git a/docs/models/ipam/rir.md b/docs/models/ipam/rir.md
index 69c34e72d..6904381ac 100644
--- a/docs/models/ipam/rir.md
+++ b/docs/models/ipam/rir.md
@@ -1,7 +1,7 @@
 # Regional Internet Registries (RIRs)
 
-[Regional Internet registries](https://en.wikipedia.org/wiki/Regional_Internet_registry) are responsible for the allocation of globally-routable address space. The five RIRs are ARIN, RIPE, APNIC, LACNIC, and AFRINIC. However, some address space has been set aside for internal use, such as defined in RFCs 1918 and 6598. NetBox considers these RFCs as a sort of RIR as well; that is, an authority which "owns" certain address space. There also exist lower-tier registries which serve a particular geographic area.
+[Regional Internet registries](https://en.wikipedia.org/wiki/Regional_Internet_registry) are responsible for the allocation of globally-routable address space. The five RIRs are ARIN, RIPE, APNIC, LACNIC, and AFRINIC. However, some address space has been set aside for internal use, such as defined in RFCs 1918 and 6598. NetBox considers these RFCs as a sort of RIR as well; that is, an authority which "owns" certain address space. There also exist lower-tier registries which serve particular geographic areas.
 
-Each aggregate must be assigned to one RIR. You are free to define whichever RIRs you choose (or create your own). The RIR model includes a boolean flag which indicates whether the RIR allocates only private IP space.
+Users can create whatever RIRs they like, but each aggregate must be assigned to one RIR. The RIR model includes a boolean flag which indicates whether the RIR allocates only private IP space.
 
-For example, suppose your organization has been allocated 104.131.0.0/16 by ARIN. It also makes use of RFC 1918 addressing internally. You would first create RIRs named ARIN and RFC 1918, then create an aggregate for each of these top-level prefixes, assigning it to its respective RIR.
+For example, suppose your organization has been allocated 104.131.0.0/16 by ARIN. It also makes use of RFC 1918 addressing internally. You would first create RIRs named "ARIN" and "RFC 1918," then create an aggregate for each of these top-level prefixes, assigning it to its respective RIR.
diff --git a/docs/models/ipam/vlan.md b/docs/models/ipam/vlan.md
index 48f24006c..f252204c5 100644
--- a/docs/models/ipam/vlan.md
+++ b/docs/models/ipam/vlan.md
@@ -1,6 +1,6 @@
 # VLANs
 
-A VLAN represents an isolated layer two domain, identified by a name and a numeric ID (1-4094) as defined in [IEEE 802.1Q](https://en.wikipedia.org/wiki/IEEE_802.1Q). Each VLAN may be assigned to a site and/or VLAN group.
+A VLAN represents an isolated layer two domain, identified by a name and a numeric ID (1-4094) as defined in [IEEE 802.1Q](https://en.wikipedia.org/wiki/IEEE_802.1Q). Each VLAN may be assigned to a site, tenant, and/or VLAN group.
 
 Each VLAN must be assigned one of the following operational statuses:
 
@@ -8,4 +8,4 @@ Each VLAN must be assigned one of the following operational statuses:
 * Reserved
 * Deprecated
 
-Each VLAN may also be assigned a functional role. Prefixes and VLANs share the same set of customizable roles.
+As with prefixes, each VLAN may also be assigned a functional role. Prefixes and VLANs share the same set of customizable roles.
diff --git a/docs/models/ipam/vlangroup.md b/docs/models/ipam/vlangroup.md
index 1fa31c522..7a0bb80ff 100644
--- a/docs/models/ipam/vlangroup.md
+++ b/docs/models/ipam/vlangroup.md
@@ -1,3 +1,5 @@
 # VLAN Groups
 
-VLAN groups can be used to organize VLANs within NetBox. Groups can also be used to enforce uniqueness: Each VLAN within a group must have a unique ID and name. VLANs which are not assigned to a group may have overlapping names and IDs (including VLANs which belong to a common site). For example, you can create two VLANs with ID 123, but they cannot both be assigned to the same group.
+VLAN groups can be used to organize VLANs within NetBox. Each group may optionally be assigned to a specific site, but a group cannot belong to multiple sites.
+
+Groups can also be used to enforce uniqueness: Each VLAN within a group must have a unique ID and name. VLANs which are not assigned to a group may have overlapping names and IDs (including VLANs which belong to a common site). For example, you can create two VLANs with ID 123, but they cannot both be assigned to the same group.
diff --git a/docs/models/ipam/vrf.md b/docs/models/ipam/vrf.md
index c3d3390e4..599d05c82 100644
--- a/docs/models/ipam/vrf.md
+++ b/docs/models/ipam/vrf.md
@@ -1,12 +1,12 @@
 # Virtual Routing and Forwarding (VRF)
 
-A VRF object in NetBox represents a virtual routing and forwarding (VRF) domain. Each VRF is essentially a separate routing table. VRFs are commonly used to isolate customers or organizations from one another within a network, or to route overlapping address space (e.g. multiple instances of the 10.0.0.0/8 space).
+A VRF object in NetBox represents a virtual routing and forwarding (VRF) domain. Each VRF is essentially a separate routing table. VRFs are commonly used to isolate customers or organizations from one another within a network, or to route overlapping address space (e.g. multiple instances of the 10.0.0.0/8 space). Each VRF may be assigned to a specific tenant to aid in organizing the available IP space by customer or internal user.
 
 Each VRF is assigned a unique name and an optional route distinguisher (RD). The RD is expected to take one of the forms prescribed in [RFC 4364](https://tools.ietf.org/html/rfc4364#section-4.2), however its formatting is not strictly enforced.
 
-Each prefix and IP address may be assigned to one (and only one) VRF. If you have a prefix or IP address which exists in multiple VRFs, you will need to create a separate instance of it in NetBox for each VRF. Any IP prefix or address not assigned to a VRF is said to belong to the "global" table.
+Each prefix and IP address may be assigned to one (and only one) VRF. If you have a prefix or IP address which exists in multiple VRFs, you will need to create a separate instance of it in NetBox for each VRF. Any prefix or IP address not assigned to a VRF is said to belong to the "global" table.
 
-By default, NetBox will allow duplicate prefixes to be assigned to a VRF. This behavior can be disabled by setting the "enforce unique" flag on the VRF model.
+By default, NetBox will allow duplicate prefixes to be assigned to a VRF. This behavior can be toggled by setting the "enforce unique" flag on the VRF model.
 
 !!! note
     Enforcement of unique IP space can be toggled for global table (non-VRF prefixes) using the `ENFORCE_GLOBAL_UNIQUE` configuration setting.

From 190a2ff92b8bff17349d3551c78b105f06607bfa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 13:02:53 -0400
Subject: [PATCH 407/505] Update tenancy documentation

---
 docs/models/tenancy/tenant.md      | 5 +++--
 docs/models/tenancy/tenantgroup.md | 4 ++--
 mkdocs.yml                         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/models/tenancy/tenant.md b/docs/models/tenancy/tenant.md
index f7cf68ab8..60a160b9e 100644
--- a/docs/models/tenancy/tenant.md
+++ b/docs/models/tenancy/tenant.md
@@ -1,6 +1,6 @@
 # Tenants
 
-A tenant represents a discrete entity for administrative purposes. Typically, tenants are used to represent individual customers or internal departments within an organization. The following objects can be assigned to tenants:
+A tenant represents a discrete grouping of resources used for administrative purposes. Typically, tenants are used to represent individual customers or internal departments within an organization. The following objects can be assigned to tenants:
 
 * Sites
 * Racks
@@ -11,6 +11,7 @@ A tenant represents a discrete entity for administrative purposes. Typically, te
 * IP addresses
 * VLANs
 * Circuits
+* Clusters
 * Virtual machines
 
-Tenant assignment is used to signify ownership of an object in NetBox. As such, each object may only be owned by a single tenant. For example, if you have a firewall dedicated to a particular customer, you would assign it to the tenant which represents that customer. However, if the firewall serves multiple customers, it doesn't *belong* to any particular customer, so tenant assignment would not be appropriate.
+Tenant assignment is used to signify the ownership of an object in NetBox. As such, each object may only be owned by a single tenant. For example, if you have a firewall dedicated to a particular customer, you would assign it to the tenant which represents that customer. However, if the firewall serves multiple customers, it doesn't *belong* to any particular customer, so tenant assignment would not be appropriate.
diff --git a/docs/models/tenancy/tenantgroup.md b/docs/models/tenancy/tenantgroup.md
index a2ed7e324..078a71a72 100644
--- a/docs/models/tenancy/tenantgroup.md
+++ b/docs/models/tenancy/tenantgroup.md
@@ -1,5 +1,5 @@
 # Tenant Groups
 
-Tenants can be organized by custom groups. For instance, you might create one group called "Customers" and one called "Acquisitions." The assignment of tenants to groups is optional.
+Tenants can be organized by custom groups. For instance, you might create one group called "Customers" and one called "Departments." The assignment of a tenant to a group is optional.
 
-Tenant groups may be nested to achieve a multi-level hierarchy. For example, you might have a group called "Customers" containing subgroups of individual tenants grouped by product or account team.
+Tenant groups may be nested recursively to achieve a multi-level hierarchy. For example, you might have a group called "Customers" containing subgroups of individual tenants grouped by product or account team.
diff --git a/mkdocs.yml b/mkdocs.yml
index 9de863b4c..af72207d9 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,7 +40,7 @@ nav:
         - Circuits: 'core-functionality/circuits.md'
         - Power Tracking: 'core-functionality/power.md'
         - Secrets: 'core-functionality/secrets.md'
-        - Tenancy Assignment: 'core-functionality/tenancy.md'
+        - Tenancy: 'core-functionality/tenancy.md'
     - Additional Features:
         - Caching: 'additional-features/caching.md'
         - Change Logging: 'additional-features/change-logging.md'

From f49998980fb8e9a2e6f3f46bce71c87ca4431987 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 13:36:40 -0400
Subject: [PATCH 408/505] Update power documentation

---
 docs/core-functionality/power.md  |  32 +-----------------------------
 docs/media/power_distribution.png | Bin 0 -> 33263 bytes
 docs/models/dcim/powerfeed.md     |  19 +++++++++++++++---
 docs/models/dcim/powerpanel.md    |   7 ++++++-
 4 files changed, 23 insertions(+), 35 deletions(-)
 create mode 100644 docs/media/power_distribution.png

diff --git a/docs/core-functionality/power.md b/docs/core-functionality/power.md
index 026acd602..571109936 100644
--- a/docs/core-functionality/power.md
+++ b/docs/core-functionality/power.md
@@ -5,34 +5,4 @@
 
 # Example Power Topology
 
-Below is a simple diagram demonstrating how power is modeled in NetBox.
-
-!!! note
-    The power feeds are connected to the same power panel for illustrative purposes; usually, you would have such feeds diversely connected to panels to avoid the single point of failure.
-
-```
-          +---------------+
-          | Power panel 1 |
-          +---------------+
-            |           |
-            |           |
-+--------------+     +--------------+
-| Power feed 1 |     | Power feed 2 |
-+--------------+     +--------------+
-       |                     |
-       |                     |
-       |                     |    <-- Power ports
-     +---------+     +---------+
-     |  PDU 1  |     |  PDU 2  |
-     +---------+     +---------+
-       |       \     /       |    <-- Power outlets
-       |        \   /        |
-       |         \ /         |
-       |          X          |
-       |         / \         |
-       |        /   \        |
-       |       /     \       |    <-- Power ports
-      +--------+     +--------+
-      | Server |     | Router |
-      +--------+     +--------+
-```
+![Power distribution model](../../media/power_distribution.png)
diff --git a/docs/media/power_distribution.png b/docs/media/power_distribution.png
new file mode 100644
index 0000000000000000000000000000000000000000..48c1e5f4f5939f292cab0e2253619f54ac144a03
GIT binary patch
literal 33263
zcmeFZXH=6<*Dp+yCPh%G0aQd#n)J{`6a=J1kX}?eq4y2~ic*3|?>%&o-U)~hq(xfj
zoq%-d($5w2f8Wn@p8Lyr-}lSA)>(^iU76W4v-ixN*?VUHCLh&Q<jF}HNO5p*$Q7PF
zd4Yq22LnFC#DqYKiu|h~92|cfg(or^?&IrClwV$&`y4i~5`kNADduJr9+N+?yIWc*
z`jVkP4$7AYS=sAhlp7>-{jp?bVajD}X}kVIPd94%XK3lSP-9PJpR%^FN>knSc23<Q
z@asEKaoQTIrq+9zarvY3UJ!*VY-Th2Q_Dw8sk_Nl2h-+TRforiM}4R7+s01TrJ-l&
z!y}0c-$G4U;@d&j9{+#zFXMD=@v|wb)`vI9P$S0)KVHu}eMur0Ysua7$j)BGue;SD
z*B)br>vAuStWr2!xwLD4zUaU1a4?&E6-zSdvCI3WkoYzMnA)Fp_8ATg`#La+3-f2i
z1>Xs}h6loxZ;8YKQ9UNcg%SKA2*Q!av%iZY4+w#!!UJdlX|PlPEtUO~f8O!_ymnC7
z6M#rsr~sj7i2-VY*$;s9*a|KQE?fTF7C;5i{%s3Oi>(>kE-{up?5m*bKWqYA0M!3x
z<C5T#i@$9F!T_}YwDnKT*b@H|=s(rPhJ!>&pYiUivRo`h{~plt`=pa~_|Cl9NP1_n
zMo((1+dK{Gt?5J5Quce6E-rXuQKnQ{y#gwe#(Uc1(FyQ$I|v7v`mJ<oH);RpnX&QN
z+KleSy86t<iMi*jq@OloC00*Q$_|C35RzK%ifabhbK!#TVdlys^;Z3MGR_iw;L^vl
zY3x!Z65%I3P`Rz5i{a&FLhN8XU;!7ruI~Sg5IqP#ULZPeZeCNpD3XF6ygCyq^-{NO
zg}m}Y78*`i<n1TmBIg4awwkx_uh;$lj_@fsk5mO&CNIzn5UvuPZ?5PEEEw1|n-5g&
zzV#tu92v5ynYkPTpox1j<FO|*6BgjMd=X`orC`oj^yEhYX=}mk-c;l8Vt8`yRTu-w
z&F2<(70D|Z>@NF($Wm;?(|WC%i2ck^y|YUe1BsV?-Q0mmKnOmLSesF4fsCmAJ~?c<
z$O=aco8x1L_$405&u%36o{%rg`R}=oXNtW^pS>`JMk4*QR+a4x<40HDv!`Yq{$jKV
zzjLJS9U8}D*LdLE;&8GhJwQiwQ{tx+>79yrO(KvNC9I1{(iP=H`5Y%pj8tqnR<<pa
zMnvv--7Y%Lvl$+CCUNr3NLrLcVy1Rw<9fu}estk^VuwmAL^S_2ED(YnF}0Nz2>Eok
zt=Cih8#Y7o<QWXc;rAGx6_gF{Wm3Y9#f5%&PTL_4BN!0^4~K{&n_vtUlJe<!BS%B#
z%>%+<D}x2Sj?JXe*(?O@b37OZU!JkaYq1PJ{34=h!+@N)(!2kNmV=bp$G$T8OQZrO
z8s4-a8lcK@Pe`cbf-$}ND$G+^68TtE+I;iJH<v#HaT83sIP^m|@3ux;?)wpc)j=OL
zF?)C|9r&14nzSkQm6|kSg9$O{-)}#zcFTg?mDB$8cPp>(^m3M;gEKY3w<exhZ7zEa
z=HGRB7i))Z%?BkPoeD7|3{?jgnl13<quIQExeHOm{-(4=SkMGN35(p>2xNNV+3VuA
zUcP|QUsbr+37&%^|2E}(U-na;i_u(k#-kSzBs;c7y9FOtBw0W<cRTI$$w9;EPz`o(
zX_+);C=rO<^$fxs{`iPB$={f-6_P?D&Fj06vSsP~<SWHnM|IXn-NWC7cE9%t^WM$U
zsodr)T^IFKJ}W}(&!{G~?s>VWh@}*ue>RFeJJ#DcCBiC73@K=0thH$6k+RHH{;DJ$
z@_IQ90`J@4_l$Vn_Cs<s@6K7?3;pPAfv~0?li^*FL{he9OEJ!B>)TrsTGAxqmDI6O
zbx9Vp4_VARxAe<##2_8&EJXF!?8CDji#~XG<x&|bK*RB*JzoQQggr-jzy-Ho2C_6a
z!<maG6$R`y64GlS%6_!&n&LXR$mzf=_$Q&RVkf4W$U+1AA<quoFO#jYCKf~Eu_n%>
zFoxTIYNP=P@n=O!`NieQOakq~iO=?p@Z?(kg>P2k$rtM>6-4BcU#p5Q=k_=DXz5qn
z)h-#`(wsalSEw5y1zmAHX2e9vWcub(L0#Tk<7?Y6xPZ8$gLS(gp*pf8*u|iL09?R#
z13XR~iWVWA-76L5sk{n1?@UKm<Y%Ct!42CO*6!L1J{<b_Vqp0O@o#eJS#2JB4GWPb
zF@`Rt33?l-zR>4U3h;x<BwfG4AJF^D(F^AsCfLF6vQ$p15G4d=MSct9;nGMoRA_v6
zb`!~vC7IY);q`Pv4li7elv&nda4q;@e!dxQy6||=;5$#-N%Mh|wf&^wj=`B#QJqOB
zqy0LM^YnOed;Y09v(=E^V0YKki!GrLrs*A&BWv<8Ixju_Md{6Ezd}^D#IV!pkNr=W
zrfIC+;ekHl0oG=b4Qplau-4;WEB!yV;P&N;{_nN^KbaMP_R@y^tNj1Js)B5f<@)Mg
z1efX;`_0h<^7aUyZ|85J(~i0j=roU|6Rb_l_`2Gdo@LGF*Q(?Th8`GeSydJCl973@
zn2SvQ%Az$x`7W|wrGcG(NuF`*7YRxIAYewO&#_SFu^lkSay~K^s8xct;yrC^X+ilq
zw~_NoNO=8X@1~)M<ELHjO}cQgz6mITj0Q{C8~Gb?nRyMrVTZf#II89NTFM?v_I}f~
zc^JY3(JwGkZP{{{Hu~@edSmep;0_Een|Ze2&WTb|N643<C7W-D3{D%P<oG%qWF>Jr
zaEXGJC7wwzw*#xedkz(^2ua2(by!oqpPxT{<57lhv-n)yp_oPGaw;fTG3dqH4rSaM
ztIG}7Qya!)vLp|)(?4fjlEV`Wm*sArLB18+oTkXJ*VI`;PbRV;VUEus!7a6Y;SY|p
zKIl#S77tgkbs9t;)W~Puq6OBJjOfIbmk`iS`c|gi2pHTu((l<h)#}-Kwon?Orq@#Y
zAVijV&%k+&fhhM#Oqa4wT${4as1yZ}1H3jdC|o|%T_OZpV$($3-UcCaJF4%W89A&U
zDQp;-5kL1OZV#A#b|XUGp;u=5CXsKOLGz~l4X>%S;i<K?i_6XtB>ytO<Ue(NCD6bp
zhtWasVbkKYTfCFM#Gho#K!ZI`&Z!SsZ&z{zTW$c3(*q{~n;aJ&PxbG?UeYo8MhnwO
z-noiEYN;4PInH9I{v<`I$+i5&pZg=VhuccO*VBV2fiV!Q`#wp%?kgqLOb;(jdoA0u
zl*FB!)Frckesx$O+*-7@Yd(6d;^@6T;Ie5PnRyyNw@gu{_k)*l^i^tY62%bHiF8Dx
z$D+5*8A9iui(`C&0m|SP8O&<^Iep|kHJ9`9t%Js$S0Hk^!#>Ok1#dBF7%N~iOl{#W
zb(hnLjK@EfJ00h^93OZr*jl>BQ%mLG$i<*Vf40U8XRjyQTBb<(PS@%&FvGFjX7CFS
zJ}9o><tW~@aBzKi2+b8)#rMyz>}yW1?8|yO);d|5G7WUU8cpxyC;XCbX8R3Z9{YB5
ztamiE)H}RC2@mYqhAtBT!jRD-%kbHQSz*7#c>{ybTeQ=?_m<T+fgUTSnq;0_QdMs(
zRN6WF+Ay~0*~J8OGHFt|SKxpcd#1M0z!rn;PTi+cWvQ6p4liTHwIbdXH*%39{m#LA
zEP#j{*7d>!IWB#$xa$0GZZq0bTd7JP#;--AMGFUnZys$j79LLlYIZX#e;{vyPi~3<
zc?V=8DM~Svr}`rsQezxe-wvxzy`dJx1~6J~l~~!g_2^6A)@}4rd&!mrKgDRC{HJUe
zU!njPU&@z0DMnw9`&jX;%du-RA~A~%vc9i4_;W^boh#KbnQ#i`h#*|_wR!|6l~c+b
zWnAZ)ZtI)BkF@-;!Ep$Ew3$nI7wBH!fKM@Koz}7hVT&!M3rR(iprT5Ox>05eqwPm}
z7wp(sk%OMJSao4kFEwC6#!yt2dZ?c?AfX1C!maY^r4w)9h9maQa2Jr4*pKEV<&CS~
zzCQ)J!a#^GX>2|6n2*Uti2JPf$;AD+L26gwiZRxGW3g2$-Q%Q>)#_h~ZU_BvPKwTx
zDM{OzUDE05-dm(gBZh6$z`AeLLM&6%nI|QbJQ7kt3)fru?qQj!vVJT#C0HrV;3}Q<
zT2gX}ieMP!jy&CSH|XqY3zKVu5oWzU6ktFP8cWf%({IHWGB3)($N)jVeAlM0IJcz*
z6wmdPNPnYym-*2uOc2UR%<HhW<?3*?shQ~lSL<ZQ+a8%x1!4-imYG0jhO{f`L#8(@
zR~da>R=cVAJ1<D(E6hl7&BRHHa7wcDj9My~V=nO8<KZjO219f`LO-O}ahv1<(muS&
z&h{@4WeBVzJPwvjA9?ocIwZ{A`P$>W)7}<;y^5c4Xi-JWl*!amDx$EFMyk2sZZ+#E
z<&V=WfU<NMC_8#J%Yhyqx1(9ip3vP6>Vlq)2RWeeJJh4m_j~H}Fz}+Y3Gq#?RR)b3
zk~ZFAr;q`$ccN~ElhIXvUdWUpnWw}VJKAUO<I8!IM0wsx#6hRv^x|>LQ}D#c>w>PP
zMk<7+MxE_%@D_DzEIaxz9yR&z4Yq*kt_C%d%~%;ood_?nj!2oP@F=Os7jO7>BXOG0
zBpUCQNPW4at1aq<`E_6-nPNC=s|-y0_G4%Jq}X>VPahq^me8&-xSiasJAv1^q#qGy
zc<a@;&To<cAMOPeeZiGR%GyX1zqY|SE)j{klv=L<;4}77&(j@bU&FO0BEe+VcKtCi
zrn_Xp>Vhe~QU$Z~sxzF+Xh)3V1R2_JNDk7_UCsbzKCa@L2F0!5$<7_N(uMTM<rwUM
zb@in#YzjMu4T!~{LfOuERyU_?zOh(}bv#qY;5sTihPc^2^uPAlr`lxGE=(8GSrAlJ
zk{_$AP>a|mgh}r>n!Nm~tEKq+R*+f*x4VxT3^TS(PEE|V)MIf&eqh>wrRm3UIw(|F
zZnAq@PTA2+Fod;r^LS&uM4mWfkK4@!SSFdG(K3Ub8RU>;GBKt>!ls{;T1a52lv#*?
zN6I?vORP8pm6OsiPCIUvC)q9v8|4iqlWyG_Lh}>3b&LAdZv&}!X(72dqD!k%$K4=p
zM?kljv{%10u$LL>nzQ7%s3{(qG8UdvOCcA8HR}e%A_#L_4j{TjIRp_7jD@g@GSb^Y
z;}!ifB3Cv56?<aIG}PujK_6#VQrQOs`b|c0Eu9&65v$Q@cEOz@LDxcRlo@fwXv1)d
zF{9~Hi)nJTEW^Zyk2ZAAQmW2SMn&95e5{W+@cqLW=X{f?Y=f@V+r}gXoKUPSH;D4&
z%^X{8z}&oZUDqhNs1TYbIcbR81B73QP!&*QC~=&<QK$;<d$5jr=(U1!p_1_X#T79N
z0sI!(BS$$dzPd^KDHk~ht)=dD9^bh$(l?n`-E2!pUAK)Kl{h+|2C11A*~jR~n;E)C
z%F$!8A<f`ANa{eH=yI%vnkUh|xYh`vi!7>6SqLznd6no~pgX*BTuN$F2A?;j`-*&J
zwVjHWCLhhNgvF{n*Hv*aYb>IC?1P$WFc@Q2lAEgf0GPO#uGRMj8&46Heb<4(qZh1i
zqqrtM>7L$jLnv0`H)E}^y$OV{uCe_l#i59OWGHdQW4)vpblp#(%HaFOf&3OG#g%<e
zOEV-Vb@HR+uJ|*_kUzuhGr$B_oeU{!8=J2!3IQI>gXEm{@SdWD+H^98kzzhpf%}W|
z-<}<_+1>T=yTK{CnuijVT9g~$^<Z78@1_C@bTz%R2?ILoBet`iw^hA5t|O`&)oy4I
z0X}h64IF{VBjZy|t-vSxmkcqczg#YGDtCFzCxqWhLcU_mXFQMQi!{evMUoXRM<Dc7
z45Pyy-~eDvDhDM^PRGuxAKIJQWl!jZVu>nB-9~;sVcIVtDSkI8$4+WG^igcp;JWVB
zx^QYK;tVb>g+Zs2fR#G=gj892L0Dqy1nqN_Wa8Ogva8;RD&dvQElgMjSxF?I^?Nuk
zpuWKRuV%z$(W#6upb#cd(<Rz(;Hw-Eiwh*j743dH?3G*zSr=sUR+Ag)(f)GzdhKyj
zIVk4V7_)kSi4c--ziwOUflRsB@(2n&dn_s}RUEE1Q<_%Xx}PP~3Jf)eP+^@29iJ#w
zyC>{wS9*Vg2)t6|tz#KvV()fokm^)16}<ZX>S0y(IGoah&3n~0{2|b#tE0M?#@R7R
zC>p|Alc8Uu10C}B7OYJgkc#zACo3s_U2|^~ku=bJ%6;^R7&E2_7@9-`XY_y=N2r`~
z!{dl64UcPL&9y9yqsGo(MUB}CCjeqsQPs%R_MX(R2K{iiOu?72ObO<|>cux;rFx_W
ztX4bd45+?Wa1(SZv!VF*2y@r`xcIt(7j4CT=(}rO6)(9Q-0ExR!#&qu58<2suxOt;
zdZX$hC+V!$r|@nM#Wx<oUr#e)s{V}ScC<N^?s@IVCMk@3)rmF6xpXRIDbsdP6oXDF
z;+50UPfB`YJEg#LM}v=(&fcy3mr@`oLy)*D9l`*7BUV}~n)@jT`+-i+Y;}0RkRDbt
zT-;t_;eTy)Z)XN1_=NqwTo}LA2Vo-eev%L>By+w@%`{(82C06QuTe!HiIB$kr#A{a
zYps?WN7p5*a~C6+$e8uC8j;iIlvU#+C58yJpW}4WvDHB$djL{X<7b(Z%+Q0K(U93g
z_5ttp&Ak4jj{SzFAwQb4&5f#Y#KGzrHM4m1XWrEHG+N8vZFsI#741c%rXD?0y`E9t
zF!M=fO(lWR`iybRK|AfR)r^5gp@FAE@qv?{<@ZO$uFOVU>&BA(W}|hVe7-?M$bsdq
zF0K85Be0(oa3&d|(RI>U?FY+_2V#SwpIL1Ml8nBZ^Cpd{5so;wi&VrYE|czN=9$Os
zb)`!s3%9IiHWGEEJLq79>wo9CxSHxuXSK|N9ZVLw%pJnBib}TeMH@P(W<QKK1_c9t
z-#Qa-U7(r~W7KOA28VXW@X@5G{tuO>)~Xb+O0%0V{z898``%?sO<Y`9UOSukPdUa@
zui4FI=30)x4&xu;!a+GMnvTw%o{J(+9J(6L)0k$+g4JduAJq^`VsNvCTO&hn5+Ef(
zBl?D!__ofiGY%eDEez~<(-O|}TbxJe_z};+;q$O7G1pZfqPV7uB(E_+>KZDKI8F%X
zxyT8+WbpYk`w8F3zZHu{{#46McIJra&v=rDh<h`1Yee-S+dIb}92SbJCb+rTieE(G
z#R7sqH$}F1UyHU-(?q}33R2QuwUs5W(|&_{Z_LOOsy}DsM|J8-)0#!b@Ky){BB5!u
z<NR^wcZmPOH+n|b!!*SFl%eyCyCqA|@hVeWi3#ea9r>PA%)#8x=&#p9Ek5Nm4rzXi
zM)ym?gTcaiC^+J)jdR^n%+#nsOF83BeB=|}y7k7OdM^&><%>Q62-1~B;6=~&NR*yU
z%`zo3)<dxy<$7Z;tc1dhm#2P$;e{LJ{)C=p!vxK71+91<E(thu#XwOvt}@C+frAKM
z;-WxV#*<%Z?(TB~8Mr^7r*j^_|0{7H0-{7K*<m_wFoN9d^&6T6b;(*qTpxE;qAIRa
z?~i5&>q(TPe9{{u(Mbp!z0q!oa#M-8D0xXln=#a6seU6@a;6`ZRKG0{6yhlwRy!a{
zLNd)!>~!zpW;jS>2;UfeW{SF(Pz>z7gdc8_gX+rN^4P^ne91c(7P3C8r#5uGbbXZ~
zwE9k72RY2Uozvgx!iO@zNQCG=$*CtJoa}t<<9+)$8#xaTskZM?qa;6ySE`<BHFi*c
zdKkN>rs3@LTu+DpCtBQa&wJ(9@A}S<%j<`}s7m407$frfeHg8z(ST>?@U+uG!_3z5
zhyDs4_2aDrvfuKygWap~17hM2Uk@3xPH)ivqMU-q)wZupDEa#7w3NA2lZkKDuiNxp
zf7skH5o5r@yB4UX>H{717>St`hL>);nvUpPPmty{c6x4pAJLz%jtUfSRHMM(pYRqD
zi}Gm|7%$bR1QE`T`YwglCPpmjpu7wZ0#4l6wdhs@gTwzxg1f5-nTfveH|{4t{JPj^
z`whj>63YK@^6Gy6_uqpdG_#VC18W)<_uyqE+k?0dkENZWh=+Kk^)OTZv+r64&p+<N
z{EZ>%6GkI+v@COU8Bz&Fh!Q@Y&Zk4R!W(w;mRj>71Gk2*8%@l78`R#4H!!a+kX+Lk
z@N~N#SashDo(qvCb9HO-;6MN1NRt=-To+@eXlU_Sg_hkeQznl+wfcef1RZUW+mm;S
zYvHY8>Di;bz+r~)XgJ@R|9qxZU2Ooxer1KFA7iRn%x&#}K+hH6RN>jTLZHM`1<PXS
zY0bSO?_L|&*hGB`&trpxLbT9%`p2>Yq;J=h*cYq1&ZYPj^C8U|9=&sys;3P;pBW<Z
zf~Tw5LXd%v=Nz^T(BcP80tUmWF31&7P04luXG6u{u=S$t)jXCChJPm%Ir8Aaro5&s
zZX9|&^kDlXWhIg6>pt}<NoNcr+@t@d$=J8CsF1d4C6+eL=!<=S4nJ~zEW$8>Z=n!{
zO5EQrbXt=5HTmPz=p2&JJk!gmDfKcSbirh7S8W^7%iOp#OfQgnA#K*%d@PMhIGN<_
zGtw^5*B5i_jtilHRhXfUkdBzC0VP>kMqdf=a?^zr6z$g_w)u{wLH7W<(b3)wyE%0O
zdq}j;pAsd$%=>%$K-B5tEULoHK=S%gx^GFqmRmxo2LVzKh*Rtizd**JVoy%E>m61w
z{Cfpmslg!^z6W(L{G=01;ygZih^CGOI`L?<Uhm!vbz1I4XgjM9xwTMoriEg|Oq%qd
zZsz;`#!Cfw-~nxX*pt_ee0~`Bf1*GwksS>7cRQb6o(g`<d~3Xf&0~PJMBbvk3`^Y&
z!G$H*!EiyAMY!^J<m=)QjuJrp=Q6T1`^=aeOl=Kh{)u+sUKYg0vw%Ps2eOUfPrwTs
zHzIL;X@2idV;o5Q%McYd1SW{~XO-b`<@|Ff*|m-HHw7EQntk>~l+ZrAj1WZ9wf*p=
zGR{8%t=1(vVdS+xF*Iz9>+_|cKoMhg2rL-eyyNA$Cr~NZ`#-{@gH&NH+Y3Yp?TakR
zbB{OPD}~ZOSAbL3eW^5`)dudglYRtv+<g-pusNE<_d9g<0U}Mfuq${-GmpI8u?XlK
zYZ`b!Fjwrzx@&}JdN<hL_-)HJ{t3msrA+3v{gZCWiTxRQX7L{%%upVuEi)t7Ak8Y}
zrf<=CKFa%wJr^<fytm9waQ~^~bOcmp8qD<mcNFD@>Zx^_)Oqjm$@E44@xhE=_W4`{
zONrmny3^vDnpF|-`M4xPCymcIz2q=FlvUNYA$P0vZb-9h+o-Nk^DZr!h*aU{l9-j%
zinRt@SUavfruA25dznX`Tq(=QS5Bj|`ftc9e#c=42{gP0)4vh(S~I`aJ`(1Q3_Eck
z)j{?{M=1hs9Ky6)?!!>8^Ya~9OxS7J*e=1_ohOnaCHSl}jk{HD!{)ur*4~>FBaH>y
zliY`hxQ=?9Sq|dCBVA!fC2O98tm}gX+~o9+H!6?j?V3&~?@4M&l`K!Yo-mP@4hzB4
z5Wjj3zqbRb6+5`F5s>9M#E+;6n;LnD$X@oDFHN)dW@)-Nt1V$44Ka%e1qd$0Tjxup
z&niYyJOcU`$2BVP97)C@S716vNaq#^POaHqpWK2MHg4siPhRCc$YLr;XDJ-=#5jf5
z-a3XzC(yX_+Ul1^Y?SBsdaTzmMSz^&!Bc#7yx!W$9FVF45b^N911Chn!=oOleJ{CB
zC8J+qd7WGx3T|Ms*C;*0#sn99_D@yMH`LWrcN?}&9<lQ6rx3&e5r<ZYM>^<*l<)b9
zU&2nUzsgb0a-J5m2*!NyEki3BmExcEPL2gR4FruYu;E8Eout9hK->s6g641hu@#b<
z+ZVXQVacG47+DAb6MylJu_OICjw^o_?)W@Q3~@FsZ5uWn<WaI^Ka#Zdu?f8=f(>&(
zzQ8d$OCAnN_0cSzJ>xUAI@BI<J8FZytEaAbu=Dg!9`%i4Jn}+xd*u^`txNIz0a>4w
z*?roJd7*+OtL>yqr;8fpB$Lqui8TEvMbep{LmyTTJ@rd-QXM(%D+x62tO*HPZ;1@h
z@SA!u`N*}DdCzhTmYohF@C5d?&-$;+q&uo1Mx3H&y6EXMDN|!nT~8%P;HvPeuvH<>
z+%r^(rEEgQP8Gd99;}^EzIbq;PD}nJtKYF`G9kJ%)VCD5FLAcc+oXn+uQNX?Q2F3k
ze)C~x)IJDP<)|jz9XO#QlDkamii>pg&vJYuS_limd^+DM6^NE!b@0eYHBMdL;{BET
zIi}FFBz1%YO#1wc3Yq=GB_n~prR>#g-Z!-cn)hsl)Jow+WIuvM*EV!z^MeNS(q`NX
z-qr|x<bNQEWbhCw!0XnW%|m4#iaeXD-)QYv6V{`}1=CyyRcSu#k!9%=%(<<;7p{R&
zr_fW?WF5p)Wc;X+`aPcD<FSrM_J|sLhv#IM0>(^yHm|Y#2Q<FyUa<og7_3<iityGB
zH&5n$Klpw1$8mVYPN(qFeYbtTnHj;I`BDW9cI_hz^4gtIv7ugn8PQ_7k@M0<J0Zs`
z(D3f!R1qg91^B!}d`5tc@+`R=7V42Mp<-xulyPwt@2qN6?4pa7F_OmQfz~kn4w11g
z_sM{<Rho~{(8*7?Vln=MGlB$vV+CR4s78fKvx+VFTTyD2kKq}Y0I89Yg5`J4wgC>)
zQFW^;FhzGi@}T|rBsR8L?NlI4Dc}X`;h4-QBGmFLq@rtmGufFFD?Ca~w2=(c+f097
z%Va;~#1%au?3hp~m^C{aU$;{&+Hu$iR#P|3o2yJ)kW=3i3&1@qf(47Uoi7CRo6TBe
zO`gli;16U=+<4d-A^YhHD6~$rL#|jTla|Oxcs}=l-*OLSMlxIt{efgj-;SFDqIpTU
z<zFIQ&XP6wp86IqkGeb(P5rF=^6I$NwC#ZXVYE=a1CG_wg!OSQJy@63?v_Qy$Z#I@
ztaeJim0tNZqPXLx{jd8K%EQ{7?i>5PVX}ckKRwvhhga(+Dpe-)SZB4L+goE;s!i_n
z?UHds;b{2f!kk~o%V$LbG0&{W!jHEieAnE3<-3jMGY$vMzvD3gK}zM96QAGx*ezNO
z?5jzCNbv}hb8xJ{^`n4W`B<Es^dnW#^_w*fVplCpv|Q3!AnHSk57}Pn{}ffENHCpT
zK;zT=RHg-)2A~(VWm)5T&nfJ=c)?cA_jpiywQ$mX5WV`OleKJE>UEW27gE@Ho_BI9
zEeOP^2g?OIT=$z<YVJs+NQb1nJx6+|p4})ZNa!m!g4_qfL?@Gvc-@0OC1p5<P~Nm(
z2Wr&`;!gO`EpU{4s)p(x->hBEyIzc&DcIUC+?-c2AK`hG=1TZR5t5DeDj7`E_U>~-
zwyKRD^{hey5=P^FXKOJw+rwyj6A(_<sY$?VZjLpXwX=E85n#0uLFVBvlvY)}hal8>
z?q7VZsz#s0ytW+gfV+NuGqV~7#A^8sn(QX)`Gk?tPEKKc9+MmueKo~iLmX)civGuS
z7V4n^E%p^@#oVFzgp4mE8d~3SfB$kC7hKR*VzGShsvx=@ADP{&vf5}tlF--il9i+|
zgM(<8iWaOZzP0>uV{+>TDCVTg&hMI{ji;u_GGMz|S|Q;X8+#SmFS6F`;vsL=E_7v$
z!*hEEjjW+pkynxwpEbp9Foyy7f%a{;wvJ*{n81^kvgFx3m7u=5sr#~ZW>?F&DTj!m
zA>W?AK*YVxkE~g-JTnT<-w+cVv?c<zHQd#v6wAMk501SKvXM>S=|%f7{?cKdc)^JA
zcSOyY+NGMW^%TWdhzVC$-l3q|s~d`EpOR5ZaoTm}l;WlAo40-LZ|vv#vM?}HcpPoB
zcC;gc32;=&AlGVMUO8Q}vz~cdwY#H!wm$O4`U<QI`4I69@7$0;&pdww1(daheNP8P
z^gLI{yI#s1cs@*=iFhsdDsTFoq`X<)w_UGAtMm<uheB>dfp_gIKjZY;x|qO;!J7D>
z7$wc=Z;sE7*5Vc*D&wBKUNFazEq}V_x+SYZ(I~*?&{-|UAQftY@j=}rFkxj2==W&(
z5c}QOEf3N&(DYfC*pmZ>fPU~RHQ36w*_9|8-4{Qs44G)pn#u3Yj*8oB7}Dj9iE2&I
zd#0ZD`oYrsS={?Ma;oO4>vCQyo2(@V-F~*8o7Ee&kU2An4?Ykb(xX~zziDuATb<nF
zMI8}a9d+eMjX=)>9OQJcqmt-QkzBl^hR5i-ZwbHV{y;^o(F2V8&Q;hT2?i!-7agIH
zLKHszQ?#opJMuB6vRHxB81UqqC_Pdg^AeWxr-q$Aj~jI_7j0TnfMc%#;qA!08(_1N
z#z4T&rH<)(+O-XMg@8kd1xsPw!YeobeEHv9+EEbxr7ui?agQ&!hXqt&kyeqfoXC=l
ziT?nyuu0$B3j(vOKIz;xwLwsZI_kdeGs|&1O$?b!0q;;B!_K%Kl7bC+yG`6^c0%tJ
z`X*cX<uhkFa^*`X7|PZSt<8VeEG?fH;EG;I@Xe#hoZ?q&rdbYsU^b~TeZZ<EMm~(#
zSOzdXr8C9tn_MOtNjLLoioE*~g=&z;rg_c=f}Hr#a(O|YVAp5kslclQdG^IOX{zqD
zJBTP~mHp71%?Yy8lo0Ly;ih4F;yWBp04i0P%x^(dMcW3NiNf_ExVASFhA;GP*7mCZ
z+&##0FAsU_ruQw?V0iHAaE&^yN#UBMTkehz#PEgFyBWQ=S_sD+b$>|YlJ78p?Ldaw
zbNYF=lz$zqS9p7KvZSs-n{D_?uQ8(@bb*k<GAJb0%_|Mswe3uYt|+@;pPG97vE&JQ
ziXxG%OpdLhnbxY}hug+TiU|&KTd$M^<YNrM2Ti-_6Fy)aw#mam=3mKhnHu{^J3D%!
z)^{9kG>}q75Y{ze=2l%!;hB2Xb1k-%;q?{J2|lcz^^>2Gqf627=6Fxq%-gbwT|Ah2
zspQcck&&AX1>zFl6%{XBpY+;>!n4uFu6iO34R3vUAN@dia<BP7N##-fh+{_Ok3Z|s
z6~kW|d5HJj+onr!G*H6}o*Q30o0@8Pz>+10m4_jP>2`>b<w3X2eKoOJu+(^-1iBc#
z?&gY`u5F;=koNAZ98vS-pcE{=Zce@0X>nJ-uF$Uy^aV5w{U&K!myOEqP(Qjca#V)g
z_t`rI1Nfl=TF{}Pr*dnW<BO~kF`D|oXOk8$-I0Vs{8NvFFz)agXZA)S=L)^@@r@Vz
z-VJM^zM9PUxArRf8p7dv0Q$(L+iOp}2~l$8;vk{fybz)}y<#M-+H2<`$sxaAJJrOw
z>2eDDP{Q5IwQoFBwu)Wq#&2EJ+o3mCY4YY?1#ek8Y~*4Rb{^GbS62@&oI|yl^~8&p
z?;e#(mNdR>U<k-E)IvqNC2k#U<p_^GMn$r(HZ7Q?MR%WX4ZmI^EWkxl<hBStox3Q}
z!J9ba@3r6CJsv^0%u7WnzVa&=_hhMegNKd6@4B$M3I!$3m(95&4s%8l1l;nr$M$qx
zQO~96p_|NO2h)m^wW+XXV|T9o`neCZv++{kE-q)4)2cGG4i!O_F8?j#!OC#Ym{_7N
zRzz#mcaDgmpDUurTFWET>T+3#ey4SZvvs#vF8LTIPuR4o^ht;9Q4UD6Z&hfoUJ7hg
zpwKNU=$SRrkMd0Qp~1k<dBJGtN`(c1e(3^ZKF%Y=uDriVwU})RY^g#Ne)cK%yWZD?
zguANMUT{73Z-@8J3_Uj8__-*#a=BRu(z}>2jgH_w0ik+NNlZGXd}pZT$EoHy!||I@
z$e>`F<22C~NtDqGJn#V_=!)2Dp0V_>@f=Mrl10Ca-23L<c51mV&y8*Jd^HW@QN(m@
z$QUoe_p!(>uckO=0qKh6pH+(<T?&#VBc!{UsF%KLLZ_w*=Z?Zn!BR=wXMoO1V)8DU
zFk|N}F-%H6_qw+Cs6Z~%ZK=<x!Q;v(m(N^B)+vc$knbfk$hTS3NO;XK-Kv`+*ej)Y
zg4z0R)c&u1X3xp3GLDbV4!^^jc<A=+_ok2an(X4OJ&Wx%o_#7n5r7Y9Kv$l=Mn1`)
z5>2s7k(KlX_EFzp1f)DZ#2U<bGMarloAKK^zTYLtJNG=rF7R-@Y$R1@m;HE7KnGIQ
z=g-o*<rwxsEQ^AP*)uw}V;WI*RtIiondt3-wbk9V`m*KU<ki0D?QO<uKDLs)`p+rB
za0I;qxk;_-0}4=#dY4{nQaGVrAScU<EX$OvYoKDtfqcxKxZmCr^1Set367ZAeiR9&
z29v*4<7tN}b9sCUD{s=Q-G02qMob9ux(eIjMELAZu&r7D1Qi&N$>Z73$fueiL{uw4
z(RLic+`QI=vZb6CYDxKNXT5CI=QEB2JEMmxE(81G9%<n()?BPj1}-R;Ji5ePzWL-;
zosO)HRpnf)B@Vg`IBkfY&juJOkx`3)=O_t)V_zig7cySZl8}AaRiRGbw!E49by32|
z_(+}1Ba#)$l!?6@av4sNulMN;2+sNXch9O4Vn3nV4re$)JDR-uGfejD+~9)k=<U1Q
zQ9nG?7V?~4ADM<Hg!})lTWE{#EAIIrSAVwL`Dst0n^S<p@5#i4&*-b9Iz8sK#7{@>
z24#*L3Gt5`=T10+eQE^-$l??__s-rwA%8SkS$XSr<1`M^xlK;!YrZ6Oa{lo$>a<IO
z9aI;JFYk9ljrGxS3c^<(C4!0~dN6a=7lRupbg)$Odin9gpAlWeQVZ}LA-u7O@bH&J
z@*WBU;}$8#xSzv&baK%x9N!1I{1#=!E`Z%zikfYKP4ox}R~xMU!mE4X%j1wOkDY^u
zMtjFnVA3}Wu?Y#m6ID6J)I8EJ8fM+1=Lz4gpNSR6;(=YSIjA=f!d{P&=tT{#ZY{L*
zZ$$<vTqkl@^p$x>t)3ND?;rgGz#=MS2Wgd$b$;@cc965^AjhhwP(Xj5+}#ur`e?Ej
z%P6!z{qtjS9aH95HwC7^UlPHD^uk{pJk|rVnq_Mb22vN6)5Tt{&RQfsP16%)B!W4x
ze(@~n8IZd=AEq{g7z{UvUa<5Narvnli_Z|bEeRP6ojV@NMnvGtOWQ3twh_s9>xEP2
z%bIn&MRNlDY}v3rMXzY_AY=IZ*MeBZ{Ed%+tqpV|x|-_R_zt7A>SCZnjA~JjPQ}~E
zY*X4DP<OZMj&>dOvV2C`s*6x24;{^|MBd|Bx<e1|8Jng3DeDegkofai`zN_$3`kcM
z?V8y<Im0g&Bn8=nTe8=~@#O=bvL(rw=s(ukBEzan2lu-lA9Mzs<HK(i$W(WzNUC7u
z=>n9xld>&I1;*@UYPe^sAsN6<HaR58@vyZYeXF1%ORiP;ekDGPFw|4ukI}a0m-2+s
z)t-{o^8jP<)JaZYFNZPT5jMEaAT%PB4g&m7!q6_JhK_mR+!dEo%p-r}t(JZkg^K>^
zFWeMy?V}wWNv0onpL(S1bf72iZTy6FoBDayrbuX(1VP`*N)L0ur9!9GH%h#x<o5O6
zX890etOjm<BCOyiKw8Bvkc>1h;(~@bVT^Z1h781KE&NKas>?BIi9MUq`7<L{li$%c
z$cYgsI7rG%i#Sj3HU0u!Jtjy!7O}MId)^_(-KJj-3sk1B!IRgES}7I1F?yt~g4bcM
zF#w0?zReN>F(?dp-FsU#t;)LXZ)~?V-k~gHP7bU7&bCf4=2-*ujSihhs+g@pPT-!H
zf|3#rau3+>1<rjaHM=huKs#c%GTH6tycs2-ti)+;P{Z9$B2Ki!p5k|;GpSK+rc`8L
z%^tBJm)GVp<tY)Q#5e|Y*n#hHk3!%hVd5Vv%JQQxr(`UAbZTQCK<z7;%h+-~Z>&13
zeC@vi08qJgVk{H}J&*g2Hv!gKA<OIp&Ya-Vd>YQIyA}PY<EEb8*e9Kx&dfICSz#)K
zg@`ID(KWSrg|0{YBEmPbA*z@_$r9$$X{6mPplit{te&r$>p870r}sc!nXf@NDgey$
zF$~WX<5BDTohVU-{IjFP;F?-6)Ubk3er<hpTnYER7@d&Tt@@kbg2AlG7qEN7&@eq&
zLNJ^X=CBbl42{0XXSFunu$F8_^tVg&#wv79IB!}T=bb8euwL+iD^L4dLXHwHYBwmq
z?9Qk#PrPS*n=(CkD6y;V!}89>eNUvi=c{AgSe5BocNF1UYxOtcZdLdobyA^{xy*~A
z)_%Caz8_l+wH$5GMo0DgI(l%|-U3Z6<A+u8ld3Dg4%<J=1@EiNEB>b`>VAQ5$)07|
z`toWoE55f3{RZ7EAw3_eBvX)EN5DL%V+TE(el_h$HIr1~$s-E<o8E^R5!#C8O;)|Q
z!SBGxGz8Tii!uYwbP5qli4TTmR)xfyxLK2o;cn_d_Sq6p`yr1Se(`EwP1dz8mqO=$
zG7!1;*T`M_ML0_hbCDRhU<1-XW7u8YH*xqN#XMZ)*v2_Icjcnlt&6p|C+hL^oa(zm
zrw66mGx8fHO{(G^*0b=D>XEWU_);$3OTCf2#+TY`cuA6$t~NTsqL$a5rLeaGyP0ER
zn5%q<#I&C7l3Dxb+>@F_xJtoB_SU#fl}Ah2*^f%?0hL!1AB%P;*S$w?C|68S={DbO
zf<1qE4{eDWN(-^nl$e$y6~mP<*qs|^_haBIx`P8gxEC!yHPo}dui;s^#&*BbNjm>S
zqu508rY}Aijt^U{EFf1bNU$^<?vn4>O~m9&s52++i5<9$)Cdki*MvSd4nM$ie!-7a
zly7%=UsN$=`H^23=}fgMxo2#kB>nY$w-A4{hO*&ImC<1s;QY%NH1(*+cXctpmYJ@V
zdz7BIM>jj#U@GC!1bD5YaEb^=4lV<XNXr?=IXT$S&g}$poY!en*9&g9d0tud`TT4V
z7byjt^fGvs+HM9W<(?Fy^`{DJnd_RfnxP0=I!dtN%<ulvlUW*W>qB>Lcx<*2sD8q0
z_yx@Tcpo%8_kH&)XM&v5k9r!^YE(XiYQ=AH0EG>yuyJ$dd5)^=)IQ!vkM(PK)l}s8
z8^_(#A+#TIdsd$Ymt@v@kB41Ftw^(svgn_#>lB`<O?v7JJi|EG99}ci+TW8Me3vpE
zc}F#)<7JkBf~ZN34-WGDZC3ByZ&UKgwPFs3@!3K(o)Q!s_mPA00C*Z{7{D6og9CeF
z2!u2`+nGs#eIYguGOL~7C_xY|H2VzLp<;KNcra_&Z3`eq5&)zF-+_BI*Z>DXk}<gK
z&wUwxRxJ7D?HVBa9Uf9KX5lvWRt*r%#UiZ<Kv%i`L`WQ?L!&RVu!)x-Y}%_2{$GYj
zfN;{&&^SYba_dD!dgHlYOKE*6heoC3yq*iH-N#HfyX|zhr>OlGj`-8EE+iU%=6WrW
z8#F-s=U*((f6nPf44X2W7{bh7y;?f#_J$SAhhC-SmeLCd*QMQV?^=Fy-cmMMum#Ix
zZr6le=@PsSt(w~3Hn~en)%@XF^XOKevzR25jQTbi^;{@1@b~%?aUfSFKQA(n_f8P+
z9kS2aPv}heoO#SkFB4)j1e8$>fluh}0zEk&N^JD)I^Q!g>erv*?>2wnz2i-V3!}UH
z^_D1ua*T&4vp3akZz}t5w-gkEWU#e)mldQ~dZMuuR9`PSApH2Sb2Y?K;`bfkJCI8F
zQKp(r7&!~n{A9%qzM^9c@Pi##Z>qUa_d7uL9Wv^uZ?xM_f$CbQu#CuO<#S-U{ikid
zXFygEuh~!n+&mmh4)E|-u%eQ`lz_OeKhc@!y>TLI{_yK*w6A$$st~}-Ghi&gVHsn8
z^9jo(pMp1)(UaeI@IXMVGLC|Y|FAmy0b6q*koEZY8@c~0)c+l+{}c7gXok-(ImlXn
zdu{$n)g7T8=8&w$^4y_<tiSzl%BRq%_N91h?`>NcRo6$}&!J5#&j%}PKgSX!-xm&T
z0<jMf1xl#drGzcsnT;nh@{TtSa-0uce8bX67MPqIYs^iyqYJ?ERPrbZMbTexl|GdL
zRzr_p?U29K`5Vs+Iz9~PR^HjUh9utqev2rpcJkY;@9p`DP@*|A3e$<^-%K#d)e2sz
zxY>_0OTbM<ogA~t%ATv6GcF*OA^E7Vq*#yXGbNtPBA-Z0t7uvylf?QO>_p%m7=WAl
zGB08j0I*ku%s5cyt<2|84o-lA0n<*K0GF#%=+3sJzs0yeaVrX5_`Tgdrz+5%GPs=E
z$i(UzK!RwGl+npG19Lm^0734nT`hOpEEAj{pF+3aI6e3CiOiP)+Ph2ZH33ZVDLLKu
zgZ$Clk9Fuxz}&J}F}I(>2_c5wk^1Xdaj!pZTdt^fpK^q}hLLo2-a4~PV3GUN8Gop@
zbzsD^@o_^Ek6P`buSWrot!n3oIU}#hEunwe`Tn$pPsCDG4oeUS%9<7Fisa>24&Rv%
zeXcG-3wRdEv5B!`D2GR)51%P_e+uQ`ZFWyw@W&3w9YrIjU?PNM?JG1!<;_9ByEyT)
z3Avu6ebGJ~esb>A-6<6(%i1J~us5#`!Y(TCg2Ba^KXYaTYhN8TZn-2XRV+0f&wPIx
z9sAyn0SLG{Sxz-37+~Ini`!>_?~6{K#ToB&z3C{Trv>9%WL~eZIEX27+<q!x3pRQS
z+>VHM73UM_tCQo&l(0A-sM{}cEW;b|RNZ{2d7LUV`{5F509;R<)t0e0aU#Pe0Qdsn
z!t39&T4Er^zo{9$fD4dd?WjL19so7~uw+0%zN|jyDo+3;@J|wwGyr&~0+0t&PyQ(a
ztkA#>SG3K?UOp@#E^<$NaClV*A4Ys>tg*S)u-03+^1u~c00D7Hb9v(yu*mzBPeqxr
z6qn50!P;Nk%W?v%&$SB8$-)0hGSL$H)9^+p76F01;Y)CtThCnv;1saZ#QU1p>q-K$
z{kyteKEQ_kCy7(5u{a2Tb^9IxFpp0CsU8-)5x*Q?@#^5J4jZPW=xy5a*>5fb-@$Ea
zeGvPuZ!#mFM7$19A6<OpiGHKQcDeCW)o%#`=920``XF72Tos;s$kQvKFd9i(b5w#?
zJ#k$;8+h8jjT{vxLA$F3TZZe|7E7O@w49hkco2LQ+4`=#y>-%3p|<*-b!1HijV$Kv
zzjodwVCFlyIUW7HX}I*A^M8f!16Q7(cDBFkUWy7;eoXE<XAaKXQVY`Wp$3JvJT(0a
z9l=F52K>Q}T>2@1E@OQcT;v-7d6H!OR|TA+LytKBqCfr)HSk#Cr`@dqdJt=W|CIV~
zk5EEbLL8tR|2=c;CHbYQ%xYKaXM-sJUE3vcL|g6VTsp6g)BsK`*ZfVlqALI=$&2%)
zYOq|Nm}U^_Go~BhuxzIe028SE0gGhj0kD#Qj(X48XKH^yB$t=9FQWpNwPT$+tor<M
z_5j$5DD$A%AAb!H?+?V~P~(r2rv@Xs6bBncz~W{C^w%{n6^t6Ivwu=9#l^-P{-9{0
z7Zh><b;Gj%4=@H`=(0bs9^fSm26zJ3umJ~?`-vzs7NheQY6I*@^{_MGlBxe*#IX#>
z0h$JcBKlJaATGA)0PJMJI;3ha_7q^6{u4F16!GtfUEcY|;)8IIt8W*WN<D21(gxpP
zl#C4hfE&kJehcuL5ozCFq1RF3z$I^XN!5(yV!t!JwM*CwrUIqxIR)TFYPQE6wk%8c
zfg97n81nJa8o5qzGKd~P4^Pd`)PYNR-*%<8M^sfjr$h9N(C*Wv&2uAb*el)Yj*z;d
z4_>NX+-FLnsnsu!9VIeGrT|<?IH+N{nP}B-zphkSLY0|jIjyT*l0{q)<C28QY>GX_
zN*Lw1eIQh7wHQCHEv@AXfN`iNb|TK(`?V3kk$qEcljaqmBi8TTXK_cds04jhP!KWh
zXnFG0=lHkCTECVRUFL<v+pN^wyQjca_J`Z`R_jsCh$b|P&o2}pgu@G-g0}}w+al9P
zsU2G}#%ZS$xeO>T0QV!ZBQLrnz124|J^cF&dsUoTqD$f?R{k8nv6oX`H?M$Vu6NN(
z)6N{gX7VX{b@kJLBlEe}o~aVgQ7_Mruo~Idv4w?@D3nfc(QZ_&12>9W`W^f2+-`Oi
z0=K)@fGgdlesc+1BB{AEYjv;t3h+y2F3=4ZuR><JWEZ9f4GZz=o{6TaFs^}FuM@2D
zF$!4|dad4H<3k+c0s57)_$E2h=OBMem;s9Wnsd}^=0tkj{dv|bpe3Wq#>E{1r%iH<
z!yoxdp@d%O-%>lHxPVHnKcHP0SL`KTEt~O~A-adrn}k|qOYDiZ@Z~<>2S1qRcby?P
ztqPDN4=xn3WtGG(hBV;!<hGon>gMu;BmN6FAh28|`$`F)-nHo=>Vw61)nVA#F-R!y
z)gw_s4^9Q|w#l6o2{QqSUW73ICRcgTS!5~z#S#Q`6AoMuK8szc5}42Xy>WQ%u&|B&
zu>pTzxBudbeDP7Dkk=PJrYVYb%K|kN5ir>+TOl^Z%oFD)5tRh;@8At*6hgD{R_0<U
zsV<Q%kTv?4cp6<gDAd^+Ux{<{D&s4xgm-C&A=^%n!H2q8St~LVMZ=^AUkT{|cEk;|
zmX<Tc?sh@AlfIDi7r#O=%({vJ(`Pn5I#hS?=W^zb;u_;{2Kq&+YYW7t`~o}+AQ?*-
zpllylbe#(cCykN@Ne`q>x7)BqJbAk4s#e-(ZjO>3xSp+~0n^iXB-}-x$4VgGW+0IQ
zJl-J#u=AXi_DZ-e^U~HYJ0j3oza5st?+nP5mQ=a>XHV2A6}~eaP6EGZKn`Riqc1ar
zc`Skk7@*-G%OPs}Y>+Ag6qJkaWi>fWWnREwzuwM(1dl3t>U%7oyaHe>Rgu^M7qA~9
z&Ve^>T<E&Z9ab*Lv7d=y)8h%j@1agMDG4*~CmB;Cp4^D#zLM4He8pJ{sM8ra$?CV?
zQY*n-Id?to0i)xJ4@>MjD8%K^pnOpws?hMI>TVX^m6rR+s4L)tjOt$E#5;ReIgtsa
zsih__WetO-$!4`d_8L+o0HRo4%E4s*@WD4wT!U5mOA*JhPVSd=z@j+HZm(e@X|wdg
z*oKkt3>K1>cHoUcpktku>00=d?KN!k!w=UYbmgBO(NCW~`jme#Cd~Rd)JK!PwZEWW
zFHhd!sulPc<GmOEGEa-Q16_9Xi3F?s{#jGKvKgSLvEjygGhg$ksD9(sO6#eE*(W?*
zU?Dt1V5J4AMzla$mX|XbEHSYK%0VfNm}2HZPX(drE)VXt{+Szd6mtH?&8_`*X)$rS
zBYBggTSIViJuB3H?JbC(of2nsgzgJDz(f4F)@m*8SE2U#`|Q^r7Fh^w39>0X6~g?g
zoBYpPO{m~`xJYZqvJ{GU@R$Whh{yU&;=>^M@B<E7)7V6Kzu08<G7z#FPcn{Hb*Lc=
z<NOL*%Ggm%iOa4EVOY^DDWJ*j%F1&XdFBCOuxcs0s2f#D%J(LBf-spJrEWCB7{hNo
zEReNP@*XPV`C3ePA1RAHdH@3D!0-ad%J<i=0{!tHjN1QZ(sH@~B>X=@ZDtQv5MmAY
zrJ=$aEUdZvZ<Yr51~4Qeno5%iqWtH41YmN#V6*ri=;j~m{x4SRMu8ka>j8x6-!OjN
zAGZ-}FE8P&9LOjYlo+`^=!~*vNQ)~qNx|BC0Y0R%&Qw#{weHnu*>*tyhU35xjaE8l
z%fCuQW}*yvn!QcUW){L3XK=7trQR#y3CW0>(=MeKHowaE4sD&N>>G8B1U${nmU%by
zdj@72Ov#0j1Z8hlPLB_z%6Xz{kCtxcvthWqY0VELZRvG@Ggll~eM^N{uqAAArra9b
z09}PA;UI6cY}48%r+hye6#8UloRW_Kz`p(q!|!=bUCv*i+R4tE^w58Q6NUhE|9`kk
z<%JBunuN8aBD31ff5EtyUeBLiXea>kuomz?6#d7`;#>ZYMgQff{jK5OkI4Vj4iwNN
zY@2}VQfJQ1ZCHOg4*VL6Sj3eIe({6~Gm4>x<8?zaR8qp&VZ5}tnbwSPd#KS)6ZVkF
z7B$z~Rv{oBEMV5-e!Ey-UqZS8YSp)HTbiGQx+zIz-j{q<I+fa11pETZBVCX9Dui27
zXqyPnnOVP+gMHs5i?b8iqEbSuW>;N&4#KUQ!L+koqsqIrhf^n|=Pm7&y;Sj5nf+!<
zPEj-R$81=r$&15!OLuftQQzytL6Xp5LLT#dNkSq+=i3W|@c@EaF#0BVm4PD^v3!fR
zJKZUv_iJ`?sLruhV$s`weAmi7_{dto-)~pP6Z%w9e+S}^Lk0ACPZj$T64+;4cK`o)
zl+AQC{tr(Ti=h7FvI^Sw7-6>}mxFt`LBfu*>r3p01?c7%e_hJI1O(u6Q8;DkA0+kc
zvws!*r|C$ndv`fHmk;bd16v&dP*1Kh1gPu3?!NjEI9SLu0mupcU&X?O0o#7yryyF&
zdVl*Jp64D{TwwP7jb&Q5Pgu0CUUKw&Y^Gr!*thE0ucHCHcyu0{tUzhk-CV}*B}7@X
zeP7#t<U2RC_>oupdIIk;va%T&&`K}8y65!Mt0#F|wcpLdRNfC^-CAT9sW1f{3rHA&
zd#xjBdW!tEo{9{yB#ZoTV1AHUBb|Ugq)Qe5rO%!=x3O!EmX<J2KVN!RA$HE(@8!q3
z_8vGm9JFNBLVcz6+ooMI=nX`u9<&=hu;Pi8Sr!*Pu>AdIyl(U(A{P^CSuXcJW#x3Q
zNL<Uu?FJ-JZ$|eNTH)K_6W0xy4Ar{1STt-kkyWe7BJF`x{N>}?u=QdQT5x0b1Fy<<
zd#_Ls?|f+8Ha{8v$rk^OcHBds8z-4`Edh?uyRr~ao{{uxuPi!_)<ZndcDuyMJhOM1
zT5~Ot5dny=bJ{Q02BPmYv!-!_^GnubLT3R-ADFdHALZ^uPbm5{2YY6ya;!2TX$1Vf
z1F;IWA%9jvk2A00@cHBuTiUEzM!l}^w_&2{MdDHV2IX5?g!V<Av9ZIn|Esz8j)$xJ
z`i4c+s3D0qNFrL4AsC$?A%v*W%_N9UFwt9t6cHq%C0ard1Q8K^bQ3+I_c})Jy*~TM
zbzS%Md+z7+c|PxZ|M9;5aAxN0v(DQ4?7h}H-&J<+O_veBA`0y<c+<(y9dnd)=f)TG
z(QwQSmoC3b`=zpLH{T|@P~KSmEKZEp>b%BzkObyL9DW%=S1;Vo;Ngr}z3F@Q{%hUJ
zRE-W8E2&zSbthv7;X`Yf@k&K%-Dn{ti4g=ynon$pO8weYsc?%R#r7%!BouYyajIW?
zm{U{fQo3D_>(agz<JGU8BkvlX^7O<W?0=KwI_#}x@L89|4mr)24*FG;K3lozn;#3|
zH^lq7d?^yM8XXQ;jJMMTf7Ou5x%&oV(qOt<yur+0ReQHN%;7#38ohag^4sH416@&{
zcPX<as+1*#QfXItPXSn%vvuIBWjnGb2=w|gfJ*Nijck+XirRlI?4mSxGrFy&M+StT
zt_Eu3_Ey3NOBw(j6NWQRO)X>I^S<wDy^nr((j+^n@$ObVphU8E3RTCziw#mh9v=-k
za<S?%I(G`D34)suhM(U(y8R?lR=P1n&v%sokTQRblcXMUOh+p*x=@toe5%`e$xhR>
zYRV8#5*puVOmp<LH&d?8+ZjO9H^5CTs)w!8ACk<Q@rIQ03FL=c)J(^*l~ZHlhVwxl
z6{m+x+c!2C>dR+1Sm;6OGHigdAIHjVHCVQyD)a*Q#YR8dvfUQy?D?&m2<*Mrj;stz
z2>OQv_f<nwvUPL_0i?{A&~HqGNsg2S<3T22{<;zStgKbNVy8Be&SFZHw;G7?9rNG$
z{THGZjH<;@CP8389&>z~tR1$>MeP7Wcc)ZrtMliq&!QaseS1haeGvLP-jxifFTp2#
zCG-eqZ46tPs)kfVML{}hiZvAsoYMKSHfRn7O&NZd(T^@0e8tD>@+6WjTI5#K>R9Na
zd)8s3?DOnjnGGj7B|!;ot643>Rw?k}K+s6+7KFriN+LacIDL`?&>2z<485*LeB;0g
zQhl*Z$||jLP<<oK9qJ+xSXZ{Nf@p=tBmvIyA4;fC1Ili`K-e)_Ud84<@`!ig<fQhR
zcV|og1Pa^0QxFk@_q4ucoJ+I=vlUu}q7f+DCB&qfT7nzHb{Y@D#h;G?D6ndVGD-h!
z6_<L}+P62C^!}PqTN8{Ij+{gkR6{zWqCU$==pXV=gwDEWQ5bzA1vACx7li$%!<rR`
z9l6p!)%mNbfkJSo1?`Nzk55c%cP?XI2>rycw%35U1WqH`*hyx=i@UFIj)mkHt0rH+
zNW$d22QlQ)p!_z972WoT|M-cBq+b!BRScbS>GvCxI$+2$7BIB=SZK|BwuMW_dc=pw
zwJ1eJRRKlgD;zXgdX1;QKuo1q0MOYQZWg+A&chdtE@Cp!nGoXSgnSLCmX*F|oIY&r
zt|FKItN}~52$$)T!AeSl?wJ02K*8`=8P#~GpG1R6MWpPzuIjMW`Z7uQ$-<h(NzgpF
z%P8($AOPL>EGDjYQii#!dbkfeFS=15oj~K8Pm?&S3QRaVyywGt1NdNcR3AfB6yp@^
z-fJ>cOGiE%wc6Ig-0Efs5Np8oGbFscdoqvSE-8X)Fo!S?N>^qz`<J`-6xuIi;#!4^
zq>5F%wNHlmEQwJ%(%sG@o*X>2REXWcK3EXk%4KMIYi=yv_@oi~H}ot@<&MgJmk+9I
z=}hqa)p!2BeAH~r>L>k^X6thg7_ZE2z#JZJyDsiHi3oFYy6fr?0^iSS{S&r;=moEu
zLG_)wo#k{t0csT&BJh+?sZf4<6&t;TK&QMdYt;gc7Xl$!Jv}ZH%;}?lXHp7Q4;)3n
zOT@pQCbn4CI&=9GU@~N-o-R4GW7dfaxRL5%kdrAjDdBBv&dKbPxuZ%B`NGaiu-7_e
z6c)V`+8UtnTP25NDx>Ayw&tu)Wv#`LbQwInfeKq%w%utDIxniNmj}m_KabzJjHia0
z;o4fG%35U%;<wXho`*tD#)ltTN?x+!EZ`ZwuVHgbbN5BTa1!I8ya2RhwEWnnJ?SJ;
zW*5<woY(4E&BrU;k`Do+zWGlK`p@w7uUGbr1S~!splXK{iGmF9eEF4(J%jhe$Vg&}
zfzG|<*ju?h;Uofi%U0`CX5I~C$J|(DU9UgZ_vtl|;_VMwIT?w;dW5#l<+;1ZW0--A
zJDVq0P=4nIcz5T;xlA}Rr}b#n#QwNf^Iw-dosNx?aI5%qqtqi_0l38&LKj2BB4yj}
zWLVPFFaSKZvp`w4q-ubNx8rcwiWVASLNkM)HVS%Q7oEl=DUoZyy>~I&)kP!q(+xaC
z!;%76I;fUTu|ij7%+FWA2`BWk$<)w8v+`5j#xf#E=qI9Xn$cG{0<+@~kC|!znP8zz
zf@;x*+;nQ2DWyGLsv$im%m7((p^qU#y`6zY<Qn&|SJz=~i8di7P8wc&QJb5g^XuvQ
zQjwp-X642c5NqT>I}vZyo3Uadtt_{^M6T_Fk%5$t<s0}XZE;RB4_#s21)>D+BBl#3
zEMBv|faEgL*Tv#YUTJ;&8%d2u;M4>j%}~#?j&7lla(NjwdOtosDSyC<Pht)lob35f
zV~mLQH#{Au&r1C(DWLN^zQdEgehO|{+OWByMNz{-QJd-bOaao<u;e$A>JZKQuWyz(
zA4Jl{?xRnM*~PQsoJ1I>L;(cuo8N-jp#`LF1}jV-rp$i$bR#SI@qiWM)FWt!@=+L1
zUKZ38*O?u2t`kwTNRbY-3M1!9U(?EzNy_K1D4`PczTpRU2AqT8TkVi2Lh|rNN8K9c
zDH)_ZX=r4|etQiUn$PJ|972eJRFq%kt)6t0&gHwQQ-Bvs5$K666vB}|-@!*%fSRgj
zsy$hPD2AVh6#|8C2e=`g!2lGj)W6-`s8?=GDnK?SX(UMc3gg;DW$i_0YqV5D4i9-j
z+l=WyZTDwG_t#El)AMqsch56#1VSR0f#E5TC`%7jL-fKT%UbWf#z5<OtA?TI+)U^4
z##L=tDjkr{LO(^}FTQ@dp^)JVbwlzJw8nPKb1;Ew=XT7SpwT#ANm~<1_dJznhl_p*
z5u`vE4ut=VU+S9=bi|xKS+k*#|Dg;+1{%>s&kVX0K~>4>7^FArEpY4gywN<=S|LDx
zUljg1Yf2y~$opna9Q3lASOrp_i8~X!uKN?8B4w?4`XPh=bK(^II$*j|*dsoZ>yK9I
zY~FPo8O~Q*3Vo}#MRpnc^Re2_Wt^wbPg`!kYBjY_dy9Z~U=ySio3fwrb$KY}o39-*
z@j=|}kf+&e<t8QFE;(u}k}i{#cnP5^5CkA~OyAXZ17eI}HS^a^R-kXsUONrcuj-Zt
zjt7kF*>S+1(23?=+?(jP+c)>~`<h_Q%A}))0vD6?Uu(RpGcoQOJ)pWc<NQ~D&p%(O
zZ+N5Km^8_c=PiVPlOzdpct6G|0Q##9M8snbjG-fHs8Rdfqu}oe)-;?x1VHwBH<|$}
zA(KrQFm?x^Gk~!c261OSx`-YtwJm^YSh&#*!g*aTpSd7a<S|t|sJ>g3KPMRm6wNTK
zu)EqdNq7ycFXCk*aqk-@W-#~0!{F_*oV#ipb1_l3HhJ{-oJ2ZeNBET<x%A;W=tq{%
zb@}l9fa_-|O+kiU-|AV)+gl5n1FlI3-!~=$7iJ!@twc)lZp8?Nked6esD?a>aAom`
z=S}t^p>ohUH~T*8o@7!CX2)5TW%~+BCJ3JH8Vt-IY_{IF3@YG4J>Y4Zh1uVKt+p1;
zd3!8+DV#)UWEse`_|##r0>Xx$XEdnr+>S<B2u2`p6@M1(Huz+p^(5ZHcyGdnoMlS_
z1w(&*0Z;e%1c)*;9LqP-M?|}DgyBO~wL!x<oabE7$i#55gkBBN(JKQvV1`x5Pk@<X
zyC8M2w`taw)|97^mme0IVy1hS2x|pIA8+1o<HhwrxZIrIY|xH*mdYSOhm6bf^}4s5
zP9E{Q6UVyRn*3P`h&#5xGuu8?Ij<H|9v=kX6Hrsz!2Ns<nz##Pnf;InjgQ$a*)Osg
zElk0A(q&}d7EkM`VelA3$*$L_aC_Y1!u9viP4@>zs_UK(9|5F-*1f)2s!GG^x1R)e
zKbklOgNaEbc9be+o@C8v{yx$H2->dP4E5Bw`yHk^@yIPRJu?x0Wby=_i!IoTw4M%u
zduEKQ^)EGaTQX^O<nmStTNyV*dY~I4-BF4U@mOPm@W4$R|Ci9&4~CdUe(hXNjb;Zf
z(lhg+X$k4!m@X`x@2bj<`KZk5Zt$I^W3%+laB|E}&KZyN(4hjSgx}7_)25Bek9%&e
z`o49uKCWX<N=hcqncrpC=;=fXb}D~~0}kUTA>ML$jNSWz-HG=2oe3u2e0-AU$9m;2
zhn&qNrx(%%+h-{=9=J#GXczw4pC>oKQ4o)O*ZNd220w7RprRJ#F)mn>g48|Fk9|86
zn#$SKeyT{fbi`6t5Ys2G>5B=0I|*oygq`<&&+L`anH*E1mrln!u<^U@+<6AGOTWWj
zk!^}rHVl!q;V!Hcmt66}Yc|^q<bCedd%ApAwvpksm<FrgN75jQWiQ|S<&r`#-y8WZ
zu{p&!=_7}h_mNYH%b_<b(z8Hl&u?B?tshTDa}oWT<}*aPE$|yj@Y~q>_!!<bvAg%3
z6Q)Ab-szw*p65|5-9|?8Nfz`)+?12*Mm^Hr7{f06m#xAhvmlwRdYMN!;@-=r!9V>t
z8!Ph(FC37-GWN{-(=%7=eUm>%=Z-827nPOj&9hd_&VhbEw)piT*6LDjw#GBw3-p)a
z(I0=Lf_v_X-R*FddAqhIig|HO%0j6+YO9BC>Vt3o&tARVDwmz<kL;Ag5_n^7;fEb5
z_K8P1<~<34?VmPfr-vmxbK~3B=AITLvm?9uM+FV#wwoFCw~Y@bh~<|=Y4CzDKTP~O
z>b8sa@e|xSrgs)^SZ;I2ptmbwy#M$*ms?&M+{m-A6D{OXT^f#FW$?G{uP@*6DZ<<m
zOiy_`oKPu)GtW56-O;45l22yn`T12OF*#{-=w?A)`92&wXH*wzH3R`r!ag?B5CGL8
zd75FhXeo_CCL0}RMe5{S{iWH+FM_GS%Jkyf(%yqKw1{LtF1_xV0ANWl88*!wq$U0*
z_|$oq7s`$QH<W{w6MZD<!}<r;!SYw<`~H>Ge}WC3pgmYqA9H_7Iv}<G8x{qf-_Oy3
zypjKT4tUl9a{buitaRt@EO4R!bxSBl4MLAjpsK!y5P<ZbR2}j@Huul}#p3^lRRJC$
zzyBY2^5pPej(HHCt^2nhA0iI<`PbnmF>%0U>z3X*Z<Oa>4@a3HT$>B;Sd64pd+T$f
z?@eE?h;LuQj{RC_!C)6k3QG6bj#p#-aq*l&#cu&__^}>+?H_P4q2OYfX@ZzULAI&s
z=9(Bv0Mz<sG4@O!M8`2nDE}9}SX92li4yb{q#iBah#!WX-qo=hi*psUnq40Lrp)B(
z66sWm>)Go(_AQ)bL}G*r-b%VQzs!{@V-Hn{vD}i48TnqG-Hw@QNQ-U$C9<>y6EsE0
z7ohtV-KMZ%%@11^eE7?Dr*q}@pF9l}bbCh%yxQ+%CGd(xcp(s@E%sWU&1!LZczOcV
z7N?MZo4Wj~Rroc83IA@Z=Z7$19w_SM<atb=hlz}W9JZ6MaUA~!4*$#t01n5F#Z~?%
z2Kd*-CkI1-HvV@o(vZ@*#q{J3gyE8e*n{Z*Ha-4vyZ;{%$G<B<xXSn~{5^O6x$9pi
z|KN~+O<Ui<$tRraEL`ty9$=-B?~HW>jlC_bMlHJE51s-zxy#Xn*So}8u~d)rUPCx*
z8-VT)7y<x@!TWgfR~Y)5WPteS5B}~3soMd|2!>PG?9xitf1&eLZ+@CVk(*D<x=+G4
z)gnW2eE;bN$$k%^7*NRO-@XShKj}({usZ+GqB(C8V!>iMiRJ{gE<o?D^g#tHP8{-g
z_#v8LSWl{DoIt9;@$&DSL=b7v2dkZCJgJ(|nel)3#;*lVj>7hp4<qDu@VXNxWi8hF
z@j3yOaKBB`uwJNcIu!Dt>N2*R6y917RWgwElE-~Oq9n;B5CDT<SgRDGIi6D5_lXIe
zt_6_;7Sbg<KP^b-lJ{B+yyt46crQk^*E6Yg4FJ+-R*j$Dhdkpfd51fJm5_r~b+yXp
zNJyB$0JDMHtlS&w)$xPqn*jRLN?xb1s4~1bJ^I82{}>7PjRR2x33miXb_dFI*n@@H
zxfpa8)iXK^+E^r>h2go6_8OHfWUZI9vZ&@yYNq$0JfSkZV|~BBiq0K^+8oBch2K19
z*Y@zqN3mTanv$PQ_3nVFWnpT;Iz91R-oN<Gb9mX}`ON7s=HqXV(m@OmTG)~pm!!<v
zEjPNF)tfF?tRy&X=tZJZ|AxELEEzbAq0}e!cTPuDn4qxAyQyr{+1QGh>v|O%Ajfvx
z(~QzZE3>i)+Zjw+B|JJdqnSJ-EXy4%j|&#aTVe6Sy>pdt`lK!So+x}T5veK3CLT6C
z=hC!#t`epRlQ8z3qE}&#SlsKBk0%U>32o~AS^(RN!F@gwq=s!4kKE2H!dpB~pR&!y
z+J0%K2*1#zfJ>1Qy>wt}`_#2IIa9cuV$g6m?obZoOqnzZS0uR#nl_|kH<=>YxEc6}
z!e5q+_-dv;Up$?Z{`GvG@8&$SEZd<y)eMxOr$%!tZ2J|{>9A*rgsh%X+hVhb`Q=CI
z({RS5#{`_8kezHOm-%Mqi02Gv#tfaD^}aAw6!;G=dZ-_uBtMvHweg5|HEQP?p3cH!
zTsj9WPU-EQzjHTxwMX<5QYFvY%c&vT^lt9pr1$9f%}`xb8z?v78<eVuN0wL}#}@Iz
zr!<?WcDq4YcYDzfXK)=4%hzS!B9(UScNqYcw~iumO_I2G$U!N^rn_O@1Cwhue(B$1
z(FEbUBr3QV*D=TCoy3q)+2Z|t<s)ACsdsx`P<4D6b+0{8hokBoLH9Co_(z&%k?6`M
z1^abe4oPy8<ho+>-3kxnmM{oqIqm%YicU?Yf<EEl9E-nSii^JM&tFkPRv)}E^1oBB
z+`TsYP|;aWF?+S>DW;T`DDs-dVL<cYa^gm@B14FO?DID&Rrvv9pJ8upjYfD$MVXx{
zOmH!43q>P`r1T_LMK)B3yFE>uo{oL)HSjlCnp?Jf-J~*Fwdhijcc{Up>~j)K?y88f
zex1?K&rTJK;@yr4nnpL#2V7B3WET7GVh?LQ-8$KIi*K7Kb*tF5lg;3$V%qKD`>uRK
zSTjv{kHQZb9c~1SDz=?hUd-Gkk6}7QO1h_!+RxC7hd_*7Y*~zvirpX=#C-T#qSYJ4
zv7nBESWJ%+wFmleB$q}^U1vH?Yw~b#`EXJ-#8Ebd7Uo8IFcQg>AI6i#&AQbU{lPm7
z+E3uIMSWEVTW?8k`*>8S6f;6GSNX1&tu#@$&3yi1<?+vR&RrJXxyeN&1jgYX%fsh0
z`3yFh-zS}dWdmP-i14xgNY*8)3_OvS-E~Jj<vi=#J`Ph@*G^IuT#i4r#}B)b@T%*`
zFIchjOhx_8$y}sR=bk8^#^x7Q*rzDb%c-1}^G`CAc5?jY6}McAP@><9M=C{RHeDC6
zD#(s;nA!GX96ALPAy83>_vYI(qRLImZeM(Uy(56?Fzi{@VO_zs3zsD3tmmV#j>un=
z2-aDZA#ZUIgFg1T!8jEWW8qTr*>n}96kx&e?3z68TNoqA<MMi^_pFA^AQy`>*P+%8
z&j9rS&Rz&olr``=9~*imKo6@-DR%i&2bv{qwYoz&EE2(EI5M#D{b?@MAu<dxW(bNj
zcojXM{}IL2aufHy^?Tpru-2B(1r8YIy|1koxmE*lIY%P_@;EC2?rvQIEG5V~dTRBW
zBwX!T@z+_Ypqq!;XD<dA%230^%=;-}o6IiDvCpqv1$6_eI(kCLiKt-2E~+Inc^o2!
zdZ~+=$&U!bOG(z=hXPkPjYJc^i*_(wLDnG5HQQ9wuxm6suy;nwRFW->|HtWYX155R
zN|`SLr=gT-#GZo)XA_^B-Nc%r7tSZAIz^d>>ar4h&&Ch`J6Gi&cxAV#4f#xe^gaV(
zN-4t;VvhH$%gAe63A~f&+EI8;!>;A11UbfMV?4Emn{O_t=^rLOE7^RwQyi&1Hija5
zY*7NTe9|2g!xy<IsWf&SbUWmnn+&_@w^b}^#KP^m9EZb?F{O7L?Sy?z8*;)m@?NeI
zhVPzM*?rF@a;!Zv(C|da<KT@=fQ8~rs+`1}TUS51beA`~LSU7UQ)alU)-IEQDuFXU
zx5R)=kyo6Q$hfibp!FEsQE2SD>4sm|_I(rck8f0tH#g+o@9DSI%jORCxamB}oIBvv
z9Glr@jJjv+VN<3eK)#uGT~o^@B)v{2<r&5O2XS^UqPzUpg2!y6s~o7FE;<y7u{<G=
zb>dKXqHD&#=U~e)P7GT=749E#7eCz6F?uPd;cn-pCQX+6+Df^Z3ISKJ2reFm&A8DL
za!_Q$oQd|QX*WyJ>`gcQ4XK#yJ<9i&e~(UmwAPSJ+NkbW)3T@UHqsWH**+?Dz$LFK
zrjEyu{@}lCddGsLyvEIDe3}tgx;7|vWzT?Pp-J21$;abCx{H1!3TXpTG7epYu+G+-
zxF@(2*V~CCUYf<0w+nomqyrOifjIrXj$d?1#Zs^DlOi4S2mI_G;v)8>=g;vjN45V*
zMfqnP52|yP7@9j%DkW=BIT>c$Y5W-cRSZ!WJh%Bnxcb5rS77SBt{&|svdui?D6&1k
zl<GTDciEmp^RdNll`!SI*K8C%9d@Fdamk@}T9d8_hXs(m>8`q;mqGoeB8iP5YOf?~
zKG;<THw>eH*5icDvA#>q!*DR9l^ZN+FUjCka|Y}X0`f#kcx=QNe@!;I9j_vX%*dTv
z9tvh9Qi|W|f0gK}=$JO3j!Th0&+2rKJQg23_W6h5$_)N}c^BA<XQ-!tt^kJ%H;tNX
z)c(BvW_m!7PyM~6uea$mzu`~ak0w>Z`@d||b@G>;mL}drh0dMp&#jR;UrG!spaMlV
zF6Z`n6nU)PS~F_ymf?>kfUQS|+VOQ;rHiqcJNo}-Hg4`Ne}wFVDLFSQoP=#Ut&>3J
z8TSS7N&_m5{V72Px%?oL?JJ13_^SljqtX8@nC0&ZY5$Hx0fayp%1L=L?La6p^>0Fu
zF$fCW0UPh+#p&<RO%PA;=EI*>e+QOU=i2=p#`4F+|2rO3K`@=`#BlzHODMwpgi8?E
z@fVl>UxwWLiHG<n==HDHkAF;Gh*MC+4d-bL@Hi-173vt+uHtKUX%Y0^cVdWxM*p^!
z&5PcPc#ItXioN`jMQQ!{aVAlwXA;`zAWr<@QEypGP)qY_xlO~XWf#Fv_5ys1tl1;o
z1YwIYLVP4toxf{;QwA>)MfQ=72h_X+W%$9?N*{H6K!Oi#%@vT`Lz@H=Y=X100hNnj
zn<Z##giFC$1CT4}<Rd6YUJ7L@kW+I)XS7P{rx}B3)hb0~Rih>qK(+$3lZ0m7#j}b~
zViIi)J+ui2D6dLga~`I4vTqaEM?;aU<6i{H3b~u0n}Le!KLE0RLJj0Pf$gIR!6s6W
z$A#>EB*^yx!~y?$(mLL(2&&7$P}~W${nd-MN5-=ApmMC*L0`xiqu#9WG2-p~)vY*G
zryaVUZSZWI>O1z^*}7ru6VG=p`M+R4VF0=k@c%#lr<S&<y$}(CP3>c<ztyx{R9A5{
zM}6#n@nyx58yG7F=G!ave%eFq_0AE#o~6e41Fe8E?w4W-Qo&kzg<>zg&pjs$lA)`Q
z<`MKb<>g{LJMvKJc|c|R;i1|cR>jXM1B<>~L|A%l)6fZrb4s!+<FhvL`|%u0>jTz<
zb+bxjo2Oxu*BuIju%{&nu;;a5ZUGcvqmsQ-;V#VR2*-9>7)USCV_|==!TCa_9khQy
z9RAyd0n?RQIQyo8oc8nRBD%eQe6ww`YSqcQt2Moz_-jT2lqc}<OI5ypnH=+M&``|4
z4jud9QO7`+t%X2ANv|xPeET4f3z!P^i6iJ5>YaQZWs9Tqwm;;Vah-aF@)JA7`-w+>
z#RxfB9gk-=k+ybCQy=z?WXD9>OqHC67Lv+R>+$8ir**(H1c62)X7Mr;5@WtAijKZS
zT1neq<`;6elF%*dZGM48&&G;-WikHmllQg4&Z-1!C07ZXPV&r@O|>{j`z*ciS?U=R
zYb(X~n!?MLyfOaEhR&V=1mTN{sc=BN3+_zWE5Vj)mVEftC`x0gB)hzl-F;;1_5SgN
z?S#S+G@@)YhrB9Z*JcPdSpnvkh_j3lOLC;#Eamdc)1}VaW7ik=x<X!|6Hlwew~fpm
z`3vooooBnzV-{i3?&JABnE@=IO$wM}W*hJJF}ko(w*>>=`&BIbGIYt!F4w~U>hwcp
zLiUmQqr@c=hWX%ST-T-GJ>qb=7n!7AIvVJO33!}4xuPkSmIaIPY}=IErf;`JoTD0T
zrSOjg{HbWb3T$GA`3(;ewf!i*v(35fvG${xO@hs1rLXBZTzV|wj&0KOA^bqC?a9N9
zT!i_`5H#7h5r}&Qpk)ZKw}qEe&tfmpz>2)`idX=zI2bHV#a=gdzE5<64X>$h(ZlW{
zV;o=FsAaq;)izz5UD0cA-Q|+Eu9co~R`Fd>>Z1<`FOFux?SO!DI`YZe>K#4%JN8~A
zL+Gupbf@tC#a9o{{UM8cU~P);iy8gQ;fL@Xxw^eg5^fxcE<u!RO`h3K$RFrx71r0!
zF#6~+7+n0W6BM$hkPvjKn6_rUIKVR{xP4IAHkRu(#$zG7`07!`yu#p}g}cII5;IAI
zOHpFbFr0y<xfRZ{obh|ig2p^5TK~?sBy3w(J$)7*|B`;mD@b^(__vqU@2JhsK1aOU
zMzvrsfh5(6ZZvXPvg^Y34t2YhBWr|zWv8qa&b{Rdjnrg8nD~4-a!Ydg*s5;NOuAEG
z-q;rzOgpD9ZP(gsx9k#;%^^K?aqT53I^OL0?mYq@EX)##rY*U=avwElQGU&rpZ9+(
zKmPwmAnSuwd;D$~gvI{63<AySn65*D^6HCec%n(bHY)r9UB_VZB;|?3{v+?fX`rG`
z<mx{^fXtv10sEH<Ioae7+7b|w=|Jp0w#XU-Ti<xoGNei{)g#)>m9kU&>h6DzniKwL
zKX>b#y~)8M$@W1sOc^wOK!h#OcGy&`@@x_Fud>K-7kD`gd)5>Pw)k+%7kO!&S`4et
zy1*KCsLekv1lYLBA;A{0dwBhvwJE{b#}?<?cYESS^IRijn=S#Kh$Qax9F4h&My6y+
zg%z8IOxT=DUCQ5Fa#JqHKh)eAmZQ1Do)s1`(KTE-Xf8Kev4l2#v`lZ;CHwI0wsA&E
zv9#xi@%FpC;$`RW2(PJIAHIselr3D<Zcr+m*WL9#4zhH^Rcn_{<%Yd)9(_J^oL4f$
zMzw~NbgT4P_!f#yWpoel=&!KqlPu}Qt)AZ=$gq1GtKR1$Kh7pU=IU;}A{A7)$`o8i
zk7-x%Fk^FFc55^{eY)Cy#sfc`FUew>z4lb#)V;yN`TghqMK$ZM=$8smuA>&JD~IkS
z?QT?tDnL!{l3*`wGjk6e8<djVq5AcVr^k!7WI*gm?~{hfD0|C;1|_PtT4a!Szu5Kc
z;mX*cXL(D^(SCvx>Bop-e4+={{MBBe`SmX@?M9Qx{TKTSdn`GV<yvK!3ywuTc_K^r
z#S!~uj{t)Uf-lF?F@<%)102q#c(%b=w_L%J`KkM{$1x&&74{3?PM3vIKU-iPo=mFj
zJ#<RlkJl)i=NPt!S+crGR@C_{hb~DCE{;9Q+fStNGl9`^X(T42^Y)9&+#81MW!N5%
z6MLxl6fXy~`Z3IY-S<srU0P>f^)G5(Pb*wn-j@C~GKRt0E*C6s%cx-8MRLvnW2S{v
zA_+|uQ7@M#+&`97)Go%QG%`wEjAvazHv6-=Q(<lMPJOe*X!pJ_Lp$qJFvs3@3a({d
z;WqYtP9^-<7)@Z4jDNiU<@9lY51xX)IkJA7Zo%g*f4@3{W16$vl8DenoGI}7#apyw
z;3F|1_y|6k6A=bpWFaCHKKcHF4>}oG41P1JBO{7$;d;@ZS&mvv;LXCfUt30!VBndi
zP9AOsZrhT6{%)nE+;mv6x2JN7H*Qn0uV}laddY+}kP1GmKvIQVnrBd<yGQeF`J&U@
z^s%6l#K_Gb+dK-EezWytzaLn{27cR;wis}_@kFRAzrP;+V9}Ix+>=$nMEJ6s&i<>X
zgW=(RdYkhN58J2q+oy}+oDNFKf~kkmm*uHzgjGaO5d=@}(}lZrSBfiqnj2uJKv@$d
zpC+z<{lK$p6jkVJW~9vhX6HjC!?`QeDPyoF<DbaKhLOL>1EtsnMn(L}La*@z($kCb
zr604KNwnRP@$b4OLNIO^dN84A-gu|tGuI6RHHoAvbp!t9Mh@1fDLxiDlYD3O-Q7Ya
zq4S&s_%br=qKy&bltA3VeL;?WDS<#HqWKp@sFhXT0=bPtqndoWXl@R{Y;qTJg2&Fj
zSTt;MOh<!%6yX@g(&54L@xrx>Hy;>oX(-pjE3f%|O>-dJagC@EPB-6kPrh{Iu##h$
zAdU>*_1!S{sP-51rVa0AyOCms7&l&bJFJ@5ODSX+FXp<Bup>cpnECpMaqJf@7{A+z
z3;8UMoO-IVe5rG$;K)CBBGNt}ctprtMlhbWO@M%)#^qM<<Wu|PT1yf4t=4&39^d`(
zH@X_tE!K!hNz+yFRab504EAxuS267G9De28wpMR9n}2hu=IltQb9rQ|aeUH(w#0=g
zd*qklTP<!Z=NjA;O?0hZGwd6zj0^o7jQY8WrJY7BHCBeFqP5UDEh!IL3fo<7NDxAI
zews>iX6wP**Djw`6s%3EYuhTM^m`^7iJofr9=Y4y8!epH*yMwWrxI*f#w_wsT(g?<
z?GSc!KN~I<%u%ySN`cjT7Lcbh&PejeAnP~{OcwkA9&TX9rz^=NpC3`6a)oTMe0-&@
znqtI_L$Ee}fWm5DX>s&r$I6Tk@i-X)8Fri@T#nvz);M{tFZx4i7~!4b-O;!Q*~aeY
z7SY<LX5$H`Lwsa2@<FNf5!21fs|trye$Cl=Vw-;Lg(J^e-Oh%K4=hn;D@z<*9B0Iw
z8Cw)>dHAYQ=a;I)GlwxZ8mu#Xv?N+W2Azk$nQI%sJvSNsBSe0co-Hr7m0-2Luu@|3
z3S;e1N8(TRMrc4*St+nMw$qkBuYH+$hK#PdU9nnx{sF_wGl<M&J3c;}ox@!Ri-W|5
zm*k4W!IR%_+`k(r7)x7epMK1j>$lYVsxiv2p&KjvWv}yB=&)qJ*MdB!W3ss1587@c
zkDQkKcKx?3vu_*!aH<<nd{#kXqUl$7@wSA1cl+3L)U^W#l$*QhUN3suY@S|L|55Ih
zxoOUq1qUu4BYfz=G+8Aj$3|RF7(cbM;OWvoI~c|b29SVEC77d%d!0C$YGa+0#%G8G
z{P@`UK(EF{F);6OcQrTGn)y&h=~!{VCSq`BmX$9-ihv-P18hM|a1nMEY)Jfv1az!9
z3lStB$lKY>3)uBodRQrQ{A%K8=Q<qv_5a0R`80dw@uqwwF2HM-DXss2+yEkS@7B)Y
zawXzuvpq9e=Y8uani%?(Hk?caI)Z6+7CMf<a3=cm9r}L}b_zQD;g1Z9d^+h`phx#0
z(`YSu<r_{fA$&ABR3~}=r^O-r6W4+Tv1YG=grnpiD+Q}Z6;)|O1lJ{~)g+Ljx6L*k
zSJ}@7IK-@KK58uIDHfTiI-YOGsk86Lb$JDiTixwF@+r`Z#~Jo+mKaSxn~@Og3Lt>4
zR+m6ti3!kteV|@>U4$cl<-&OJ7sq>^Ox^dg-W&SoR1-s7(}thLh8(t(_Dnj&dojh@
zFbg*~F*RRkJq~UCmVUS!uugsn(ZfIA`mLY;DK+-mFu%z_uVR<e42qv9rkfPyeq|5Q
z)gI*x>%j2YWy1<xK0C$?<C}W?uhh6{%1$K4R-WUCH;mNqWJ$c`fM4{!>4r#Itlhg?
zfH{|gijs{E3)AEtAfGSNljnq4x5yzbOA9o)Q%J>#v96n^<nZR8nGWMRj}YDZSx#+*
z>CFyyRd&l_=#cefV??wB>G@4*3=Mx4%A}NwBTfd4I4K9LvP7P(`{~%sQ_CIJ1^NdM
z+P>$0xo02L9}?3aUz!Yew+tT9Ef~65yc@utS~Xu(=^9`uKhISC+cp_K*PcIzEbj5G
z*W>ziMrrhzrE|npQ6k(fS<`M(-7(kxFrm#rX>)qz$;Y}ub&V~F!JCHXEXBq8$He>V
zUS^71D#OGkj{Z#IF7&@<93Ze?XugQt&uz?mlISPq*7JSAbZd5A?nce(t$n$UHJ`(P
z-!Gc(Rf=tjEO_usxhH!Kw@Sdz=LBe>sE6nIm*VDRl<|T)oiV<Sbwfc(g)PYJ(%`br
zA5@F;x3ILMq--r>*_Xf!8}F+G67|-Z2a4j3mC26XCK{Hb>29f`qScOrLsQ9mKVGe5
z@%4rA*d*Kx9FKRJ)0Y^r8#HYY=Fc24J@;k)%)JUS6&BIkO!ItFY<v#2{>`idULK;-
zhE6d!8q=nSGB-QvM5#ie(fwWt<T6pT`Al_G{UdQqkBM2R-TiGz9E#Qy>__hwnh0Sw
zZ3dX$RF#XqQ?y_1k<V8CfJkW>{p{c^z807@@H4ZmV0H4fqr(lR8bb-h<x{fkRDzmr
zrdvafne7i22dQPOyJ+Sgu4l>Hk>v4dlN81j(=5E7Bn9($ix<YigzI}zy8fzV>fKrI
z{WFg*eU-8Ae_GPm>sF9-$CAU*nU`t2xF5%O=ll(eEG`Qvvhf`=#Y^c{MC)J4uxbUO
za?Y8QJnJ(B{-j*B+jQhS4=1HV7MYnHaGTr4HCr_obH<VKXQ+P^Sq57;`0O{d8|YQO
zURjoC#?$rxvYR@MCP$Tq4S;<om#(gbGLDYQCZ;lkEbI))vILZhq&zgi91UA?(r~sU
z<|<{ip6=Yn2|i%}3%@VOxm>%7?7=`qlD+5h@3#v@8YTr?o{p*xg17jmAH9{2a2hju
z&_D*HclbCDhi3()mW2D<L${y7ldtL~RRlx=YHV3zoym;~%o*Z87capLiR0sMq0)~-
z(tWm#DGgpN-@Uew%e=ezog}!3&gTA^TVl1O6aFz`abGy=oQH~<DN(ZMMEsippVlO%
zS4h=Y>@!jl4}1(-^R3K6y{D2nFQ0>!j6Al(HTChNl%;G9>{H$V{@J%s_!$|R+)c*W
zZ1T@(HySs2VVd;KjwI%^HTk)d8k<Ez>NRJjzKvXpzwj-@<lEwkM-$f?E79-I2b_IF
zmdeuevS+ZZlx5P_F7wNj%4u_nyr|k|3$~c4&1IszP)dgFk}TITv0(MxSC|mmz~4Od
zdQ){YXN<nFIMlon{4q+KHXPChfi=P{xR>0KqorG#Td<OzX5I(%{B4hF1>Y}d$gnqx
z<SkP8kzviq>r5}-GP`k#gQ2iH!ns`CQrlJPh&Xui`6Zbxjfx>rw*DzI^XqrJu5*<e
zu1_K5+o<9GQ)YW_7ELXEfI9qg+ZwU_if70p4@J^=J9zUljIWdwR<e{ln>EAsI$~h0
zSwHOh7psKP^CFCXI`I)!@>IjRxh+5JrD9iE<_DKH_2__Nx(GYA9N)Pqj<Xnk6xwvA
zym(7IG4}fcZ>ftoUCO*(paYUAj*0j=S~r7XTq1YOgLyOO<KsE<x4SfY0s1MuB!gPq
zz89`s2)`7!oEa8rUtuQa6fWPQ!68A#jr=lHtpCgliTHXce|?zp`jeku!1vYog-V-+
z(LsF5g0H?id)<`6ce$Ow^EZcsEf{(H47ddIFoU+|SaJ_>aV{bs=5I=n1bi-As#K<D
zOC(L^Z_HzV6*u&&!o0N*=~NOv7hG+_LHBN)g3RQNkYATy`WL@k<r)}JTx3}BGgymQ
zf1*V5o<bxYS!LGQfOtneNA|d0#Rv8T1gEl8Zz$+J=rsNj^O;4i^DI(kMez$QaZ5eh
z9wP07#r}`iZ-{Mqs`zb=$B7dYp7<*rGKTh$-ru1u6tVANcy)2On&Mf^#quQ6eVLNU
z8_M=(ib7pw?u!vgDwY)OR`UC~hxUYJR)?W=k()uc!ItQbgM~r)DRo9O*ph=^7zJPR
zo?g*g17cv8n*IaB1~2ktqPZ>d_}7UtU8}+EruAq^@f7rSYsJx#?TYUH>_-8C&~5Si
zzQyAMm2+c{;Iof>fgypF4^+JDi4m*Sb?r|cWU?G}J>7&jXNH$VuDCG1ZGE+&mA677
z%^t-*Rkp!#Ov1i0@i6bXH-hE;a<ze))7RvNM(J-aA=6wOs8cx_g<sEX8R`Ab0K?$A
z1Ys5TrE=Mk_6-WidV$XK`Y&0?S2j$tpBIUs{l_>su_8coU@lZiPZu4)so-n@$}WrS
kG$fD-@jv~0%-$MsN}K{)?RsJ6Iz&wM=A9e4iua!UFFY0`6#xJL

literal 0
HcmV?d00001

diff --git a/docs/models/dcim/powerfeed.md b/docs/models/dcim/powerfeed.md
index ab8621e14..48ad2a5dc 100644
--- a/docs/models/dcim/powerfeed.md
+++ b/docs/models/dcim/powerfeed.md
@@ -1,8 +1,21 @@
 # Power Feed
 
-A power feed identifies the power outlet/drop that goes to a rack and is terminated to a power panel. Power feeds have a supply type (AC/DC), voltage, amperage, and phase type (single/three).
+A power feed represents the distribution of power from a power panel to a particular device, typically a power distribution unit (PDU). The power pot (inlet) on a device can be connected via a cable to a power feed. A power feed may optionally be assigned to a rack to allow more easily tracking the distribution of power among racks.
 
-Power feeds are optionally assigned to a rack. In addition, a power port – and only one – can connect to a power feed; in the context of a PDU, the power feed is analogous to the power outlet that a PDU's power port/inlet connects to.
+Each power feed is assigned an operational type (primary or redundant) and one of the following statuses:
+
+* Offline
+* Active
+* Planned
+* Failed
+
+Each power feed also defines the electrical characteristics of the circuit which it represents. These include the following:
+
+* Supply type (AC or DC)
+* Phase (single or three-phase)
+* Voltage
+* Amperage
+* Maximum utilization (percentage)
 
 !!! info
-    The power usage of a rack is calculated when a power feed (or multiple) is assigned to that rack and connected to a power port.
+    The power utilization of a rack is calculated when one or more power feeds are assigned to the rack and connected to devices that draw power.
diff --git a/docs/models/dcim/powerpanel.md b/docs/models/dcim/powerpanel.md
index 3b05f8fad..3daecbacf 100644
--- a/docs/models/dcim/powerpanel.md
+++ b/docs/models/dcim/powerpanel.md
@@ -1,3 +1,8 @@
 # Power Panel
 
-A power panel represents the distribution board where power circuits – and their circuit breakers – terminate on. If you have multiple power panels in your data center, you should model them as such in NetBox to assist you in determining the redundancy of your power allocation.
+A power panel represents the origin point in NetBox for electrical power being disseminated by one or more power feeds. In a data center environment, one power panel often serves a group of racks, with an individual power feed extending to each rack, though this is not always the case. It is common to have two sets of panels and feeds arranged in parallel to provide redundant power to each rack.
+
+Each power panel must be assigned to a site, and may optionally be assigned to a particular rack group.
+
+!!! note
+    NetBox does not model the mechanism by which power is delivered to a power panel. Power panels define the root level of the power distribution hierarchy in NetBox.

From 9e3bfdd57cd4c3029539bdffef7a0bea13fdafac Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 13:48:05 -0400
Subject: [PATCH 409/505] Update virtualization documentation

---
 docs/core-functionality/virtualization.md    |  2 +-
 docs/models/virtualization/cluster.md        |  4 ++--
 docs/models/virtualization/clustergroup.md   |  2 +-
 docs/models/virtualization/virtualmachine.md | 15 +++++++++------
 docs/models/virtualization/vminterface.md    |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/core-functionality/virtualization.md b/docs/core-functionality/virtualization.md
index 58e71be58..f406a59f3 100644
--- a/docs/core-functionality/virtualization.md
+++ b/docs/core-functionality/virtualization.md
@@ -1,4 +1,4 @@
-# Virtual Machines and Clusters
+# Virtualization
 
 {!docs/models/virtualization/cluster.md!}
 {!docs/models/virtualization/clustertype.md!}
diff --git a/docs/models/virtualization/cluster.md b/docs/models/virtualization/cluster.md
index 6d8ce4214..3311ad42d 100644
--- a/docs/models/virtualization/cluster.md
+++ b/docs/models/virtualization/cluster.md
@@ -1,5 +1,5 @@
 # Clusters
 
-A cluster is a logical grouping of physical resources within which virtual machines run. A cluster must be assigned a type, and may optionally be assigned to a group and/or site.
+A cluster is a logical grouping of physical resources within which virtual machines run. A cluster must be assigned a type (technological classification), and may optionally be assigned to a cluster group, site, and/or tenant.
 
-Physical devices may be associated with clusters as hosts. This allows users to track on which host(s) a particular VM may reside. However, NetBox does not support pinning a specific VM within a cluster to a particular host device.
+Physical devices may be associated with clusters as hosts. This allows users to track on which host(s) a particular virtual machine may reside. However, NetBox does not support pinning a specific VM within a cluster to a particular host device.
diff --git a/docs/models/virtualization/clustergroup.md b/docs/models/virtualization/clustergroup.md
index 9e1e17315..6dd0f9688 100644
--- a/docs/models/virtualization/clustergroup.md
+++ b/docs/models/virtualization/clustergroup.md
@@ -1,3 +1,3 @@
 # Cluster Groups
 
-Cluster groups may be created for the purpose of organizing clusters. The assignment of clusters to groups is optional.
+Cluster groups may be created for the purpose of organizing clusters. The arrangement of clusters into groups is optional.
diff --git a/docs/models/virtualization/virtualmachine.md b/docs/models/virtualization/virtualmachine.md
index 5a82f8267..40e9ef2c0 100644
--- a/docs/models/virtualization/virtualmachine.md
+++ b/docs/models/virtualization/virtualmachine.md
@@ -1,11 +1,14 @@
 # Virtual Machines
 
-A virtual machine represents a virtual compute instance hosted within a cluster. Each VM must be associated with exactly one cluster.
+A virtual machine represents a virtual compute instance hosted within a cluster. Each VM must be assigned to exactly one cluster.
 
-Like devices, each VM can be assigned a platform and have interfaces created on it. VM interfaces behave similarly to device interfaces, and can be assigned IP addresses, VLANs, and services. However, given their virtual nature, they cannot be connected to other interfaces. Unlike physical devices, VMs cannot be assigned console or power ports, device bays, or inventory items.
+Like devices, each VM can be assigned a platform and/or functional role, and must have one of the following operational statuses assigned to it:
 
-The following resources can be defined for each VM:
+* Active
+* Offline
+* Planned
+* Staged
+* Failed
+* Decommissioning
 
-* vCPU count
-* Memory (MB)
-* Disk space (GB)
+Additional fields are available for annotating the vCPU count, memory (GB), and disk (GB) allocated to each VM. Each VM may optionally be assigned to a tenant. Virtual machines may have virtual interfaces assigned to them, but do not support any physical component.
diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md
index 97a944f9a..6fac7ce36 100644
--- a/docs/models/virtualization/vminterface.md
+++ b/docs/models/virtualization/vminterface.md
@@ -1,3 +1,3 @@
 ## Interfaces
 
-Virtual machine interfaces are similar to device interfaces, but lack properties pertaining to physical attributes. For example, VM interfaces do not have a physical type and cannot have cables attached to them. However, they can have IP address and VLANs (both tagged and untagged) associated with them, just as device interfaces do.
+Virtual machine interfaces behave similarly to device interfaces, and can be assigned IP addresses, VLANs, and services. However, given their virtual nature, they lack properties pertaining to physical attributes. For example, VM interfaces do not have a physical type and cannot have cables attached to them.

From eacbec9c68abf344575fa08e59104d2c4e64a74d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 30 Jul 2020 14:57:34 -0400
Subject: [PATCH 410/505] Update caching, change logging documentation

---
 docs/additional-features/caching.md        | 28 ++++++++++++----------
 docs/additional-features/change-logging.md |  8 +++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/docs/additional-features/caching.md b/docs/additional-features/caching.md
index 0e6513602..359d65202 100644
--- a/docs/additional-features/caching.md
+++ b/docs/additional-features/caching.md
@@ -1,21 +1,25 @@
 # Caching
 
-To improve performance, NetBox supports caching for most object and list views. Caching is implemented using Redis,
-and [django-cacheops](https://github.com/Suor/django-cacheops)
+NetBox supports database query caching using [django-cacheops](https://github.com/Suor/django-cacheops) and Redis. When a query is made, the results are cached in Redis for a short period of time, as defined by the [CACHE_TIMEOUT](../../configuration/optional-settings/#cache_timeout) parameter (15 minutes by default). Within that time, all recurrences of that specific query will return the pre-fetched results from the cache.
 
-Several management commands are avaliable for administrators to manually invalidate cache entries in extenuating circumstances.
+If a change is made to any of the objects returned by the query within that time, or if the timeout expires, the results are automatically invalidated and the next request for those results will be sent to the database.
 
-To invalidate a specifc model instance (for example a Device with ID 34):
-```
-python netbox/manage.py invalidate dcim.Device.34
+## Invalidating Cached Data
+
+Although caching is performed automatically and rarely requires administrative intervention, NetBox provides the `invalidate` management command to force invalidation of cached results. This command can reference a specific object my its type and numeric ID:
+
+```no-highlight
+$ python netbox/manage.py invalidate dcim.Device.34
 ```
 
-To invalidate all instance of a model:
-```
-python netbox/manage.py invalidate dcim.Device
+Alternatively, it can also delete all cached results for an object type:
+
+```no-highlight
+$ python netbox/manage.py invalidate dcim.Device
 ```
 
-To flush the entire cache database:
-```
-python netbox/manage.py invalidate all
+Finally, calling it with the `all` argument will force invalidation of the entire cache database:
+
+```no-highlight
+$ python netbox/manage.py invalidate all
 ```
diff --git a/docs/additional-features/change-logging.md b/docs/additional-features/change-logging.md
index b359f9b26..d580ccc6c 100644
--- a/docs/additional-features/change-logging.md
+++ b/docs/additional-features/change-logging.md
@@ -1,9 +1,9 @@
 # Change Logging
 
-Every time an object in NetBox is created, updated, or deleted, a serialized copy of that object is saved to the database, along with meta data including the current time and the user associated with the change. These records form a running changelog both for each individual object as well as NetBox as a whole (Organization > Changelog).
+Every time an object in NetBox is created, updated, or deleted, a serialized copy of that object is saved to the database, along with meta data including the current time and the user associated with the change. These records form a persistent record of changes both for each individual object as well as NetBox as a whole. The global change log can be viewed by navigating to Other > Change Log.
 
-A serialized representation is included for each object in JSON format. This is similar to how objects are conveyed within the REST API, but does not include any nested representations. For instance, the `tenant` field of a site will record only the tenant's ID, not a representation of the tenant.
+A serialized representation of the instance being modified is included in JSON format. This is similar to how objects are conveyed within the REST API, but does not include any nested representations. For instance, the `tenant` field of a site will record only the tenant's ID, not a representation of the tenant.
 
-When a request is made, a random request ID is generated and attached to any change records resulting from the request. For example, editing multiple objects in bulk will create a change record for each object, and each of those objects will be assigned the same request ID. This makes it easy to identify all the change records associated with a particular request.
+When a request is made, a UUID is generated and attached to any change records resulting from that request. For example, editing three objects in bulk will create a separate change record for each  (three in total), and each of those objects will be associated with the same UUID. This makes it easy to identify all the change records resulting from a particular request.
 
-Change records are exposed in the API via the read-only endpoint `/api/extras/object-changes/`. They may also be exported in CSV format.
+Change records are exposed in the API via the read-only endpoint `/api/extras/object-changes/`. They may also be exported via the web UI in CSV format.

From 2644330452c864ad74204ea9a0a50c95d748a2ff Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 10:53:44 -0400
Subject: [PATCH 411/505] Refreshed "additional features" docs

---
 docs/additional-features/custom-links.md      | 15 ++--
 docs/additional-features/custom-scripts.md    | 90 ++++++++++---------
 docs/additional-features/export-templates.md  |  9 +-
 docs/additional-features/graphs.md            |  8 +-
 docs/additional-features/napalm.md            | 30 ++++---
 .../additional-features/prometheus-metrics.md | 15 +---
 docs/additional-features/webhooks.md          | 10 +--
 7 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/docs/additional-features/custom-links.md b/docs/additional-features/custom-links.md
index 56d67a7be..7be837529 100644
--- a/docs/additional-features/custom-links.md
+++ b/docs/additional-features/custom-links.md
@@ -1,6 +1,6 @@
 # Custom Links
 
-Custom links allow users to place arbitrary hyperlinks within NetBox views. These are helpful for cross-referencing related records in external systems. For example, you might create a custom link on the device view which links to the current device in a network monitoring system.
+Custom links allow users to display arbitrary hyperlinks to external content within NetBox object views. These are helpful for cross-referencing related records in systems outside of NetBox. For example, you might create a custom link on the device view which links to the current device in a network monitoring system.
 
 Custom links are created under the admin UI. Each link is associated with a particular NetBox object type (site, device, prefix, etc.) and will be displayed on relevant views. Each link is assigned text and a URL, both of which support Jinja2 templating. The text and URL are rendered with the context variable `obj` representing the current object.
 
@@ -11,7 +11,7 @@ For example, you might define a link like this:
 
 When viewing a device named Router4, this link would render as:
 
-```
+```no-highlight
 <a href="https://nms.example.com/nodes/?name=Router4">View NMS</a>
 ```
 
@@ -23,21 +23,20 @@ Only links which render with non-empty text are included on the page. You can em
 
 For example, if you only want to display a link for active devices, you could set the link text to
 
-```
+```jinja2
 {% if obj.status == 'active' %}View NMS{% endif %}
 ```
 
 The link will not appear when viewing a device with any status other than "active."
 
-Another example, if you want to only show an object of a certain manufacturer, you could set the link text to:
+As another example, if you wanted to show only devices belonging to a certain manufacturer, you could do something like this:
 
-```
-{% if obj.device_type.manufacturer.name == 'Cisco' %}View NMS {% endif %}
+```jinja2
+{% if obj.device_type.manufacturer.name == 'Cisco' %}View NMS{% endif %}
 ```
 
 The link will only appear when viewing a device with a manufacturer name of "Cisco."
 
 ## Link Groups
 
-You can specify a group name to organize links into related sets. Grouped links will render as a dropdown menu beneath a
-single button bearing the name of the group.
+Group names can be specified to organize links into groups. Links with the same group name will render as a dropdown menu beneath a single button bearing the name of the group.
diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md
index 496e4f7fa..edfc06d26 100644
--- a/docs/additional-features/custom-scripts.md
+++ b/docs/additional-features/custom-scripts.md
@@ -6,22 +6,24 @@ Custom scripting was introduced to provide a way for users to execute custom log
 * Create a range of new reserved prefixes or IP addresses
 * Fetch data from an external source and import it to NetBox
 
-Custom scripts are Python code and exist outside of the official NetBox code base, so they can be updated and changed without interfering with the core NetBox installation. And because they're written from scratch, a custom script can be used to accomplish just about anything.
+Custom scripts are Python code and exist outside of the official NetBox code base, so they can be updated and changed without interfering with the core NetBox installation. And because they're completely custom, there is no inherent limitation on what a script can accomplish.
 
 ## Writing Custom Scripts
 
 All custom scripts must inherit from the `extras.scripts.Script` base class. This class provides the functionality necessary to generate forms and log activity.
 
-```
+```python
 from extras.scripts import Script
 
 class MyScript(Script):
-    ..
+    ...
 ```
 
-Scripts comprise two core components: variables and a `run()` method. Variables allow your script to accept user input via the NetBox UI. The `run()` method is where your script's execution logic lives. (Note that your script can have as many methods as needed: this is merely the point of invocation for NetBox.)
+Scripts comprise two core components: a set of variables and a `run()` method. Variables allow your script to accept user input via the NetBox UI, but they are optional: If your script does not require any user input, there is no need to define any variables.
 
-```
+The `run()` method is where your script's execution logic lives. (Note that your script can have as many methods as needed: this is merely the point of invocation for NetBox.)
+
+```python
 class MyScript(Script):
     var1 = StringVar(...)
     var2 = IntegerVar(...)
@@ -37,9 +39,7 @@ The `run()` method should accept two arguments:
 * `commit` - A boolean indicating whether database changes will be committed.
 
 !!! note
-    The `commit` argument was introduced in NetBox v2.7.8. Backward compatibility is maintained for scripts which accept only the `data` argument, however moving forward scripts should accept both arguments.
-
-Defining variables is optional: You may create a script with only a `run()` method if no user input is needed.
+    The `commit` argument was introduced in NetBox v2.7.8. Backward compatibility is maintained for scripts which accept only the `data` argument, however moving forward scripts should accept both arguments. This backward compatibility will be removed in v2.10.
 
 Returning output from your script is optional. Any raw output generated by the script will be displayed under the "output" tab in the UI.
 
@@ -47,7 +47,7 @@ Returning output from your script is optional. Any raw output generated by the s
 
 ### `name`
 
-You can define `name` within a script module (the Python file which contains one or more scripts) to set the module name. If `name` is not defined, the filename will be used.
+You can define `name` within a script module (the Python file which contains one or more scripts) to set the module name. If `name` is not defined, the module's file name will be used.
 
 ## Script Attributes
 
@@ -61,19 +61,11 @@ This is the human-friendly names of your script. If omitted, the class name will
 
 A human-friendly description of what your script does.
 
-### `field_order`
-
-A list of field names indicating the order in which the form fields should appear. This is optional, and should not be required on Python 3.6 and above. For example:
-
-```
-field_order = ['var1', 'var2', 'var3']
-```
-
 ### `commit_default`
 
 The checkbox to commit database changes when executing a script is checked by default. Set `commit_default` to False under the script's Meta class to leave this option unchecked by default.
 
-```
+```python
 commit_default = False
 ```
 
@@ -83,8 +75,9 @@ Details of the current HTTP request (the one being made to execute the script) a
 
 ```python
 username = self.request.user.username
-ip_address = self.request.META.get('HTTP_X_FORWARDED_FOR') or self.request.META.get('REMOTE_ADDR')
-self.log_info("Running as user {} (IP: {})...".format(username, ip_address))
+ip_address = self.request.META.get('HTTP_X_FORWARDED_FOR') or \
+    self.request.META.get('REMOTE_ADDR')
+self.log_info(f"Running as user {username} (IP: {ip_address})...")
 ```
 
 For a complete list of available request parameters, please see the [Django documentation](https://docs.djangoproject.com/en/stable/ref/request-response/).
@@ -112,30 +105,40 @@ Log messages are returned to the user upon execution of the script. Markdown ren
 
 ## Variable Reference
 
+### Default Options
+
+All custom script variables support the following default options:
+
+* `default` - The field's default value
+* `description` - A brief user-friendly description of the field
+* `label` - The field name to be displayed in the rendered form
+* `required` - Indicates whether the field is mandatory (all fields are required by default)
+* `widget` - The class of form widget to use (see the [Django documentation](https://docs.djangoproject.com/en/stable/ref/forms/widgets/))
+
 ### StringVar
 
-Stores a string of characters (i.e. a line of text). Options include:
+Stores a string of characters (i.e. text). Options include:
 
 * `min_length` - Minimum number of characters
 * `max_length` - Maximum number of characters
 * `regex` - A regular expression against which the provided value must match
 
-Note: `min_length` and `max_length` can be set to the same number to effect a fixed-length field.
+Note that `min_length` and `max_length` can be set to the same number to effect a fixed-length field.
 
 ### TextVar
 
-Arbitrary text of any length. Renders as multi-line text input field.
+Arbitrary text of any length. Renders as a multi-line text input field.
 
 ### IntegerVar
 
-Stored a numeric integer. Options include:
+Stores a numeric integer. Options include:
 
 * `min_value` - Minimum value
 * `max_value` - Maximum value
 
 ### BooleanVar
 
-A true/false flag. This field has no options beyond the defaults.
+A true/false flag. This field has no options beyond the defaults listed above.
 
 ### ChoiceVar
 
@@ -154,19 +157,24 @@ CHOICES = (
 direction = ChoiceVar(choices=CHOICES)
 ```
 
+In the example above, selecting the choice labeled "North" will submit the value `n`.
+
 ### ObjectVar
 
-A NetBox object of a particular type, identified by the associated queryset. Most models will utilize the REST API to retrieve available options: Note that any filtering on the queryset in this case has no effect.
+A NetBox object of a particular type, identified by the associated queryset.
 
 * `queryset` - The base [Django queryset](https://docs.djangoproject.com/en/stable/topics/db/queries/) for the model
 
+!!! warning
+    Because the available options for this field are populated using the REST API, any filtering or exclusions performed on the specified queryset will not have any effect. While it is possible to influence the manner in which field options are populated using NetBox's `APISelect` widget, please note that this component is not officially supported and is planned to be replaced in a future release.
+
 ### MultiObjectVar
 
 Similar to `ObjectVar`, but allows for the selection of multiple objects.
 
 ### FileVar
 
-An uploaded file. Note that uploaded files are present in memory only for the duration of the script's execution: They will not be save for future use.
+An uploaded file. Note that uploaded files are present in memory only for the duration of the script's execution: They will not be automatically saved for future use. The script is responsible for writing file contents to disk where necessary.
 
 ### IPAddressVar
 
@@ -180,18 +188,8 @@ An IPv4 or IPv6 address with a mask. Returns a `netaddr.IPNetwork` object which
 
 An IPv4 or IPv6 network with a mask. Returns a `netaddr.IPNetwork` object. Two attributes are available to validate the provided mask:
 
-* `min_prefix_length` - Minimum length of the mask (default: none)
-* `max_prefix_length` - Maximum length of the mask (default: none)
-
-### Default Options
-
-All variables support the following default options:
-
-* `default` - The field's default value
-* `description` - A brief description of the field
-* `label` - The name of the form field
-* `required` - Indicates whether the field is mandatory (default: true)
-* `widget` - The class of form widget to use (see the [Django documentation](https://docs.djangoproject.com/en/stable/ref/forms/widgets/))
+* `min_prefix_length` - Minimum length of the mask
+* `max_prefix_length` - Maximum length of the mask
 
 ## Example
 
@@ -203,12 +201,13 @@ Below is an example script that creates new objects for a planned site. The user
 
 These variables are presented as a web form to be completed by the user. Once submitted, the script's `run()` method is called to create the appropriate objects.
 
-```
+```python
 from django.utils.text import slugify
 
 from dcim.choices import DeviceStatusChoices, SiteStatusChoices
 from dcim.models import Device, DeviceRole, DeviceType, Site
 from extras.scripts import *
+from utilities.forms import APISelect
 
 
 class NewBranchScript(Script):
@@ -226,7 +225,10 @@ class NewBranchScript(Script):
     )
     switch_model = ObjectVar(
         description="Access switch model",
-        queryset = DeviceType.objects.all()
+        queryset=DeviceType.objects.all(),
+        widget=APISelect(
+            display_field='model'
+        )
     )
 
     def run(self, data, commit):
@@ -238,20 +240,20 @@ class NewBranchScript(Script):
             status=SiteStatusChoices.STATUS_PLANNED
         )
         site.save()
-        self.log_success("Created new site: {}".format(site))
+        self.log_success(f"Created new site: {site}")
 
         # Create access switches
         switch_role = DeviceRole.objects.get(name='Access Switch')
         for i in range(1, data['switch_count'] + 1):
             switch = Device(
                 device_type=data['switch_model'],
-                name='{}-switch{}'.format(site.slug, i),
+                name=f'{site.slug}-switch{i}',
                 site=site,
                 status=DeviceStatusChoices.STATUS_PLANNED,
                 device_role=switch_role
             )
             switch.save()
-            self.log_success("Created new switch: {}".format(switch))
+            self.log_success(f"Created new switch: {switch}")
 
         # Generate a CSV table of new devices
         output = [
diff --git a/docs/additional-features/export-templates.md b/docs/additional-features/export-templates.md
index 541858a88..b7bbc9842 100644
--- a/docs/additional-features/export-templates.md
+++ b/docs/additional-features/export-templates.md
@@ -4,9 +4,14 @@ NetBox allows users to define custom templates that can be used when exporting o
 
 Each export template is associated with a certain type of object. For instance, if you create an export template for VLANs, your custom template will appear under the "Export" button on the VLANs list.
 
-Export templates are written in [Django's template language](https://docs.djangoproject.com/en/stable/ref/templates/language/), which is very similar to Jinja2. The list of objects returned from the database is stored in the `queryset` variable, which you'll typically want to iterate through using a `for` loop. Object properties can be access by name. For example:
+Export templates may be written in Jinja2 or [Django's template language](https://docs.djangoproject.com/en/stable/ref/templates/language/), which is very similar to Jinja2.
 
-```
+!!! warning
+    Support for Django's native templating logic will be removed in NetBox v2.10.
+
+The list of objects returned from the database when rendering an export template is stored in the `queryset` variable, which you'll typically want to iterate through using a `for` loop. Object properties can be access by name. For example:
+
+```jinja2
 {% for rack in queryset %}
 Rack: {{ rack.name }}
 Site: {{ rack.site.name }}
diff --git a/docs/additional-features/graphs.md b/docs/additional-features/graphs.md
index 264b7f1b7..e3551b91f 100644
--- a/docs/additional-features/graphs.md
+++ b/docs/additional-features/graphs.md
@@ -1,5 +1,8 @@
 # Graphs
 
+!!! warning
+    Native support for embedded graphs is due to be removed in NetBox v2.10. It will likely be superseded by a plugin providing similar functionality.
+
 NetBox does not have the ability to generate graphs natively, but this feature allows you to embed contextual graphs from an external resources (such as a monitoring system) inside the site, provider, and interface views. Each embedded graph must be defined with the following parameters:
 
 * **Type:** Site, device, provider, or interface. This determines in which view the graph will be displayed.
@@ -8,10 +11,7 @@ NetBox does not have the ability to generate graphs natively, but this feature a
 * **Source URL:** The source of the image to be embedded. The associated object will be available as a template variable named `obj`.
 * **Link URL (optional):** A URL to which the graph will be linked. The associated object will be available as a template variable named `obj`.
 
-Graph names and links can be rendered using the Django or Jinja2 template languages.
-
-!!! warning
-    Support for the Django templating language will be removed in NetBox v2.8. Jinja2 is recommended.
+Graph names and links can be rendered using Jinja2 or [Django's template language](https://docs.djangoproject.com/en/stable/ref/templates/language/).
 
 ## Examples
 
diff --git a/docs/additional-features/napalm.md b/docs/additional-features/napalm.md
index 304d892c4..c8a3665b9 100644
--- a/docs/additional-features/napalm.md
+++ b/docs/additional-features/napalm.md
@@ -1,11 +1,13 @@
 # NAPALM
 
-NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to fetch live data from devices and return it to a requester via its REST API.
+NetBox supports integration with the [NAPALM automation](https://napalm-automation.net/) library. NAPALM allows NetBox to serve a proxy for operational data, fetching live data from network devices and returning it to a requester via its REST API. Note that NetBox does not store any NAPALM data locally.
 
-!!! info
-    To enable the integration, the NAPALM library must be installed. See [installation steps](../../installation/3-netbox/#napalm-automation-optional) for more information.
+!!! note
+    To enable this integration, the NAPALM library must be installed. See [installation steps](../../installation/3-netbox/#napalm) for more information.
 
-```
+Below is an example REST API request and response:
+
+```no-highlight
 GET /api/dcim/devices/1/napalm/?method=get_environment
 
 {
@@ -15,13 +17,16 @@ GET /api/dcim/devices/1/napalm/?method=get_environment
 }
 ```
 
+!!! note
+    To make NAPALM requests via the NetBox REST API, a NetBox user must have assigned a permission granting the `napalm_read` action for the device object type.
+
 ## Authentication
 
-By default, the [`NAPALM_USERNAME`](../../configuration/optional-settings/#napalm_username) and [`NAPALM_PASSWORD`](../../configuration/optional-settings/#napalm_password) are used for NAPALM authentication. They can be overridden for an individual API call through the `X-NAPALM-Username` and `X-NAPALM-Password` headers.
+By default, the [`NAPALM_USERNAME`](../../configuration/optional-settings/#napalm_username) and [`NAPALM_PASSWORD`](../../configuration/optional-settings/#napalm_password) configuration parameters are used for NAPALM authentication. They can be overridden for an individual API call by specifying the `X-NAPALM-Username` and `X-NAPALM-Password` headers.
 
 ```
 $ curl "http://localhost/api/dcim/devices/1/napalm/?method=get_environment" \
--H "Authorization: Token f4b378553dacfcfd44c5a0b9ae49b57e29c552b5" \
+-H "Authorization: Token $TOKEN" \
 -H "Content-Type: application/json" \
 -H "Accept: application/json; indent=4" \
 -H "X-NAPALM-Username: foo" \
@@ -30,13 +35,13 @@ $ curl "http://localhost/api/dcim/devices/1/napalm/?method=get_environment" \
 
 ## Method Support
 
-The list of supported NAPALM methods depends on the [NAPALM driver](https://napalm.readthedocs.io/en/latest/support/index.html#general-support-matrix) configured for the platform of a device. NetBox only supports [get](https://napalm.readthedocs.io/en/latest/support/index.html#getters-support-matrix) methods.
+The list of supported NAPALM methods depends on the [NAPALM driver](https://napalm.readthedocs.io/en/latest/support/index.html#general-support-matrix) configured for the platform of a device. Because there is no granular mechanism in place for limiting potentially disruptive requests, NetBox supports only read-only [get](https://napalm.readthedocs.io/en/latest/support/index.html#getters-support-matrix) methods.
 
 ## Multiple Methods
 
-More than one method in an API call can be invoked by adding multiple `method` parameters. For example:
+It is possible to request the output of multiple NAPALM methods in a single API request by passing multiple `method` parameters. For example:
 
-```
+```no-highlight
 GET /api/dcim/devices/1/napalm/?method=get_ntp_servers&method=get_ntp_peers
 
 {
@@ -51,14 +56,11 @@ GET /api/dcim/devices/1/napalm/?method=get_ntp_servers&method=get_ntp_peers
 
 ## Optional Arguments
 
-The behavior of NAPALM drivers can be adjusted according to the [optional arguments](https://napalm.readthedocs.io/en/latest/support/index.html#optional-arguments). NetBox exposes those arguments using headers prefixed with `X-NAPALM-`.
-
-
-For instance, the SSH port is changed to 2222 in this API call:
+The behavior of NAPALM drivers can be adjusted according to the [optional arguments](https://napalm.readthedocs.io/en/latest/support/index.html#optional-arguments). NetBox exposes those arguments using headers prefixed with `X-NAPALM-`. For example, the SSH port is changed to 2222 in this API call:
 
 ```
 $ curl "http://localhost/api/dcim/devices/1/napalm/?method=get_environment" \
--H "Authorization: Token f4b378553dacfcfd44c5a0b9ae49b57e29c552b5" \
+-H "Authorization: Token $TOKEN" \
 -H "Content-Type: application/json" \
 -H "Accept: application/json; indent=4" \
 -H "X-NAPALM-port: 2222"
diff --git a/docs/additional-features/prometheus-metrics.md b/docs/additional-features/prometheus-metrics.md
index 1429fb0a7..048eb68b3 100644
--- a/docs/additional-features/prometheus-metrics.md
+++ b/docs/additional-features/prometheus-metrics.md
@@ -23,16 +23,7 @@ For the exhaustive list of exposed metrics, visit the `/metrics` endpoint on you
 
 ## Multi Processing Notes
 
-When deploying NetBox in a multiprocess mannor--such as using Gunicorn as recomented in the installation docs--the Prometheus client library requires the use of a shared directory
-to collect metrics from all the worker processes. This can be any arbitrary directory to which the processes have read/write access. This directory is then made available by use of the
-`prometheus_multiproc_dir` environment variable.
+When deploying NetBox in a multiprocess manner (e.g. running multiple Gunicorn workers) the Prometheus client library requires the use of a shared directory to collect metrics from all worker processes. To configure this, first create or designate a local directory to which the worker processes have read and write access, and then configure your WSGI service (e.g. Gunicorn) to define this path as the `prometheus_multiproc_dir` environment variable.
 
-This can be setup by first creating a shared directory and then adding this line (with the appropriate directory) to the `[program:netbox]` section of the supervisor config file.
-
-```
-environment=prometheus_multiproc_dir=/tmp/prometheus_metrics
-```
-
-#### Accuracy
-
-If having accurate long-term metrics in a multiprocess environment is important to you then it's recommended you use the `uwsgi` library instead of `gunicorn`. The issue lies in the way `gunicorn` tracks worker processes (vs `uwsgi`) which helps manage the metrics files created by the above configurations. If you're using Netbox with gunicorn in a containerized enviroment following the one-process-per-container methodology, then you will likely not need to change to `uwsgi`. More details can be found in  [issue #3779](https://github.com/netbox-community/netbox/issues/3779#issuecomment-590547562).
\ No newline at end of file
+!!! warning
+    If having accurate long-term metrics in a multiprocess environment is crucial to your deployment, it's recommended you use the `uwsgi` library instead of `gunicorn`. The issue lies in the way `gunicorn` tracks worker processes (vs `uwsgi`) which helps manage the metrics files created by the above configurations. If you're using Netbox with gunicorn in a containerized enviroment following the one-process-per-container methodology, then you will likely not need to change to `uwsgi`. More details can be found in  [issue #3779](https://github.com/netbox-community/netbox/issues/3779#issuecomment-590547562).
\ No newline at end of file
diff --git a/docs/additional-features/webhooks.md b/docs/additional-features/webhooks.md
index de06c50b7..845a6745d 100644
--- a/docs/additional-features/webhooks.md
+++ b/docs/additional-features/webhooks.md
@@ -1,6 +1,6 @@
 # Webhooks
 
-A webhook is a mechanism for conveying to some external system a change that took place in NetBox. For example, you may want to notify a monitoring system whenever a device status is changed in NetBox. This can be done by creating a webhook for the device model in NetBox. When NetBox detects a change to a device, an HTTP request containing the details of the change and who made it be sent to the specified receiver. Webhooks are configured in the admin UI under Extras > Webhooks.
+A webhook is a mechanism for conveying to some external system a change that took place in NetBox. For example, you may want to notify a monitoring system whenever the status of a device is updated in NetBox. This can be done by creating a webhook for the device model in NetBox and identifying the webhook receiver. When NetBox detects a change to a device, an HTTP request containing the details of the change and who made it be sent to the specified receiver. Webhooks are configured in the admin UI under Extras > Webhooks.
 
 ## Configuration
 
@@ -8,7 +8,7 @@ A webhook is a mechanism for conveying to some external system a change that too
 * **Object type(s)** - The type or types of NetBox object that will trigger the webhook.
 * **Enabled** - If unchecked, the webhook will be inactive.
 * **Events** - A webhook may trigger on any combination of create, update, and delete events. At least one event type must be selected.
-* **HTTP method** - The type of HTTP request to send. Options include GET, POST, PUT, PATCH, and DELETE.
+* **HTTP method** - The type of HTTP request to send. Options include `GET`, `POST`, `PUT`, `PATCH`, and `DELETE`.
 * **URL** - The fuly-qualified URL of the request to be sent. This may specify a destination port number if needed.
 * **HTTP content type** - The value of the request's `Content-Type` header. (Defaults to `application/json`)
 * **Additional headers** - Any additional headers to include with the request (optional). Add one header per line in the format `Name: Value`. Jinja2 templating is supported for this field (see below).
@@ -19,13 +19,13 @@ A webhook is a mechanism for conveying to some external system a change that too
 
 ## Jinja2 Template Support
 
-[Jinja2 templating](https://jinja.palletsprojects.com/) is supported for the `additional_headers` and `body_template` fields. This enables the user to convey change data in the request headers as well as to craft a customized request body. Request content can be crafted to enable the direct interaction with external systems by ensuring the outgoing message is in a format the receiver expects and understands.
+[Jinja2 templating](https://jinja.palletsprojects.com/) is supported for the `additional_headers` and `body_template` fields. This enables the user to convey object data in the request headers as well as to craft a customized request body. Request content can be crafted to enable the direct interaction with external systems by ensuring the outgoing message is in a format the receiver expects and understands.
 
 For example, you might create a NetBox webhook to [trigger a Slack message](https://api.slack.com/messaging/webhooks) any time an IP address is created. You can accomplish this using the following configuration:
 
 * Object type: IPAM > IP address
-* HTTP method: POST
-* URL: <Slack incoming webhook URL>
+* HTTP method: `POST`
+* URL: Slack incoming webhook URL
 * HTTP content type: `application/json`
 * Body template: `{"text": "IP address {{ data['address'] }} was created by {{ username }}!"}`
 

From c3c27ac6646b061bde87e1a4db4c8849acb967a6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 11:42:24 -0400
Subject: [PATCH 412/505] Refreshed admin docs

---
 docs/administration/netbox-shell.md       | 71 +++++++++++++----------
 docs/administration/permissions.md        |  8 +--
 docs/administration/replicating-netbox.md | 28 ++++++---
 docs/models/users/objectpermission.md     | 23 ++++----
 4 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/docs/administration/netbox-shell.md b/docs/administration/netbox-shell.md
index 34cd5a30f..51a06156a 100644
--- a/docs/administration/netbox-shell.md
+++ b/docs/administration/netbox-shell.md
@@ -1,12 +1,12 @@
 # The NetBox Python Shell
 
-NetBox includes a Python shell within which objects can be directly queried, created, modified, and deleted. To enter the shell, run the following command:
+NetBox includes a Python management shell within which objects can be directly queried, created, modified, and deleted. To enter the shell, run the following command:
 
 ```
 ./manage.py nbshell
 ```
 
-This will launch a customized version of [the built-in Django shell](https://docs.djangoproject.com/en/stable/ref/django-admin/#shell) with all relevant NetBox models pre-loaded. (If desired, the stock Django shell is also available by executing `./manage.py shell`.)
+This will launch a lightly customized version of [the built-in Django shell](https://docs.djangoproject.com/en/stable/ref/django-admin/#shell) with all relevant NetBox models pre-loaded. (If desired, the stock Django shell is also available by executing `./manage.py shell`.)
 
 ```
 $ ./manage.py nbshell
@@ -28,13 +28,17 @@ DCIM:
   ...
 ```
 
+!!! warning
+    The NetBox shell affords direct access to NetBox data and function with very little validation in place. As such, it is crucial to ensure that only authorized, knowledgeable users are ever granted access to it. Never perform any action in the management shell without having a full backup in place.
+
 ## Querying Objects
 
-Objects are retrieved by forming a [Django queryset](https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-objects). The base queryset for an object takes the form `<model>.objects.all()`, which will return a (truncated) list of all objects of that type.
+Objects are retrieved from the database using a [Django queryset](https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-objects). The base queryset for an object takes the form `<model>.objects.all()`, which will return a (truncated) list of all objects of that type.
 
 ```
 >>> Device.objects.all()
-<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>, <Device: TestDevice4>, <Device: TestDevice5>, '...(remaining elements truncated)...']>
+<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>,
+<Device: TestDevice4>, <Device: TestDevice5>, '...(remaining elements truncated)...']>
 ```
 
 Use a `for` loop to cycle through all objects in the list:
@@ -43,11 +47,11 @@ Use a `for` loop to cycle through all objects in the list:
 >>> for device in Device.objects.all():
 ...   print(device.name, device.device_type)
 ...
-(u'TestDevice1', <DeviceType: PacketThingy 9000>)
-(u'TestDevice2', <DeviceType: PacketThingy 9000>)
-(u'TestDevice3', <DeviceType: PacketThingy 9000>)
-(u'TestDevice4', <DeviceType: PacketThingy 9000>)
-(u'TestDevice5', <DeviceType: PacketThingy 9000>)
+('TestDevice1', <DeviceType: PacketThingy 9000>)
+('TestDevice2', <DeviceType: PacketThingy 9000>)
+('TestDevice3', <DeviceType: PacketThingy 9000>)
+('TestDevice4', <DeviceType: PacketThingy 9000>)
+('TestDevice5', <DeviceType: PacketThingy 9000>)
 ...
 ```
 
@@ -67,52 +71,53 @@ To retrieve a particular object (typically by its primary key or other unique fi
 
 ### Filtering Querysets
 
-In most cases, you want to retrieve only a specific subset of objects. To filter a queryset, replace `all()` with `filter()` and pass one or more keyword arguments. For example:
+In most cases, you will want to retrieve only a specific subset of objects. To filter a queryset, replace `all()` with `filter()` and pass one or more keyword arguments. For example:
 
 ```
->>> Device.objects.filter(status=STATUS_ACTIVE)
-<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>, <Device: TestDevice8>, <Device: TestDevice9>, '...(remaining elements truncated)...']>
+>>> Device.objects.filter(status="active")
+<QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>,
+<Device: TestDevice8>, <Device: TestDevice9>, '...(remaining elements truncated)...']>
 ```
 
 Querysets support slicing to return a specific range of objects.
 
 ```
->>> Device.objects.filter(status=STATUS_ACTIVE)[:3]
+>>> Device.objects.filter(status="active")[:3]
 <QuerySet [<Device: TestDevice1>, <Device: TestDevice2>, <Device: TestDevice3>]>
 ```
 
 The `count()` method can be appended to the queryset to return a count of objects rather than the full list.
 
 ```
->>> Device.objects.filter(status=STATUS_ACTIVE).count()
+>>> Device.objects.filter(status="active").count()
 982
 ```
 
-Relationships with other models can be traversed by concatenating field names with a double-underscore. For example, the following will return all devices assigned to the tenant named "Pied Piper."
+Relationships with other models can be traversed by concatenating attribute names with a double-underscore. For example, the following will return all devices assigned to the tenant named "Pied Piper."
 
 ```
->>> Device.objects.filter(tenant__name='Pied Piper')
+>>> Device.objects.filter(tenant__name="Pied Piper")
 ```
 
 This approach can span multiple levels of relations. For example, the following will return all IP addresses assigned to a device in North America:
 
 ```
->>> IPAddress.objects.filter(interface__device__site__region__slug='north-america')
+>>> IPAddress.objects.filter(interface__device__site__region__slug="north-america")
 ```
 
 !!! note
-    While the above query is functional, it is very inefficient. There are ways to optimize such requests, however they are out of the scope of this document. For more information, see the [Django queryset method reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/) documentation.
+    While the above query is functional, it's not very efficient. There are ways to optimize such requests, however they are out of scope for this document. For more information, see the [Django queryset method reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/) documentation.
 
 Reverse relationships can be traversed as well. For example, the following will find all devices with an interface named "em0":
 
 ```
->>> Device.objects.filter(interfaces__name='em0')
+>>> Device.objects.filter(interfaces__name="em0")
 ```
 
 Character fields can be filtered against partial matches using the `contains` or `icontains` field lookup (the later of which is case-insensitive).
 
 ```
->>> Device.objects.filter(name__icontains='testdevice')
+>>> Device.objects.filter(name__icontains="testdevice")
 ```
 
 Similarly, numeric fields can be filtered by values less than, greater than, and/or equal to a given value.
@@ -124,7 +129,7 @@ Similarly, numeric fields can be filtered by values less than, greater than, and
 Multiple filters can be combined to further refine a queryset.
 
 ```
->>> VLAN.objects.filter(vid__gt=2000, name__icontains='engineering')
+>>> VLAN.objects.filter(vid__gt=2000, name__icontains="engineering")
 ```
 
 To return the inverse of a filtered queryset, use `exclude()` instead of `filter()`.
@@ -132,18 +137,18 @@ To return the inverse of a filtered queryset, use `exclude()` instead of `filter
 ```
 >>> Device.objects.count()
 4479
->>> Device.objects.filter(status=STATUS_ACTIVE).count()
+>>> Device.objects.filter(status="active").count()
 4133
->>> Device.objects.exclude(status=STATUS_ACTIVE).count()
+>>> Device.objects.exclude(status="active").count()
 346
 ```
 
 !!! info
-    The examples above are intended only to provide a cursory introduction to queryset filtering. For an exhaustive list of the available filters, please consult the [Django queryset API docs](https://docs.djangoproject.com/en/stable/ref/models/querysets/).
+    The examples above are intended only to provide a cursory introduction to queryset filtering. For an exhaustive list of the available filters, please consult the [Django queryset API documentation](https://docs.djangoproject.com/en/stable/ref/models/querysets/).
 
 ## Creating and Updating Objects
 
-New objects can be created by instantiating the desired model, defining values for all required attributes, and calling `save()` on the instance.
+New objects can be created by instantiating the desired model, defining values for all required attributes, and calling `save()` on the instance. For example, we can create a new VLAN by specifying its numeric ID, name, and assigned site:
 
 ```
 >>> lab1 = Site.objects.get(pk=7)
@@ -151,22 +156,22 @@ New objects can be created by instantiating the desired model, defining values f
 >>> myvlan.save()
 ```
 
-Alternatively, the above can be performed as a single operation:
+Alternatively, the above can be performed as a single operation. (Note, however, that `save()` does _not_ return the new instance for reuse.)
 
 ```
 >>> VLAN(vid=123, name='MyNewVLAN', site=Site.objects.get(pk=7)).save()
 ```
 
-To modify an object, retrieve it, update the desired field(s), and call `save()` again.
+To modify an existing object, we retrieve it, update the desired field(s), and call `save()` again.
 
 ```
 >>> vlan = VLAN.objects.get(pk=1280)
 >>> vlan.name
-u'MyNewVLAN'
+'MyNewVLAN'
 >>> vlan.name = 'BetterName'
 >>> vlan.save()
 >>> VLAN.objects.get(pk=1280).name
-u'BetterName'
+'BetterName'
 ```
 
 !!! warning
@@ -180,7 +185,7 @@ To delete an object, simply call `delete()` on its instance. This will return a
 >>> vlan
 <VLAN: 123 (BetterName)>
 >>> vlan.delete()
-(1, {u'extras.CustomFieldValue': 0, u'ipam.VLAN': 1})
+(1, {'extras.CustomFieldValue': 0, 'ipam.VLAN': 1})
 ```
 
 To delete multiple objects at once, call `delete()` on a filtered queryset. It's a good idea to always sanity-check the count of selected objects _before_ deleting them.
@@ -189,8 +194,10 @@ To delete multiple objects at once, call `delete()` on a filtered queryset. It's
 >>> Device.objects.filter(name__icontains='test').count()
 27
 >>> Device.objects.filter(name__icontains='test').delete()
-(35, {u'extras.CustomFieldValue': 0, u'dcim.DeviceBay': 0, u'secrets.Secret': 0, u'dcim.InterfaceConnection': 4, u'extras.ImageAttachment': 0, u'dcim.Device': 27, u'dcim.Interface': 4, u'dcim.ConsolePort': 0, u'dcim.PowerPort': 0})
+(35, {'extras.CustomFieldValue': 0, 'dcim.DeviceBay': 0, 'secrets.Secret': 0,
+'dcim.InterfaceConnection': 4, 'extras.ImageAttachment': 0, 'dcim.Device': 27,
+'dcim.Interface': 4, 'dcim.ConsolePort': 0, 'dcim.PowerPort': 0})
 ```
 
 !!! warning
-    Deletions are immediate and irreversible. Always think very carefully before calling `delete()` on an instance or queryset.
+    Deletions are immediate and irreversible. Always consider the impact of deleting objects carefully before calling `delete()` on an instance or queryset.
diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
index 7e47db0d9..c2942c8a9 100644
--- a/docs/administration/permissions.md
+++ b/docs/administration/permissions.md
@@ -1,6 +1,6 @@
 # Permissions
 
-NetBox v2.9 introduced a new object-based permissions framework, which replace's Django's built-in permission model. Object-based permissions allow for the assignment of permissions to an arbitrary subset of objects of a certain type, rather than only by type of object. For example, it is possible to grant a user permission to view only sites within a particular region, or to modify only VLANs with a numeric ID within a certain range.
+NetBox v2.9 introduced a new object-based permissions framework, which replace's Django's built-in permissions model. Object-based permissions enable an administrator to grant users or groups the ability to perform an action on arbitrary subsets of objects in NetBox, rather than all objects of a certain type. For example, it is possible to grant a user permission to view only sites within a particular region, or to modify only VLANs with a numeric ID within a certain range.
 
 {!docs/models/users/objectpermission.md!}
 
@@ -20,7 +20,7 @@ NetBox v2.9 introduced a new object-based permissions framework, which replace's
 
 Object-based permissions work by filtering the database query generated by a user's request to restrict the set of objects returned. When a request is received, NetBox first determines whether the user is authenticated and has been granted to perform the requested action. For example, if the requested URL is `/dcim/devices/`, NetBox will check for the `dcim.view_device` permission. If the user has not been assigned this permission (either directly or via a group assignment), NetBox will return a 403 (forbidden) HTTP response.
 
-If the permission has been granted, NetBox will compile any specified constraints for the model and action. For example, suppose two permissions have been assigned to the user granting view access to the device model, with the following constraints:
+If the permission _has_ been granted, NetBox will compile any specified constraints for the model and action. For example, suppose two permissions have been assigned to the user granting view access to the device model, with the following constraints:
 
 ```json
 [
@@ -29,7 +29,7 @@ If the permission has been granted, NetBox will compile any specified constraint
 ]
 ```
 
-This grants the user access to view any device that is in NYC1 or NYC2, **or** which has a status of "offline" and has no tenant assigned. These constraints will result in the following ORM query:
+This grants the user access to view any device that is assigned to a site named NYC1 or NYC2, **or** which has a status of "offline" and has no tenant assigned. These constraints are equivalent to the following ORM query:
 
 ```no-highlight
 Site.objects.filter(
@@ -40,4 +40,4 @@ Site.objects.filter(
 
 ### Creating and Modifying Objects
 
-The same sort of logic is in play when a user attempts to create or modify an object in NetBox, with a twist. Once validation has completed, NetBox starts an atomic database transaction to facilitate the change, and the object is created or saved normally. Next, still within the transaction, NetBox issues a second query to retrieve the newly created/updated object, filtering the restricted queryset with the object's primary key. If this query fails to return the object, NetBox knows that the new revision does not match the constraints imposed by the permission. The transaction is then aborted, and the database is left in its original state.
+The same sort of logic is in play when a user attempts to create or modify an object in NetBox, with a twist. Once validation has completed, NetBox starts an atomic database transaction to facilitate the change, and the object is created or saved normally. Next, still within the transaction, NetBox issues a second query to retrieve the newly created/updated object, filtering the restricted queryset with the object's primary key. If this query fails to return the object, NetBox knows that the new revision does not match the constraints imposed by the permission. The transaction is then rolled back, leaving the database in its original state prior to the change, and the user is informed of the violation.
diff --git a/docs/administration/replicating-netbox.md b/docs/administration/replicating-netbox.md
index bb7157d45..7fa07517c 100644
--- a/docs/administration/replicating-netbox.md
+++ b/docs/administration/replicating-netbox.md
@@ -2,7 +2,7 @@
 
 ## Replicating the Database
 
-NetBox uses [PostgreSQL](https://www.postgresql.org/) for its database, so general PostgreSQL best practices will apply to NetBox. You can dump and restore the database using the `pg_dump` and `psql` utilities, respectively.
+NetBox employs a [PostgreSQL](https://www.postgresql.org/) database, so general PostgreSQL best practices apply here. The database can be written to a file and restored using the `pg_dump` and `psql` utilities, respectively.
 
 !!! note
     The examples below assume that your database is named `netbox`.
@@ -23,8 +23,10 @@ pg_dump --exclude-table-data=extras_objectchange netbox > netbox.sql
 
 ### Load an Exported Database
 
+When restoring a database from a file, it's recommended to delete any existing database first to avoid potential conflicts.
+
 !!! warning
-    This will destroy and replace any existing instance of the database.
+    The following will destroy and replace any existing instance of the database.
 
 ```no-highlight
 psql -c 'drop database netbox'
@@ -41,17 +43,15 @@ If you want to export only the database schema, and not the data itself (e.g. fo
 ```no-highlight
 pg_dump -s netbox > netbox_schema.sql
 ```
-If you are migrating your instance of NetBox to a different machine, please make sure you invalidate the cache by performing this command:
-
-```no-highlight
-python3 manage.py invalidate all
-```
 
 ---
 
-## Replicating Media
+## Replicating Uploaded Media
 
-NetBox stored uploaded files (such as image attachments) in its media directory. To fully replicate an instance of NetBox, you'll need to copy both the database and the media files.
+By default, NetBox stores uploaded files (such as image attachments) in its media directory. To fully replicate an instance of NetBox, you'll need to copy both the database and the media files.
+
+!!! note
+    These operations are not necessary if your installation is utilizing a [remote storage backend](../../configuration/optional-settings/#storage_backend).
 
 ### Archive the Media Directory
 
@@ -68,3 +68,13 @@ To extract the saved archive into a new installation, run the following from the
 ```no-highlight
 tar -xf netbox_media.tar.gz
 ```
+
+---
+
+## Cache Invalidation
+
+If you are migrating your instance of NetBox to a different machine, be sure to first invalidate the cache by performing this command:
+
+```no-highlight
+python3 manage.py invalidate all
+```
diff --git a/docs/models/users/objectpermission.md b/docs/models/users/objectpermission.md
index 80313fc0b..4e3ef0e0b 100644
--- a/docs/models/users/objectpermission.md
+++ b/docs/models/users/objectpermission.md
@@ -1,10 +1,10 @@
 # Object Permissions
 
-Assigning a permission in NetBox entails defining a relationship among several components:
+A permission in NetBox represents a relationship shared by several components:
 
 * Object type(s) - One or more types of object in NetBox
-* User(s) - One or more users or groups of users
-* Actions - The actions that can be performed (view, add, change, and/or delete)
+* User(s)/Group(s) - One or more users or groups of users
+* Action(s) - The action(s) that can be performed on an object
 * Constraints - An arbitrary filter used to limit the granted action(s) to a specific subset of objects
 
 At a minimum, a permission assignment must specify one object type, one user or group, and one action. The specification of constraints is optional: A permission without any constraints specified will apply to all instances of the selected model(s).
@@ -13,18 +13,21 @@ At a minimum, a permission assignment must specify one object type, one user or
 
 There are four core actions that can be permitted for each type of object within NetBox, roughly analogous to the CRUD convention (create, read, update, and delete):
 
-* View - Retrieve an object from the database
-* Add - Create a new object
-* Change - Modify an existing object
-* Delete - Delete an existing object
+* **View** - Retrieve an object from the database
+* **Add** - Create a new object
+* **Change** - Modify an existing object
+* **Delete** - Delete an existing object
 
-Some models introduce additional permissions that can be granted to allow other actions. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
+In addition to these, permissions can also grant custom actions that may be required by a specific model or plugin. For example, the `napalm_read` permission on the device model allows a user to execute NAPALM queries on a device via NetBox's REST API. These can be specified when granting a permission in the "additional actions" field.
+
+!!! note
+    Internally, all actions granted by a permission (both built-in and custom) are stored as strings in an array field named `actions`.
 
 ## Constraints
 
-Constraints are defined as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
+Constraints are expressed as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
 
-All constraints defined on a permission are applied with a logic AND. For example, suppose you assign a permission for the site model with the following constraints.
+All constraints defined on a permission are applied with a logical AND. For example, suppose you assign a permission for the site model with the following constraints.
 
 ```json
 {

From af98e349e9692ed6841d8144b80d37bb64dde5c8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 12:52:00 -0400
Subject: [PATCH 413/505] Fixes #4938: Show add, import buttons on virtual
 chassis list view

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/dcim/views.py              | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 7e11d5e87..29313a98f 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -14,6 +14,7 @@
 * [#4921](https://github.com/netbox-community/netbox/issues/4921) - Render non-viewable devices as unavailable space in rack elevations
 * [#4930](https://github.com/netbox-community/netbox/issues/4930) - Replicate label values when instantiating device type components
 * [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
+* [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 
 ---
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 2cee5a413..d37f39590 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2185,7 +2185,6 @@ class VirtualChassisListView(ObjectListView):
     table = tables.VirtualChassisTable
     filterset = filters.VirtualChassisFilterSet
     filterset_form = forms.VirtualChassisFilterForm
-    action_buttons = ('export',)
 
 
 class VirtualChassisView(ObjectView):

From cdfec4d86595c15efe2a8180d89ef49f2704c6bf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 12:57:04 -0400
Subject: [PATCH 414/505] Fixes #4939: Fix linking to LAG interfaces on other
 VC members

---
 docs/release-notes/version-2.9.md        | 1 +
 netbox/templates/dcim/inc/interface.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 29313a98f..745b14c6b 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -15,6 +15,7 @@
 * [#4930](https://github.com/netbox-community/netbox/issues/4930) - Replicate label values when instantiating device type components
 * [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
+* [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
 
 ---
 
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 75869db52..3d7dd4c3d 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -22,7 +22,7 @@
     {# LAG #}
     <td>
         {% if iface.lag %}
-            <a href="#interface_{{ iface.lag }}" class="label label-primary" title="{{ iface.lag.description }}">{{ iface.lag }}</a>
+            <a href="{{ iface.lag.device.get_absolute_url }}#interface_{{ iface.lag }}" class="label label-primary" title="{{ iface.lag.description }}">{{ iface.lag }}</a>
         {% endif %}
     </td>
 

From 31e65a09e8b01341d1b7d641dd41fbb3c9aa6245 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 13:37:32 -0400
Subject: [PATCH 415/505] Closes #4940: Added an occupied field to rack unit
 representations for rack elevation views

---
 docs/release-notes/version-2.9.md |  2 ++
 netbox/dcim/api/serializers.py    |  1 +
 netbox/dcim/api/views.py          |  1 +
 netbox/dcim/models/__init__.py    | 28 ++++++++++++++++++++++++----
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 745b14c6b..a2e94d04f 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -5,6 +5,7 @@
 ### Enhancements
 
 * [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
+* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Added an `occupied` field to rack unit representations for rack elevation views
 
 ### Bug Fixes
 
@@ -86,6 +87,7 @@ When running a report or custom script, its execution is now queued for backgrou
 * dcim.PowerPortTemplate: Added `description` and `label` fields
 * dcim.PowerOutlet: Added `label` field
 * dcim.PowerOutletTemplate: Added `description` and `label` fields
+* dcim.Rack: Added an `occupied` field to rack unit representations for rack elevation views
 * dcim.RackGroup: Added a `_depth` attribute indicating an object's position in the tree.
 * dcim.RackReservation: Added `tags` field
 * dcim.RearPort: Added `label` field
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index c97298b2b..c6db11bbd 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -165,6 +165,7 @@ class RackUnitSerializer(serializers.Serializer):
     name = serializers.CharField(read_only=True)
     face = ChoiceField(choices=DeviceFaceChoices, read_only=True)
     device = NestedDeviceSerializer(read_only=True)
+    occupied = serializers.BooleanField(read_only=True)
 
 
 class RackReservationSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 81407f000..86d72c16c 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -189,6 +189,7 @@ class RackViewSet(CustomFieldModelViewSet):
             # Return a JSON representation of the rack units in the elevation
             elevation = rack.get_rack_units(
                 face=data['face'],
+                user=request.user,
                 exclude=data['exclude'],
                 expand_devices=data['expand_devices']
             )
diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 5932dac88..2803bb8de 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -656,12 +656,14 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
     def get_status_class(self):
         return self.STATUS_CLASS_MAP.get(self.status)
 
-    def get_rack_units(self, face=DeviceFaceChoices.FACE_FRONT, exclude=None, expand_devices=True):
+    def get_rack_units(self, user=None, face=DeviceFaceChoices.FACE_FRONT, exclude=None, expand_devices=True):
         """
         Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'}
         Each key 'device' is either a Device or None. By default, multi-U devices are repeated for each U they occupy.
 
         :param face: Rack face (front or rear)
+        :param user: User instance to be used for evaluating device view permissions. If None, all devices
+            will be included.
         :param exclude: PK of a Device to exclude (optional); helpful when relocating a Device within a Rack
         :param expand_devices: When True, all units that a device occupies will be listed with each containing a
             reference to the device. When False, only the bottom most unit for a device is included and that unit
@@ -670,10 +672,18 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
 
         elevation = OrderedDict()
         for u in self.units:
-            elevation[u] = {'id': u, 'name': 'U{}'.format(u), 'face': face, 'device': None}
+            elevation[u] = {
+                'id': u,
+                'name': f'U{u}',
+                'face': face,
+                'device': None,
+                'occupied': False
+            }
 
         # Add devices to rack units list
         if self.pk:
+
+            # Retrieve all devices installed within the rack
             queryset = Device.objects.prefetch_related(
                 'device_type',
                 'device_type__manufacturer',
@@ -689,12 +699,22 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
             ).filter(
                 Q(face=face) | Q(device_type__is_full_depth=True)
             )
+
+            # Determine which devices the user has permission to view
+            permitted_device_ids = []
+            if user is not None:
+                permitted_device_ids = self.devices.restrict(user, 'view').values_list('pk', flat=True)
+
             for device in queryset:
                 if expand_devices:
                     for u in range(device.position, device.position + device.device_type.u_height):
-                        elevation[u]['device'] = device
+                        if user is None or device.pk in permitted_device_ids:
+                            elevation[u]['device'] = device
+                        elevation[u]['occupied'] = True
                 else:
-                    elevation[device.position]['device'] = device
+                    if user is None or device.pk in permitted_device_ids:
+                        elevation[device.position]['device'] = device
+                    elevation[device.position]['occupied'] = True
                     elevation[device.position]['height'] = device.device_type.u_height
                     for u in range(device.position + 1, device.position + device.device_type.u_height):
                         elevation.pop(u, None)

From b410674f9e84e66f200bc7de8db52ac6e325e906 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 13:56:10 -0400
Subject: [PATCH 416/505] Log a warning for scripts whose run() method does not
 accept a commit argument

---
 docs/additional-features/custom-scripts.md | 2 +-
 netbox/extras/scripts.py                   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md
index 496e4f7fa..917075a8e 100644
--- a/docs/additional-features/custom-scripts.md
+++ b/docs/additional-features/custom-scripts.md
@@ -37,7 +37,7 @@ The `run()` method should accept two arguments:
 * `commit` - A boolean indicating whether database changes will be committed.
 
 !!! note
-    The `commit` argument was introduced in NetBox v2.7.8. Backward compatibility is maintained for scripts which accept only the `data` argument, however moving forward scripts should accept both arguments.
+    The `commit` argument was introduced in NetBox v2.7.8. Backward compatibility is maintained for scripts which accept only the `data` argument, however beginning with v2.10 NetBox will require the `run()` method of every script to accept both arguments. (Either argument may still be ignored within the method.)
 
 Defining variables is optional: You may create a script with only a `run()` method if no user input is needed.
 
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 5955b6252..c3957d4be 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -4,6 +4,7 @@ import logging
 import os
 import pkgutil
 import traceback
+import warnings
 from collections import OrderedDict
 
 import yaml
@@ -405,12 +406,16 @@ def run_script(data, request, commit=True, *args, **kwargs):
     # Add the current request as a property of the script
     script.request = request
 
+    # TODO: Drop backward-compatibility for absent 'commit' argument in v2.10
     # Determine whether the script accepts a 'commit' argument (this was introduced in v2.7.8)
     kwargs = {
         'data': data
     }
     if 'commit' in inspect.signature(script.run).parameters:
         kwargs['commit'] = commit
+    else:
+        warnings.warn(f"The run() method of script {script} should support a 'commit' argument. This will be required "
+                      f"beginning with NetBox v2.10.")
 
     try:
         with transaction.atomic():

From 85174347336f299ca72b3742c1baf4e36952db0c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 14:09:32 -0400
Subject: [PATCH 417/505] Add notes to admin UI encouraging Jinja2 over legacy
 Django templating

---
 netbox/extras/admin.py   | 10 +++++++++-
 netbox/extras/choices.py |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py
index 629edf5ce..a198d03d5 100644
--- a/netbox/extras/admin.py
+++ b/netbox/extras/admin.py
@@ -3,7 +3,6 @@ from django.contrib import admin
 
 from utilities.forms import LaxURLField
 from .models import CustomField, CustomFieldChoice, CustomLink, Graph, ExportTemplate, JobResult, Webhook
-from .reports import get_report
 
 
 def order_content_types(field):
@@ -160,6 +159,10 @@ class GraphForm(forms.ModelForm):
     class Meta:
         model = Graph
         exclude = ()
+        help_texts = {
+            'template_language': "<a href=\"https://jinja.palletsprojects.com\">Jinja2</a> is strongly recommended for "
+                                 "new graphs."
+        }
         widgets = {
             'source': forms.Textarea,
             'link': forms.Textarea,
@@ -195,6 +198,11 @@ class ExportTemplateForm(forms.ModelForm):
     class Meta:
         model = ExportTemplate
         exclude = []
+        help_texts = {
+            'template_language': "<strong>Warning:</strong> Support for Django templating will be dropped in NetBox "
+                                 "v2.10. <a href=\"https://jinja.palletsprojects.com\">Jinja2</a> is strongly "
+                                 "recommended."
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index f911f4f9d..b14748135 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -85,12 +85,12 @@ class ObjectChangeActionChoices(ChoiceSet):
 
 class TemplateLanguageChoices(ChoiceSet):
 
-    LANGUAGE_DJANGO = 'django'
     LANGUAGE_JINJA2 = 'jinja2'
+    LANGUAGE_DJANGO = 'django'
 
     CHOICES = (
-        (LANGUAGE_DJANGO, 'Django'),
         (LANGUAGE_JINJA2, 'Jinja2'),
+        (LANGUAGE_DJANGO, 'Django (Legacy)'),
     )
 
 

From ccb2bf434497dff02d406889784ac13940d77f1d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 14:16:21 -0400
Subject: [PATCH 418/505] Exclude permission, userconfig inlines when creating
 a new user

---
 netbox/users/admin.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 6e8684aae..850b2c460 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -87,9 +87,13 @@ class UserAdmin(UserAdmin_):
         }),
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
     )
-    inlines = [UserObjectPermissionInline, UserConfigInline]
     filter_horizontal = ('groups',)
 
+    def get_inlines(self, request, obj):
+        if obj is not None:
+            return (UserObjectPermissionInline, UserConfigInline)
+        return ()
+
 
 #
 # REST API tokens

From ce2dada9fd2443ad94a14ecff6c0c2d9017db649 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 16:10:51 -0400
Subject: [PATCH 419/505] Closes #4942: Make ObjectPermission's 'name' field
 required

---
 docs/release-notes/version-2.9.md                     | 7 ++++++-
 netbox/users/admin.py                                 | 9 +--------
 netbox/users/migrations/0008_objectpermission.py      | 3 ++-
 netbox/users/migrations/0009_replicate_permissions.py | 8 ++++++--
 netbox/users/models.py                                | 6 +++---
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index a2e94d04f..043c198b7 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,6 +1,6 @@
 # NetBox v2.9
 
-## v2.9.0 (FUTURE)
+## v2.9-beta2 (FUTURE)
 
 ### Enhancements
 
@@ -18,6 +18,11 @@
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 * [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
 
+### Other Changes
+
+* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
+* [#4942](https://github.com/netbox-community/netbox/issues/4942) - Make ObjectPermission's `name` field required
+
 ---
 
 ## v2.9-beta1 (2020-07-23)
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 850b2c460..6d2472e45 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -251,7 +251,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     filter_horizontal = ('object_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
-        'get_name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
+        'name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
     ]
     list_filter = [
         'enabled', ActionListFilter, ObjectTypeListFilter, 'groups', 'users'
@@ -260,13 +260,6 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     def get_queryset(self, request):
         return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
 
-    def get_name(self, obj):
-        return '{}: {}'.format(
-            ', '.join([ot.name for ot in obj.object_types.all()]),
-            ', '.join(obj.actions)
-        )
-    get_name.short_description = 'Name'
-
     def list_models(self, obj):
         return ', '.join([f"{ct}" for ct in obj.object_types.all()])
     list_models.short_description = 'Models'
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 2df065898..4fc7a0220 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
             name='ObjectPermission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('name', models.CharField(blank=True, max_length=100)),
+                ('name', models.CharField(max_length=100)),
                 ('enabled', models.BooleanField(default=True)),
                 ('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
@@ -27,6 +27,7 @@ class Migration(migrations.Migration):
                 ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)),
             ],
             options={
+                'ordering': ['name'],
                 'verbose_name': 'permission',
             },
         ),
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index a5d28beac..4583da302 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -13,7 +13,7 @@ def replicate_permissions(apps, schema_editor):
 
     # TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
     # are combined into a single ObjectPermission instance.
-    for perm in Permission.objects.all():
+    for perm in Permission.objects.select_related('content_type'):
         if perm.codename.split('_')[0] in ACTIONS:
             action = perm.codename.split('_')[0]
         elif perm.codename == 'activate_userkey':
@@ -24,7 +24,11 @@ def replicate_permissions(apps, schema_editor):
             action = perm.codename
 
         if perm.group_set.exists() or perm.user_set.exists():
-            obj_perm = ObjectPermission(actions=[action])
+            obj_perm = ObjectPermission(
+                # Copy name from original Permission object
+                name=f'{perm.content_type.app_label}.{perm.codename}'[:100],
+                actions=[action]
+            )
             obj_perm.save()
             obj_perm.object_types.add(perm.content_type)
             if perm.group_set.exists():
diff --git a/netbox/users/models.py b/netbox/users/models.py
index a531ba867..3d89e93d2 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -239,8 +239,7 @@ class ObjectPermission(models.Model):
     identified by ORM query parameters.
     """
     name = models.CharField(
-        max_length=100,
-        blank=True
+        max_length=100
     )
     enabled = models.BooleanField(
         default=True
@@ -277,7 +276,8 @@ class ObjectPermission(models.Model):
     objects = RestrictedQuerySet.as_manager()
 
     class Meta:
+        ordering = ['name']
         verbose_name = "permission"
 
     def __str__(self):
-        return self.name or f'Permission #{self.pk}'
+        return self.name

From 053c600b67b32fafe9d8e01e8b83dc977c293cf8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 3 Aug 2020 16:27:14 -0400
Subject: [PATCH 420/505] Closes #4943: Add a 'description' field to
 ObjectPermission

---
 docs/release-notes/version-2.9.md                | 1 +
 netbox/users/admin.py                            | 5 +++--
 netbox/users/api/serializers.py                  | 4 +++-
 netbox/users/migrations/0008_objectpermission.py | 1 +
 netbox/users/models.py                           | 4 ++++
 netbox/users/tests/test_api.py                   | 4 ++++
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 043c198b7..01484a7af 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -22,6 +22,7 @@
 
 * [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
 * [#4942](https://github.com/netbox-community/netbox/issues/4942) - Make ObjectPermission's `name` field required
+* [#4943](https://github.com/netbox-community/netbox/issues/4943) - Add a `description` field to ObjectPermission
 
 ---
 
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 6d2472e45..134e9d026 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -232,7 +232,7 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     actions = ('enable', 'disable')
     fieldsets = (
         (None, {
-            'fields': ('name', 'enabled')
+            'fields': ('name', 'description', 'enabled')
         }),
         ('Actions', {
             'fields': (('can_view', 'can_add', 'can_change', 'can_delete'), 'actions')
@@ -251,11 +251,12 @@ class ObjectPermissionAdmin(admin.ModelAdmin):
     filter_horizontal = ('object_types', 'groups', 'users')
     form = ObjectPermissionForm
     list_display = [
-        'name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints',
+        'name', 'enabled', 'list_models', 'list_users', 'list_groups', 'actions', 'constraints', 'description',
     ]
     list_filter = [
         'enabled', ActionListFilter, ObjectTypeListFilter, 'groups', 'users'
     ]
+    search_fields = ['actions', 'constraints', 'description', 'name']
 
     def get_queryset(self, request):
         return super().get_queryset(request).prefetch_related('object_types', 'users', 'groups')
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index 5141abb10..1f338d6e4 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -54,4 +54,6 @@ class ObjectPermissionSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = ObjectPermission
-        fields = ('id', 'url', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints')
+        fields = (
+            'id', 'url', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints',
+        )
diff --git a/netbox/users/migrations/0008_objectpermission.py b/netbox/users/migrations/0008_objectpermission.py
index 4fc7a0220..8ed15b6a1 100644
--- a/netbox/users/migrations/0008_objectpermission.py
+++ b/netbox/users/migrations/0008_objectpermission.py
@@ -19,6 +19,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=100)),
+                ('description', models.CharField(blank=True, max_length=200)),
                 ('enabled', models.BooleanField(default=True)),
                 ('constraints', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),
                 ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 3d89e93d2..6edbd9352 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -241,6 +241,10 @@ class ObjectPermission(models.Model):
     name = models.CharField(
         max_length=100
     )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
     enabled = models.BooleanField(
         default=True
     )
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 1cd5892e9..c4229bff9 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -97,6 +97,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
 
         for i in range(0, 3):
             objectpermission = ObjectPermission(
+                name=f'Permission {i+1}',
                 actions=['view', 'add', 'change', 'delete'],
                 constraints={'name': f'TEST{i+1}'}
             )
@@ -107,6 +108,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
 
         cls.create_data = [
             {
+                'name': 'Permission 4',
                 'object_types': ['dcim.site'],
                 'groups': [groups[0].pk],
                 'users': [users[0].pk],
@@ -114,6 +116,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
                 'constraints': {'name': 'TEST4'},
             },
             {
+                'name': 'Permission 5',
                 'object_types': ['dcim.site'],
                 'groups': [groups[1].pk],
                 'users': [users[1].pk],
@@ -121,6 +124,7 @@ class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
                 'constraints': {'name': 'TEST5'},
             },
             {
+                'name': 'Permission 6',
                 'object_types': ['dcim.site'],
                 'groups': [groups[2].pk],
                 'users': [users[2].pk],

From 65af012d60feb898eed21061b57d9faf96017bcf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 4 Aug 2020 17:07:45 -0400
Subject: [PATCH 421/505] Started refreshing REST API documentation

---
 docs/api/authentication.md                    |  42 --
 docs/api/filtering.md                         |  71 ---
 docs/api/overview.md                          | 291 ------------
 docs/models/users/token.md                    |   4 +-
 docs/rest-api/authentication.md               |  30 ++
 docs/{api => rest-api}/examples.md            |   0
 docs/rest-api/filtering.md                    |  87 ++++
 docs/rest-api/overview.md                     | 435 ++++++++++++++++++
 .../{api => rest-api}/working-with-secrets.md |   0
 mkdocs.yml                                    |  12 +-
 10 files changed, 560 insertions(+), 412 deletions(-)
 delete mode 100644 docs/api/authentication.md
 delete mode 100644 docs/api/filtering.md
 delete mode 100644 docs/api/overview.md
 create mode 100644 docs/rest-api/authentication.md
 rename docs/{api => rest-api}/examples.md (100%)
 create mode 100644 docs/rest-api/filtering.md
 create mode 100644 docs/rest-api/overview.md
 rename docs/{api => rest-api}/working-with-secrets.md (100%)

diff --git a/docs/api/authentication.md b/docs/api/authentication.md
deleted file mode 100644
index e8e6ddc96..000000000
--- a/docs/api/authentication.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# REST API Authentication
-
-The NetBox API employs token-based authentication. For convenience, cookie authentication can also be used when navigating the browsable API.
-
-{!docs/models/users/token.md!}
-
-## Authenticating to the API
-
-By default, read operations will be available without authentication. In this case, a token may be included in the request, but is not necessary.
-
-```
-$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
-{
-    "count": 10,
-    "next": null,
-    "previous": null,
-    "results": [...]
-}
-```
-
-However, if the [`LOGIN_REQUIRED`](../../configuration/optional-settings/#login_required) configuration setting has been set to `True`, all requests must be authenticated.
-
-```
-$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
-{
-    "detail": "Authentication credentials were not provided."
-}
-```
-
-To authenticate to the API, set the HTTP `Authorization` header to the string `Token ` (note the trailing space) followed by the token key.
-
-```
-$ curl -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
-{
-    "count": 10,
-    "next": null,
-    "previous": null,
-    "results": [...]
-}
-```
-
-Additionally, the browsable interface to the API (which can be seen by navigating to the API root `/api/` in a web browser) will attempt to authenticate requests using the same cookie that the normal NetBox front end uses. Thus, if you have logged into NetBox, you will be logged into the browsable API as well.
diff --git a/docs/api/filtering.md b/docs/api/filtering.md
deleted file mode 100644
index 6bc47e75b..000000000
--- a/docs/api/filtering.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# API Filtering
-
-The NetBox API supports robust filtering of results based on the fields of each model.
-Generally speaking you are able to filter based on the attributes (fields) present in
-the response body. Please note however that certain read-only or metadata fields are not
-filterable.
-
-Filtering is achieved by passing HTTP query parameters and the parameter name is the
-name of the field you wish to filter on and the value is the field value.
-
-E.g. filtering based on a device's name:
-```
-/api/dcim/devices/?name=DC-SPINE-1
-```
-
-## Multi Value Logic
-
-While you are able to filter based on an arbitrary number of fields, you are also able to
-pass multiple values for the same field. In most cases filtering on multiple values is
-implemented as a logical OR operation. A notable exception is the `tag` filter which
-is a logical AND. Passing multiple values for one field, can be combined with other fields.
-
-For example, filtering for devices with either the name of DC-SPINE-1 _or_ DC-LEAF-4:
-```
-/api/dcim/devices/?name=DC-SPINE-1&name=DC-LEAF-4
-```
-
-Filtering for devices with tag `router` and `customer-a` will return only devices with
-_both_ of those tags applied:
-```
-/api/dcim/devices/?tag=router&tag=customer-a
-```
-
-## Lookup Expressions
-
-Certain model fields also support filtering using additional lookup expressions. This allows
-for negation and other context specific filtering.
-
-These lookup expressions can be applied by adding a suffix to the desired field's name.
-E.g. `mac_address__n`. In this case, the filter expression is for negation and it is separated
-by two underscores. Below are the lookup expressions that are supported across different field
-types.
-
-### Numeric Fields
-
-Numeric based fields (ASN, VLAN ID, etc) support these lookup expressions:
-
-- `n` - not equal (negation)
-- `lt` - less than
-- `lte` - less than or equal
-- `gt` - greater than
-- `gte` - greater than or equal
-
-### String Fields
-
-String based (char) fields (Name, Address, etc) support these lookup expressions:
-
-- `n` - not equal (negation)
-- `ic` - case insensitive contains
-- `nic` - negated case insensitive contains
-- `isw` - case insensitive starts with
-- `nisw` - negated case insensitive starts with
-- `iew` - case insensitive ends with
-- `niew` - negated case insensitive ends with
-- `ie` - case sensitive exact match
-- `nie` - negated case sensitive exact match
-
-### Foreign Keys & Other Fields
-
-Certain other fields, namely foreign key relationships support just the negation
-expression: `n`.
diff --git a/docs/api/overview.md b/docs/api/overview.md
deleted file mode 100644
index 8eefae027..000000000
--- a/docs/api/overview.md
+++ /dev/null
@@ -1,291 +0,0 @@
-# The NetBox REST API
-
-## What is a REST API?
-
-REST stands for [representational state transfer](https://en.wikipedia.org/wiki/Representational_state_transfer). It's a particular type of API which employs HTTP to create, retrieve, update, and delete objects from a database. (This set of operations is commonly referred to as CRUD.) Each type of operation is associated with a particular HTTP verb:
-
-* `GET`: Retrieve an object or list of objects
-* `POST`: Create an object
-* `PUT` / `PATCH`: Modify an existing object. `PUT` requires all mandatory fields to be specified, while `PATCH` only expects the field that is being modified to be specified.
-* `DELETE`: Delete an existing object
-
-The NetBox API represents all objects in [JavaScript Object Notation (JSON)](http://www.json.org/). This makes it very easy to interact with NetBox data on the command line with common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)
-
-```
-$ curl -s http://localhost:8000/api/ipam/ip-addresses/2954/ | jq '.'
-{
-  "custom_fields": {},
-  "nat_outside": null,
-  "nat_inside": null,
-  "description": "An example IP address",
-  "id": 2954,
-  "family": 4,
-  "address": "5.101.108.132/26",
-  "vrf": null,
-  "tenant": null,
-  "status": {
-    "label": "Active",
-    "value": 1
-  },
-  "role": null,
-  "interface": null
-}
-```
-
-Each attribute of the NetBox object is expressed as a field in the dictionary. Fields may include their own nested objects, as in the case of the `status` field above. Every object includes a primary key named `id` which uniquely identifies it in the database.
-
-## Interactive Documentation
-
-Comprehensive, interactive documentation of all API endpoints is available on a running NetBox instance at `/api/docs/`. This interface provides a convenient sandbox for researching and experimenting with NetBox's various API endpoints and different request types.
-
-## URL Hierarchy
-
-NetBox's entire API is housed under the API root at `https://<hostname>/api/`. The URL structure is divided at the root level by application: circuits, DCIM, extras, IPAM, secrets, and tenancy. Within each application, each model has its own path. For example, the provider and circuit objects are located under the "circuits" application:
-
-* /api/circuits/providers/
-* /api/circuits/circuits/
-
-Likewise, the site, rack, and device objects are located under the "DCIM" application:
-
-* /api/dcim/sites/
-* /api/dcim/racks/
-* /api/dcim/devices/
-
-The full hierarchy of available endpoints can be viewed by navigating to the API root in a web browser.
-
-Each model generally has two views associated with it: a list view and a detail view. The list view is used to request a list of multiple objects or to create a new object. The detail view is used to retrieve, update, or delete an existing object. All objects are referenced by their numeric primary key (`id`).
-
-* /api/dcim/devices/ - List devices or create a new device
-* /api/dcim/devices/123/ - Retrieve, update, or delete the device with ID 123
-
-Lists of objects can be filtered using a set of query parameters. For example, to find all interfaces belonging to the device with ID 123:
-
-```
-GET /api/dcim/interfaces/?device_id=123
-```
-
-See [filtering](filtering.md) for more details.
-
-## Serialization
-
-The NetBox API employs three types of serializers to represent model data:
-
-* Base serializer
-* Nested serializer
-* Writable serializer
-
-The base serializer is used to represent the default view of a model. This includes all database table fields which comprise the model, and may include additional metadata. A base serializer includes relationships to parent objects, but **does not** include child objects. For example, the `VLANSerializer` includes a nested representation its parent VLANGroup (if any), but does not include any assigned Prefixes.
-
-```
-{
-    "id": 1048,
-    "site": {
-        "id": 7,
-        "url": "http://localhost:8000/api/dcim/sites/7/",
-        "name": "Corporate HQ",
-        "slug": "corporate-hq"
-    },
-    "group": {
-        "id": 4,
-        "url": "http://localhost:8000/api/ipam/vlan-groups/4/",
-        "name": "Production",
-        "slug": "production"
-    },
-    "vid": 101,
-    "name": "Users-Floor1",
-    "tenant": null,
-    "status": {
-        "value": 1,
-        "label": "Active"
-    },
-    "role": {
-        "id": 9,
-        "url": "http://localhost:8000/api/ipam/roles/9/",
-        "name": "User Access",
-        "slug": "user-access"
-    },
-    "description": "",
-    "display_name": "101 (Users-Floor1)",
-    "custom_fields": {}
-}
-```
-
-### Related Objects
-
-Related objects (e.g. `ForeignKey` fields) are represented using a nested serializer. A nested serializer provides a minimal representation of an object, including only its URL and enough information to display the object to a user. When performing write API actions (`POST`, `PUT`, and `PATCH`), related objects may be specified by either numeric ID (primary key), or by a set of attributes sufficiently unique to return the desired object.
-
-For example, when creating a new device, its rack can be specified by NetBox ID (PK):
-
-```
-{
-    "name": "MyNewDevice",
-    "rack": 123,
-    ...
-}
-```
-
-Or by a set of nested attributes used to identify the rack:
-
-```
-{
-    "name": "MyNewDevice",
-    "rack": {
-        "site": {
-            "name": "Equinix DC6"
-        },
-        "name": "R204"
-    },
-    ...
-}
-```
-
-Note that if the provided parameters do not return exactly one object, a validation error is raised.
-
-### Brief Format
-
-Most API endpoints support an optional "brief" format, which returns only a minimal representation of each object in the response. This is useful when you need only a list of the objects themselves without any related data, such as when populating a drop-down list in a form.
-
-For example, the default (complete) format of an IP address looks like this:
-
-```
-GET /api/ipam/prefixes/13980/
-
-{
-    "id": 13980,
-    "family": 4,
-    "prefix": "192.0.2.0/24",
-    "site": null,
-    "vrf": null,
-    "tenant": null,
-    "vlan": null,
-    "status": {
-        "value": 1,
-        "label": "Active"
-    },
-    "role": null,
-    "is_pool": false,
-    "description": "",
-    "tags": [],
-    "custom_fields": {},
-    "created": "2018-12-11",
-    "last_updated": "2018-12-11T16:27:55.073174-05:00"
-}
-```
-
-The brief format is much more terse, but includes a link to the object's full representation:
-
-```
-GET /api/ipam/prefixes/13980/?brief=1
-
-{
-    "id": 13980,
-    "url": "https://netbox/api/ipam/prefixes/13980/",
-    "family": 4,
-    "prefix": "192.0.2.0/24"
-}
-```
-
-The brief format is supported for both lists and individual objects.
-
-## Pagination
-
-API responses which contain a list of objects (for example, a request to `/api/dcim/devices/`) will be paginated to avoid unnecessary overhead. The root JSON object will contain the following attributes:
-
-* `count`: The total count of all objects matching the query
-* `next`: A hyperlink to the next page of results (if applicable)
-* `previous`: A hyperlink to the previous page of results (if applicable)
-* `results`: The list of returned objects
-
-Here is an example of a paginated response:
-
-```
-HTTP 200 OK
-Allow: GET, POST, OPTIONS
-Content-Type: application/json
-Vary: Accept
-
-{
-    "count": 2861,
-    "next": "http://localhost:8000/api/dcim/devices/?limit=50&offset=50",
-    "previous": null,
-    "results": [
-        {
-            "id": 123,
-            "name": "DeviceName123",
-            ...
-        },
-        ...
-    ]
-}
-```
-
-The default page size derives from the [`PAGINATE_COUNT`](../../configuration/optional-settings/#paginate_count) configuration setting, which defaults to 50. However, this can be overridden per request by specifying the desired `offset` and `limit` query parameters. For example, if you wish to retrieve a hundred devices at a time, you would make a request for:
-
-```
-http://localhost:8000/api/dcim/devices/?limit=100
-```
-
-The response will return devices 1 through 100. The URL provided in the `next` attribute of the response will return devices 101 through 200:
-
-```
-{
-    "count": 2861,
-    "next": "http://localhost:8000/api/dcim/devices/?limit=100&offset=100",
-    "previous": null,
-    "results": [...]
-}
-```
-
-The maximum number of objects that can be returned is limited by the [`MAX_PAGE_SIZE`](../../configuration/optional-settings/#max_page_size) setting, which is 1000 by default. Setting this to `0` or `None` will remove the maximum limit. An API consumer can then pass `?limit=0` to retrieve _all_ matching objects with a single request.
-
-!!! warning
-    Disabling the page size limit introduces a potential for very resource-intensive requests, since one API request can effectively retrieve an entire table from the database.
-
-## Filtering
-
-A list of objects retrieved via the API can be filtered by passing one or more query parameters. The same parameters used by the web UI work for the API as well. For example, to return only prefixes with a status of "Active" (identified by the slug `active`):
-
-```
-GET /api/ipam/prefixes/?status=active
-```
-
-The choices available for fixed choice fields such as `status` can be retrieved by sending an `OPTIONS` API request for the desired endpoint:
-
-```no-highlight
-$ curl -s -X OPTIONS \
--H "Authorization: Token $TOKEN" \
--H "Content-Type: application/json" \
--H "Accept: application/json; indent=4" \
-http://localhost:8000/api/ipam/prefixes/ | jq ".actions.POST.status.choices"
-[
-  {
-    "value": "container",
-    "display_name": "Container"
-  },
-  {
-    "value": "active",
-    "display_name": "Active"
-  },
-  {
-    "value": "reserved",
-    "display_name": "Reserved"
-  },
-  {
-    "value": "deprecated",
-    "display_name": "Deprecated"
-  }
-]
-```
-
-For most fields, when a filter is passed multiple times, objects matching _any_ of the provided values will be returned. For example, `GET /api/dcim/sites/?name=Foo&name=Bar` will return all sites named "Foo" _or_ "Bar". The exception to this rule is ManyToManyFields which may have multiple values assigned. Tags are the most common example of a ManyToManyField. For example, `GET /api/dcim/sites/?tag=foo&tag=bar` will return only sites tagged with both "foo" _and_ "bar".
-
-### Custom Fields
-
-To filter on a custom field, prepend `cf_` to the field name. For example, the following query will return only sites where a custom field named `foo` is equal to 123:
-
-```
-GET /api/dcim/sites/?cf_foo=123
-```
-
-!!! note
-    Full versus partial matching when filtering is configurable per custom field. Filtering can be toggled (or disabled) for a custom field in the admin UI.
diff --git a/docs/models/users/token.md b/docs/models/users/token.md
index bbeb2284b..d0e0f8609 100644
--- a/docs/models/users/token.md
+++ b/docs/models/users/token.md
@@ -1,12 +1,12 @@
 ## Tokens
 
-A token is a unique identifier that identifies a user to the API. Each user in NetBox may have one or more tokens which he or she can use to authenticate to the API. To create a token, navigate to the API tokens page at `/user/api-tokens/`.
+A token is a unique identifier mapped to a NetBox user account. Each user may have one or more tokens which he or she can use for authentication when making REST API requests. To create a token, navigate to the API tokens page under your user profile.
 
 !!! note
     The creation and modification of API tokens can be restricted per user by an administrator. If you don't see an option to create an API token, ask an administrator to grant you access.
 
 Each token contains a 160-bit key represented as 40 hexadecimal characters. When creating a token, you'll typically leave the key field blank so that a random key will be automatically generated. However, NetBox allows you to specify a key in case you need to restore a previously deleted token to operation.
 
-By default, a token can be used for all operations available via the API. Deselecting the "write enabled" option will restrict API requests made with the token to read operations (e.g. GET) only.
+By default, a token can be used to perform all actions via the API that a user would be permitted to do via the web UI. Deselecting the "write enabled" option will restrict API requests made with the token to read operations (e.g. GET) only.
 
 Additionally, a token can be set to expire at a specific time. This can be useful if an external client needs to be granted temporary access to NetBox.
diff --git a/docs/rest-api/authentication.md b/docs/rest-api/authentication.md
new file mode 100644
index 000000000..7dc66bf28
--- /dev/null
+++ b/docs/rest-api/authentication.md
@@ -0,0 +1,30 @@
+# REST API Authentication
+
+The NetBox REST API primarily employs token-based authentication. For convenience, cookie-based authentication can also be used when navigating the browsable API.
+
+{!docs/models/users/token.md!}
+
+## Authenticating to the API
+
+An authentication token is attached to a request by setting the `Authorization` header to the string `Token` followed by a space and the user's token:
+
+```
+$ curl -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" \
+-H "Accept: application/json; indent=4" \
+http://netbox/api/dcim/sites/
+{
+    "count": 10,
+    "next": null,
+    "previous": null,
+    "results": [...]
+}
+```
+
+A token is not required for read-only operations which have been exempted from permissions enforcement (using the [`EXEMPT_VIEW_PERMISSIONS`](../../configuration/optional-settings/#exempt_view_permissions) configuration parameter). However, if a token _is_ required but not present in a request, the API will return a 403 (Forbidden) response:
+
+```
+$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
+{
+    "detail": "Authentication credentials were not provided."
+}
+```
diff --git a/docs/api/examples.md b/docs/rest-api/examples.md
similarity index 100%
rename from docs/api/examples.md
rename to docs/rest-api/examples.md
diff --git a/docs/rest-api/filtering.md b/docs/rest-api/filtering.md
new file mode 100644
index 000000000..1ec6752a4
--- /dev/null
+++ b/docs/rest-api/filtering.md
@@ -0,0 +1,87 @@
+# REST API Filtering
+
+## Filtering Objects
+
+The objects returned by an API list endpoint can be filtered by attaching one or more query parameters to the request URL. For example, `GET /api/dcim/sites/?status=active` will return only sites with a status of "active."
+
+Multiple parameters can be joined to further narrow results. For example, `GET /api/dcim/sites/?status=active&region=europe` will return only active sites within the Europe region.
+
+Generally, passing multiple values for a single parameter will result in a logical OR operation. For example, `GET /api/dcim/sites/?region=north-america&region=south-america` will return sites in North America _or_ South America. However, a logical AND operation will be used in instances where a field may have multiple values, such as tags. For example, `GET /api/dcim/sites/?tag=foo&tag=bar` will return only sites which have both the "foo" _and_ "bar" tags applied.
+
+### Filtering by Choice Field
+
+Some models have fields which are limited to specific choices, such as the `status` field on the Prefix model. To find all available choices for this field, make an authenticated `OPTIONS` request to the model's list endpoint, and use `jq` to extract the relevant parameters:
+
+```no-highlight
+$ curl -s -X OPTIONS \
+-H "Authorization: Token $TOKEN" \
+-H "Content-Type: application/json" \
+http://netbox/api/ipam/prefixes/ | jq ".actions.POST.status.choices"
+[
+  {
+    "value": "container",
+    "display_name": "Container"
+  },
+  {
+    "value": "active",
+    "display_name": "Active"
+  },
+  {
+    "value": "reserved",
+    "display_name": "Reserved"
+  },
+  {
+    "value": "deprecated",
+    "display_name": "Deprecated"
+  }
+]
+```
+
+!!! note
+    The above works only if the API token used to authenticate the request has permission to make a `POST` request to this endpoint.
+
+### Filtering by Custom Field
+
+To filter results by a custom field value, prepend `cf_` to the custom field name. For example, the following query will return only sites where a custom field named `foo` is equal to 123:
+
+```no-highlight
+GET /api/dcim/sites/?cf_foo=123
+```
+
+Custom fields can be mixed with built-in fields to further narrow results. When creating a custom string field, the type of filtering selected (loose versus exact) determines whether partial or full matching is used.
+
+## Lookup Expressions
+
+Certain model fields also support filtering using additional lookup expressions. This allows
+for negation and other context-specific filtering.
+
+These lookup expressions can be applied by adding a suffix to the desired field's name, e.g. `mac_address__n`. In this case, the filter expression is for negation and it is separated by two underscores. Below are the lookup expressions that are supported across different field types.
+
+### Numeric Fields
+
+Numeric based fields (ASN, VLAN ID, etc) support these lookup expressions:
+
+- `n` - not equal to (negation)
+- `lt` - less than
+- `lte` - less than or equal
+- `gt` - greater than
+- `gte` - greater than or equal
+
+### String Fields
+
+String based (char) fields (Name, Address, etc) support these lookup expressions:
+
+- `n` - not equal to (negation)
+- `ic` - case insensitive contains
+- `nic` - negated case insensitive contains
+- `isw` - case insensitive starts with
+- `nisw` - negated case insensitive starts with
+- `iew` - case insensitive ends with
+- `niew` - negated case insensitive ends with
+- `ie` - case sensitive exact match
+- `nie` - negated case sensitive exact match
+
+### Foreign Keys & Other Fields
+
+Certain other fields, namely foreign key relationships support just the negation
+expression: `n`.
diff --git a/docs/rest-api/overview.md b/docs/rest-api/overview.md
new file mode 100644
index 000000000..f29919202
--- /dev/null
+++ b/docs/rest-api/overview.md
@@ -0,0 +1,435 @@
+# REST API Overview
+
+## What is a REST API?
+
+REST stands for [representational state transfer](https://en.wikipedia.org/wiki/Representational_state_transfer). It's a particular type of API which employs HTTP requests and [JavaScript Object Notation (JSON)](http://www.json.org/) to facilitate create, retrieve, update, and delete (CRUD) operations on objects within an application. Each type of operation is associated with a particular HTTP verb:
+
+* `GET`: Retrieve an object or list of objects
+* `POST`: Create an object
+* `PUT` / `PATCH`: Modify an existing object. `PUT` requires all mandatory fields to be specified, while `PATCH` only expects the field that is being modified to be specified.
+* `DELETE`: Delete an existing object
+
+Additionally, the `OPTIONS` verb can be used to inspect a particular REST API endpoint and return all supported actions and their available parameters.
+
+One of the primary benefits of a REST API is its human-friendliness. Because it utilizes HTTP and JSON, it's very easy to interact with NetBox data on the command line using common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. The following command makes an HTTP `GET` request for information about a particular IP address, identified by its primary key, and uses `jq` to present the raw JSON data returned in a more human-friendly format. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)
+
+```
+$ curl -s http://netbox/api/ipam/ip-addresses/2954/ | jq '.'
+{
+  "id": 2954,
+  "url": "http://netbox/api/ipam/ip-addresses/2954/",
+  "family": {
+    "value": 4,
+    "label": "IPv4"
+  },
+  "address": "192.168.0.42/26",
+  "vrf": null,
+  "tenant": null,
+  "status": {
+    "value": "active",
+    "label": "Active"
+  },
+  "role": null,
+  "assigned_object_type": "dcim.interface",
+  "assigned_object_id": 114771,
+  "assigned_object": {
+    "id": 114771,
+    "url": "http://netbox/api/dcim/interfaces/114771/",
+    "device": {
+      "id": 2230,
+      "url": "http://netbox/api/dcim/devices/2230/",
+      "name": "router1",
+      "display_name": "router1"
+    },
+    "name": "et-0/1/2",
+    "cable": null,
+    "connection_status": null
+  },
+  "nat_inside": null,
+  "nat_outside": null,
+  "dns_name": "",
+  "description": "Example IP address",
+  "tags": [],
+  "custom_fields": {},
+  "created": "2020-08-04",
+  "last_updated": "2020-08-04T14:12:39.666885Z"
+}
+```
+
+Each attribute of the IP address is expressed as an attribute of the JSON object. Fields may include their own nested objects, as in the case of the `assigned_object` field above. Every object includes a primary key named `id` which uniquely identifies it in the database.
+
+## Interactive Documentation
+
+Comprehensive, interactive documentation of all REST API endpoints is available on a running NetBox instance at `/api/docs/`. This interface provides a convenient sandbox for researching and experimenting with specific endpoints and request types. The API itself can also be explored using a web browser by navigating to its root at `/api/`.
+
+## Endpoint Hierarchy
+
+NetBox's entire REST API is housed under the API root at `https://<hostname>/api/`. The URL structure is divided at the root level by application: circuits, DCIM, extras, IPAM, plugins, secrets, tenancy, users, and virtualization. Within each application exists a separate path for each model. For example, the provider and circuit objects are located under the "circuits" application:
+
+* `/api/circuits/providers/`
+* `/api/circuits/circuits/`
+
+Likewise, the site, rack, and device objects are located under the "DCIM" application:
+
+* `/api/dcim/sites/`
+* `/api/dcim/racks/`
+* `/api/dcim/devices/`
+
+The full hierarchy of available endpoints can be viewed by navigating to the API root in a web browser.
+
+Each model generally has two views associated with it: a list view and a detail view. The list view is used to retrieve a list of multiple objects and to create new objects. The detail view is used to retrieve, update, or delete an single existing object. All objects are referenced by their numeric primary key (`id`).
+
+* `/api/dcim/devices/` - List existing devices or create a new device
+* `/api/dcim/devices/123/` - Retrieve, update, or delete the device with ID 123
+
+Lists of objects can be filtered using a set of query parameters. For example, to find all interfaces belonging to the device with ID 123:
+
+```
+GET /api/dcim/interfaces/?device_id=123
+```
+
+See the [filtering documentation](filtering.md) for more details.
+
+## Serialization
+
+The REST API employs two types of serializers to represent model data: base serializers and nested serializers. The base serializer is used to present the complete view of a model. This includes all database table fields which comprise the model, and may include additional metadata. A base serializer includes relationships to parent objects, but **does not** include child objects. For example, the `VLANSerializer` includes a nested representation its parent VLANGroup (if any), but does not include any assigned Prefixes.
+
+```
+{
+    "id": 1048,
+    "site": {
+        "id": 7,
+        "url": "http://netbox/api/dcim/sites/7/",
+        "name": "Corporate HQ",
+        "slug": "corporate-hq"
+    },
+    "group": {
+        "id": 4,
+        "url": "http://netbox/api/ipam/vlan-groups/4/",
+        "name": "Production",
+        "slug": "production"
+    },
+    "vid": 101,
+    "name": "Users-Floor1",
+    "tenant": null,
+    "status": {
+        "value": 1,
+        "label": "Active"
+    },
+    "role": {
+        "id": 9,
+        "url": "http://netbox/api/ipam/roles/9/",
+        "name": "User Access",
+        "slug": "user-access"
+    },
+    "description": "",
+    "display_name": "101 (Users-Floor1)",
+    "custom_fields": {}
+}
+```
+
+### Related Objects
+
+Related objects (e.g. `ForeignKey` fields) are represented using nested serializers. A nested serializer provides a minimal representation of an object, including only its direct URL and enough information to display the object to a user. When performing write API actions (`POST`, `PUT`, and `PATCH`), related objects may be specified by either numeric ID (primary key), or by a set of attributes sufficiently unique to return the desired object.
+
+For example, when creating a new device, its rack can be specified by NetBox ID (PK):
+
+```
+{
+    "name": "MyNewDevice",
+    "rack": 123,
+    ...
+}
+```
+
+Or by a set of nested attributes which uniquely identify the rack:
+
+```
+{
+    "name": "MyNewDevice",
+    "rack": {
+        "site": {
+            "name": "Equinix DC6"
+        },
+        "name": "R204"
+    },
+    ...
+}
+```
+
+Note that if the provided parameters do not return exactly one object, a validation error is raised.
+
+### Brief Format
+
+Most API endpoints support an optional "brief" format, which returns only a minimal representation of each object in the response. This is useful when you need only a list of available objects without any related data, such as when populating a drop-down list in a form. As an example, the default (complete) format of an IP address looks like this:
+
+```
+GET /api/ipam/prefixes/13980/
+
+{
+    "id": 13980,
+    "url": "http://netbox/api/ipam/prefixes/13980/",
+    "family": {
+        "value": 4,
+        "label": "IPv4"
+    },
+    "prefix": "192.0.2.0/24",
+    "site": {
+        "id": 3,
+        "url": "http://netbox/api/dcim/sites/17/",
+        "name": "Site 23A",
+        "slug": "site-23a"
+    },
+    "vrf": null,
+    "tenant": null,
+    "vlan": null,
+    "status": {
+        "value": "container",
+        "label": "Container"
+    },
+    "role": {
+        "id": 17,
+        "url": "http://netbox/api/ipam/roles/17/",
+        "name": "Staging",
+        "slug": "staging"
+    },
+    "is_pool": false,
+    "description": "Example prefix",
+    "tags": [],
+    "custom_fields": {},
+    "created": "2018-12-10",
+    "last_updated": "2019-03-01T20:02:46.173540Z"
+}
+```
+
+The brief format is much more terse:
+
+```
+GET /api/ipam/prefixes/13980/?brief=1
+
+{
+    "id": 13980,
+    "url": "http://netbox/api/ipam/prefixes/13980/",
+    "family": 4,
+    "prefix": "10.40.3.0/24"
+}
+```
+
+The brief format is supported for both lists and individual objects.
+
+## Pagination
+
+API responses which contain a list of many objects will be paginated for efficiency. The root JSON object returned by a list endpoint contains the following attributes:
+
+* `count`: The total number of all objects matching the query
+* `next`: A hyperlink to the next page of results (if applicable)
+* `previous`: A hyperlink to the previous page of results (if applicable)
+* `results`: The list of objects on the current page
+
+Here is an example of a paginated response:
+
+```
+HTTP 200 OK
+Allow: GET, POST, OPTIONS
+Content-Type: application/json
+Vary: Accept
+
+{
+    "count": 2861,
+    "next": "http://netbox/api/dcim/devices/?limit=50&offset=50",
+    "previous": null,
+    "results": [
+        {
+            "id": 231,
+            "name": "Device1",
+            ...
+        },
+        {
+            "id": 232,
+            "name": "Device2",
+            ...
+        },
+        ...
+    ]
+}
+```
+
+The default page is determined by the [`PAGINATE_COUNT`](../../configuration/optional-settings/#paginate_count) configuration parameter, which defaults to 50. However, this can be overridden per request by specifying the desired `offset` and `limit` query parameters. For example, if you wish to retrieve a hundred devices at a time, you would make a request for:
+
+```
+http://netbox/api/dcim/devices/?limit=100
+```
+
+The response will return devices 1 through 100. The URL provided in the `next` attribute of the response will return devices 101 through 200:
+
+```
+{
+    "count": 2861,
+    "next": "http://netbox/api/dcim/devices/?limit=100&offset=100",
+    "previous": null,
+    "results": [...]
+}
+```
+
+The maximum number of objects that can be returned is limited by the [`MAX_PAGE_SIZE`](../../configuration/optional-settings/#max_page_size) configuration parameter, which is 1000 by default. Setting this to `0` or `None` will remove the maximum limit. An API consumer can then pass `?limit=0` to retrieve _all_ matching objects with a single request.
+
+!!! warning
+    Disabling the page size limit introduces a potential for very resource-intensive requests, since one API request can effectively retrieve an entire table from the database.
+
+## Interacting with Objects
+
+### Retrieving Multiple Objects
+
+To query NetBox for a list of objects, make a `GET` request to the model's _list_ endpoint. Objects are listed under the response object's `results` parameter.
+
+```no-highlight
+$ curl -s -X GET http://netbox/api/ipam/ip-addresses/ | jq '.'
+```
+
+```json
+{
+  "count": 42031,
+  "next": "http://netbox/api/ipam/ip-addresses/?limit=50&offset=50",
+  "previous": null,
+  "results": [
+    {
+      "id": 5618,
+      "address": "192.0.2.1/24",
+      ...
+    },
+    {
+      "id": 5619,
+      "address": "192.0.2.2/24",
+      ...
+    },
+    {
+      "id": 5620,
+      "address": "192.0.2.3/24",
+      ...
+    },
+    ...
+  ]
+}
+```
+
+### Retrieving a Single Object
+
+To query NetBox for a single object, make a `GET` request to the model's _detail_ endpoint specifying its unique numeric ID.
+
+!!! note
+    Note that the trailing slash is required. Omitting this will return a 302 redirect.
+
+```no-highlight
+$ curl -s -X GET http://netbox/api/ipam/ip-addresses/5618/ | jq '.'
+```
+
+```json
+{
+  "id": 5618,
+  "address": "192.0.2.1/24",
+  ...
+}
+```
+
+### Creating a New Object
+
+To create a new object, make a `POST` request to the model's _list_ endpoint with JSON data pertaining to the object being created. Note that a REST API token is required for all write operations; see the [authentication documentation](../authentication.md) for more information. Also be sure to set the `Content-Type` HTTP header to `application/json`.
+
+```no-highlight
+curl -s -X POST \
+-H "Authorization: Token $TOKEN" \
+-H "Content-Type: application/json" \
+http://netbox/api/ipam/prefixes/ \
+--data '{"prefix": "192.0.2.0/24", "site": 6}' | jq '.'
+```
+
+```json
+{
+  "id": 18691,
+  "url": "http://netbox/api/ipam/prefixes/18691/",
+  "family": {
+    "value": 4,
+    "label": "IPv4"
+  },
+  "prefix": "192.0.2.0/24",
+  "site": {
+    "id": 6,
+    "url": "http://netbox/api/dcim/sites/6/",
+    "name": "US-East 4",
+    "slug": "us-east-4"
+  },
+  "vrf": null,
+  "tenant": null,
+  "vlan": null,
+  "status": {
+    "value": "active",
+    "label": "Active"
+  },
+  "role": null,
+  "is_pool": false,
+  "description": "",
+  "tags": [],
+  "custom_fields": {},
+  "created": "2020-08-04",
+  "last_updated": "2020-08-04T20:08:39.007125Z"
+}
+```
+
+### Modifying an Object
+
+To modify an object which has already been created, make a `PATCH` request to the model's `detail` endpoint specifying its unique numeric ID. Include any data which you wish to update on the object. As with object creation, the `Authorization` and `Content-Type` headers must also be specified.
+
+```no-highlight
+$ curl -s -X PATCH \
+> -H "Authorization: Token 98dbec0b912e5f3ddec7183c48e73b38fa9ca793" \
+> -H "Content-Type: application/json" \
+> http://netbox/api/ipam/prefixes/18691/ \
+> --data '{"status": "reserved"}' | jq '.'
+```
+
+```json
+{
+  "id": 18691,
+  "url": "http://netbox/api/ipam/prefixes/18691/",
+  "family": {
+    "value": 4,
+    "label": "IPv4"
+  },
+  "prefix": "192.0.2.0/24",
+  "site": {
+    "id": 6,
+    "url": "http://netbox/api/dcim/sites/6/",
+    "name": "US-East 4",
+    "slug": "us-east-4"
+  },
+  "vrf": null,
+  "tenant": null,
+  "vlan": null,
+  "status": {
+    "value": "reserved",
+    "label": "Reserved"
+  },
+  "role": null,
+  "is_pool": false,
+  "description": "",
+  "tags": [],
+  "custom_fields": {},
+  "created": "2020-08-04",
+  "last_updated": "2020-08-04T20:14:55.709430Z"
+}
+```
+
+### Deleting an Object
+
+To delete an object from NetBox, make a `DELETE` request to the model's _detail_ endpoint specifying its unique numeric ID. The `Authorization` header must be included to specify an authorization token, however this type of request does not support passing any data in the body.
+
+```no-highlight
+curl -s -X DELETE \
+-H "Authorization: Token $TOKEN" \
+http://netbox/api/ipam/prefixes/18691/
+```
+
+Note that `DELETE` requests do not return any data: If successful, the API will return a 204 (No Content) response.
+
+!!! note
+    You can run `curl` with the verbose (`-v`) flag to inspect the HTTP response codes.
diff --git a/docs/api/working-with-secrets.md b/docs/rest-api/working-with-secrets.md
similarity index 100%
rename from docs/api/working-with-secrets.md
rename to docs/rest-api/working-with-secrets.md
diff --git a/mkdocs.yml b/mkdocs.yml
index af72207d9..477c8e653 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -62,12 +62,12 @@ nav:
         - Permissions: 'administration/permissions.md'
         - Replicating NetBox: 'administration/replicating-netbox.md'
         - NetBox Shell: 'administration/netbox-shell.md'
-    - API:
-        - Overview: 'api/overview.md'
-        - Filtering: 'api/filtering.md'
-        - Authentication: 'api/authentication.md'
-        - Working with Secrets: 'api/working-with-secrets.md'
-        - Examples: 'api/examples.md'
+    - REST API:
+        - Overview: 'rest-api/overview.md'
+        - Filtering: 'rest-api/filtering.md'
+        - Authentication: 'rest-api/authentication.md'
+        - Working with Secrets: 'rest-api/working-with-secrets.md'
+        - Examples: 'rest-api/examples.md'
     - Development:
         - Introduction: 'development/index.md'
         - Style Guide: 'development/style-guide.md'

From bd24eebbf20f87626c439b6e835df708566980aa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 09:29:29 -0400
Subject: [PATCH 422/505] Fixes #4952: Default to VM tab when creating/editing
 an IP address for a VM

---
 docs/release-notes/version-2.9.md         | 1 +
 netbox/templates/ipam/ipaddress_edit.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 01484a7af..9bebb8499 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -17,6 +17,7 @@
 * [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 * [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
+* [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
 
 ### Other Changes
 
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index 4e2706daf..0748bc5ca 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -33,7 +33,7 @@
             <strong>Interface Assignment</strong>
         </div>
         <div class="panel-body">
-            {% with vm_tab_active=obj.vminterface.exists %}
+            {% with vm_tab_active=form.initial.vminterface %}
                 <ul class="nav nav-tabs" role="tablist">
                     <li role="presentation"{% if not vm_tab_active %} class="active"{% endif %}><a href="#device" role="tab" data-toggle="tab">Device</a></li>
                     <li role="presentation"{% if vm_tab_active %} class="active"{% endif %}><a href="#virtualmachine" role="tab" data-toggle="tab">Virtual Machine</a></li>

From e6df6dc7f4af129b2274a698f825f5d16f929ee5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 10:11:38 -0400
Subject: [PATCH 423/505] Fixes #4950: Include inventory item label in API
 serializer, UI view

---
 docs/release-notes/version-2.9.md        | 1 +
 netbox/dcim/api/serializers.py           | 4 ++--
 netbox/templates/dcim/inventoryitem.html | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 9bebb8499..8df4e10ce 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -17,6 +17,7 @@
 * [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 * [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
+* [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view
 * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
 
 ### Other Changes
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index c6db11bbd..d33af5b5c 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -640,8 +640,8 @@ class InventoryItemSerializer(TaggedObjectSerializer, ValidatedModelSerializer):
     class Meta:
         model = InventoryItem
         fields = [
-            'id', 'url', 'device', 'parent', 'name', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered',
-            'description', 'tags',
+            'id', 'url', 'device', 'parent', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag',
+            'discovered', 'description', 'tags',
         ]
 
 
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 6e12d9f33..54f49d5f2 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -30,6 +30,10 @@
                         <td>Name</td>
                         <td>{{ instance.name }}</td>
                     </tr>
+                    <tr>
+                        <td>Label</td>
+                        <td>{{ instance.label|placeholder }}</td>
+                    </tr>
                     <tr>
                         <td>Manufacturer</td>
                         <td>

From 42ebf0a546d52962e4b6a3064c41ef9054f5dd57 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 10:40:45 -0400
Subject: [PATCH 424/505] Closes #4945: Add a user-friendly 403 error page

---
 docs/release-notes/version-2.9.md |  3 ++-
 netbox/templates/403.html         |  9 +++++++++
 netbox/templates/404.html         | 24 +++++++-----------------
 netbox/templates/40x.html         | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 netbox/templates/403.html
 create mode 100644 netbox/templates/40x.html

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 8df4e10ce..d564978bd 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -5,7 +5,8 @@
 ### Enhancements
 
 * [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
-* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Added an `occupied` field to rack unit representations for rack elevation views
+* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
+* [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
 
 ### Bug Fixes
 
diff --git a/netbox/templates/403.html b/netbox/templates/403.html
new file mode 100644
index 000000000..6a114301f
--- /dev/null
+++ b/netbox/templates/403.html
@@ -0,0 +1,9 @@
+{% extends '40x.html' %}
+
+{% block title %}Access Denied{% endblock %}
+
+{% block icon %}<i class="glyphicon glyphicon-lock"></i>{% endblock %}
+
+{% block message %}
+    You do not have permission to access this page.
+{% endblock %}
diff --git a/netbox/templates/404.html b/netbox/templates/404.html
index f2fe6b430..22c17fed4 100644
--- a/netbox/templates/404.html
+++ b/netbox/templates/404.html
@@ -1,19 +1,9 @@
-{% extends 'base.html' %}
+{% extends '40x.html' %}
 
-{% block content %}
-<div class="row" style="margin-top: 150px;">
-    <div class="col-sm-4 col-sm-offset-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong><i class="glyphicon glyphicon-warning-sign"></i> Page Not Found</strong>
-            </div>
-            <div class="panel-body">
-                The requested page does not exist.
-            </div>
-            <div class="panel-footer text-right">
-                <a href="{% url 'home' %}" class="btn btn-xs btn-primary">Home Page</a>
-            </div>
-        </div>
-    </div>
-</div>
+{% block title %}Page Not Found{% endblock %}
+
+{% block icon %}<i class="glyphicon glyphicon-warning-sign"></i>{% endblock %}
+
+{% block message %}
+    The requested page does not exist.
 {% endblock %}
diff --git a/netbox/templates/40x.html b/netbox/templates/40x.html
new file mode 100644
index 000000000..d923d001e
--- /dev/null
+++ b/netbox/templates/40x.html
@@ -0,0 +1,19 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<div class="row" style="margin-top: 150px;">
+    <div class="col-sm-4 col-sm-offset-4">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>{% block icon %}{% endblock %} {% block title %}{% endblock %}</strong>
+            </div>
+            <div class="panel-body">
+                {% block message %}{% endblock %}
+            </div>
+            <div class="panel-footer text-right">
+                <a href="{% url 'home' %}" class="btn btn-xs btn-primary">Home Page</a>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

From 73756f74833f0091d6770b7d13c1cee5376226bf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 13:40:06 -0400
Subject: [PATCH 425/505] Finished updating REST API documentation

---
 docs/rest-api/examples.md             | 162 --------------------------
 docs/rest-api/overview.md             | 114 ++++++++++++++++--
 docs/rest-api/working-with-secrets.md | 102 ++++++++++------
 mkdocs.yml                            |   1 -
 4 files changed, 171 insertions(+), 208 deletions(-)
 delete mode 100644 docs/rest-api/examples.md

diff --git a/docs/rest-api/examples.md b/docs/rest-api/examples.md
deleted file mode 100644
index f4348907f..000000000
--- a/docs/rest-api/examples.md
+++ /dev/null
@@ -1,162 +0,0 @@
-# API Examples
-
-Supported HTTP methods:
-
-* `GET`: Retrieve an object or list of objects
-* `POST`: Create a new object
-* `PUT`: Update an existing object, all mandatory fields must be specified
-* `PATCH`: Updates an existing object, only specifying the field to be changed
-* `DELETE`: Delete an existing object
-
-To authenticate a request, attach your token in an `Authorization` header:
-
-```
-curl -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0"
-```
-
-## Retrieving a list of sites
-
-Send a `GET` request to the object list endpoint. The response contains a paginated list of JSON objects.
-
-```
-$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
-{
-    "count": 14,
-    "next": null,
-    "previous": null,
-    "results": [
-        {
-            "id": 6,
-            "name": "Corporate HQ",
-            "slug": "corporate-hq",
-            "region": null,
-            "tenant": null,
-            "facility": "",
-            "asn": null,
-            "physical_address": "742 Evergreen Terrace, Springfield, USA",
-            "shipping_address": "",
-            "contact_name": "",
-            "contact_phone": "",
-            "contact_email": "",
-            "comments": "",
-            "custom_fields": {},
-            "count_prefixes": 108,
-            "count_vlans": 46,
-            "count_racks": 8,
-            "count_devices": 254,
-            "count_circuits": 6
-        },
-        ...
-    ]
-}
-```
-
-## Retrieving a single site by ID
-
-Send a `GET` request to the object detail endpoint. The response contains a single JSON object.
-
-```
-$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/6/
-{
-    "id": 6,
-    "name": "Corporate HQ",
-    "slug": "corporate-hq",
-    "region": null,
-    "tenant": null,
-    "facility": "",
-    "asn": null,
-    "physical_address": "742 Evergreen Terrace, Springfield, USA",
-    "shipping_address": "",
-    "contact_name": "",
-    "contact_phone": "",
-    "contact_email": "",
-    "comments": "",
-    "custom_fields": {},
-    "count_prefixes": 108,
-    "count_vlans": 46,
-    "count_racks": 8,
-    "count_devices": 254,
-    "count_circuits": 6
-}
-```
-
-## Creating a new site
-
-Send a `POST` request to the site list endpoint with token authentication and JSON-formatted data. Only mandatory fields are required. This example includes one non required field, "region."
-
-```
-$ curl -X POST -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/sites/ --data '{"name": "My New Site", "slug": "my-new-site", "region": 5}'
-{
-    "id": 16,
-    "name": "My New Site",
-    "slug": "my-new-site",
-    "region": 5,
-    "tenant": null,
-    "facility": "",
-    "asn": null,
-    "physical_address": "",
-    "shipping_address": "",
-    "contact_name": "",
-    "contact_phone": "",
-    "contact_email": "",
-    "comments": ""
-}
-```
-Note that in this example we are creating a site bound to a region with the ID of 5. For write API actions (`POST`, `PUT`, and `PATCH`) the integer ID value is used for `ForeignKey` (related model) relationships, instead of the nested representation that is used in the `GET` (list) action.
-
-## Modify an existing site
-
-Make an authenticated `PUT` request to the site detail endpoint. As with a create (`POST`) request, all mandatory fields must be included.
-
-```
-$ curl -X PUT -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/sites/16/ --data '{"name": "Renamed Site", "slug": "renamed-site"}'
-```
-
-## Modify an object by changing a field
-
-Make an authenticated `PATCH` request to the device endpoint. With `PATCH`, unlike `POST` and `PUT`, we only specify the field that is being changed. In this example, we add a serial number to a device.
-```
-$ curl -X PATCH -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/devices/2549/ --data '{"serial": "FTX1123A090"}'
-```
-
-## Delete an existing site
-
-Send an authenticated `DELETE` request to the site detail endpoint.
-
-```
-$ curl -v -X DELETE -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/sites/16/
-* Connected to localhost (127.0.0.1) port 8000 (#0)
-> DELETE /api/dcim/sites/16/ HTTP/1.1
-> User-Agent: curl/7.35.0
-> Host: localhost:8000
-> Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0
-> Content-Type: application/json
-> Accept: application/json; indent=4
->
-* HTTP 1.0, assume close after body
-< HTTP/1.0 204 No Content
-< Date: Mon, 20 Mar 2017 16:13:08 GMT
-< Server: WSGIServer/0.1 Python/2.7.6
-< Vary: Accept, Cookie
-< X-Frame-Options: SAMEORIGIN
-< Allow: GET, PUT, PATCH, DELETE, OPTIONS
-<
-* Closing connection 0
-```
-
-The response to a successful `DELETE` request will have code 204 (No Content); the body of the response will be empty.
-
-
-## Bulk Object Creation
-
-The REST API supports the creation of multiple objects of the same type using a single `POST` request. For example, to create multiple devices:
-
-```
-curl -X POST -H "Authorization: Token <TOKEN>" -H "Content-Type: application/json" -H "Accept: application/json; indent=4" http://localhost:8000/api/dcim/devices/ --data '[
-{"name": "device1", "device_type": 24, "device_role": 17, "site": 6},
-{"name": "device2", "device_type": 24, "device_role": 17, "site": 6},
-{"name": "device3", "device_type": 24, "device_role": 17, "site": 6},
-]'
-```
-
-Bulk creation is all-or-none: If any of the creations fails, the entire operation is rolled back. A successful response returns an HTTP code 201 and the body of the response will be a list/array of the objects created.
\ No newline at end of file
diff --git a/docs/rest-api/overview.md b/docs/rest-api/overview.md
index f29919202..6c1f59daa 100644
--- a/docs/rest-api/overview.md
+++ b/docs/rest-api/overview.md
@@ -13,8 +13,11 @@ Additionally, the `OPTIONS` verb can be used to inspect a particular REST API en
 
 One of the primary benefits of a REST API is its human-friendliness. Because it utilizes HTTP and JSON, it's very easy to interact with NetBox data on the command line using common tools. For example, we can request an IP address from NetBox and output the JSON using `curl` and `jq`. The following command makes an HTTP `GET` request for information about a particular IP address, identified by its primary key, and uses `jq` to present the raw JSON data returned in a more human-friendly format. (Piping the output through `jq` isn't strictly required but makes it much easier to read.)
 
+```no-highlight
+curl -s http://netbox/api/ipam/ip-addresses/2954/ | jq '.'
 ```
-$ curl -s http://netbox/api/ipam/ip-addresses/2954/ | jq '.'
+
+```json
 {
   "id": 2954,
   "url": "http://netbox/api/ipam/ip-addresses/2954/",
@@ -94,7 +97,7 @@ See the [filtering documentation](filtering.md) for more details.
 
 The REST API employs two types of serializers to represent model data: base serializers and nested serializers. The base serializer is used to present the complete view of a model. This includes all database table fields which comprise the model, and may include additional metadata. A base serializer includes relationships to parent objects, but **does not** include child objects. For example, the `VLANSerializer` includes a nested representation its parent VLANGroup (if any), but does not include any assigned Prefixes.
 
-```
+```json
 {
     "id": 1048,
     "site": {
@@ -134,7 +137,7 @@ Related objects (e.g. `ForeignKey` fields) are represented using nested serializ
 
 For example, when creating a new device, its rack can be specified by NetBox ID (PK):
 
-```
+```json
 {
     "name": "MyNewDevice",
     "rack": 123,
@@ -144,7 +147,7 @@ For example, when creating a new device, its rack can be specified by NetBox ID
 
 Or by a set of nested attributes which uniquely identify the rack:
 
-```
+```json
 {
     "name": "MyNewDevice",
     "rack": {
@@ -159,6 +162,53 @@ Or by a set of nested attributes which uniquely identify the rack:
 
 Note that if the provided parameters do not return exactly one object, a validation error is raised.
 
+### Generic Relations
+
+Some objects within NetBox have attributes which can reference an object of multiple types, known as _generic relations_. For example, an IP address can be assigned to either a device interface _or_ a virtual machine interface. When making this assignment via the REST API, we must specify two attributes:
+
+* `assigned_object_type` - The content type of the assigned object, defined as `<app>.<model>`
+* `assigned_object_id` - The assigned object's unique numeric ID
+
+Together, these values identify a unique object in NetBox. The assigned object (if any) is represented by the `assigned_object` attribute on the IP address model.
+
+```no-highlight
+curl -X POST \
+-H "Authorization: Token $TOKEN" \
+-H "Content-Type: application/json" \
+-H "Accept: application/json; indent=4" \
+http://netbox/api/ipam/ip-addresses/ \
+--data '{
+    "address": "192.0.2.1/24",
+    "assigned_object_type": "dcim.interface",
+    "assigned_object_id": 69023
+}'
+```
+
+```json
+{
+    "id": 56296,
+    "url": "http://netbox/api/ipam/ip-addresses/56296/",
+    "assigned_object_type": "dcim.interface",
+    "assigned_object_id": 69000,
+    "assigned_object": {
+        "id": 69000,
+        "url": "http://netbox/api/dcim/interfaces/69023/",
+        "device": {
+            "id": 2174,
+            "url": "http://netbox/api/dcim/devices/2174/",
+            "name": "device105",
+            "display_name": "device105"
+        },
+        "name": "ge-0/0/0",
+        "cable": null,
+        "connection_status": null
+    },
+    ...
+}
+```
+
+If we wanted to assign this IP address to a virtual machine interface instead, we would have set `assigned_object_type` to `virtualization.vminterface` and updated the object ID appropriately.
+
 ### Brief Format
 
 Most API endpoints support an optional "brief" format, which returns only a minimal representation of each object in the response. This is useful when you need only a list of available objects without any related data, such as when populating a drop-down list in a form. As an example, the default (complete) format of an IP address looks like this:
@@ -262,7 +312,7 @@ http://netbox/api/dcim/devices/?limit=100
 
 The response will return devices 1 through 100. The URL provided in the `next` attribute of the response will return devices 101 through 200:
 
-```
+```json
 {
     "count": 2861,
     "next": "http://netbox/api/dcim/devices/?limit=100&offset=100",
@@ -283,7 +333,7 @@ The maximum number of objects that can be returned is limited by the [`MAX_PAGE_
 To query NetBox for a list of objects, make a `GET` request to the model's _list_ endpoint. Objects are listed under the response object's `results` parameter.
 
 ```no-highlight
-$ curl -s -X GET http://netbox/api/ipam/ip-addresses/ | jq '.'
+curl -s -X GET http://netbox/api/ipam/ip-addresses/ | jq '.'
 ```
 
 ```json
@@ -320,7 +370,7 @@ To query NetBox for a single object, make a `GET` request to the model's _detail
     Note that the trailing slash is required. Omitting this will return a 302 redirect.
 
 ```no-highlight
-$ curl -s -X GET http://netbox/api/ipam/ip-addresses/5618/ | jq '.'
+curl -s -X GET http://netbox/api/ipam/ip-addresses/5618/ | jq '.'
 ```
 
 ```json
@@ -333,7 +383,7 @@ $ curl -s -X GET http://netbox/api/ipam/ip-addresses/5618/ | jq '.'
 
 ### Creating a New Object
 
-To create a new object, make a `POST` request to the model's _list_ endpoint with JSON data pertaining to the object being created. Note that a REST API token is required for all write operations; see the [authentication documentation](../authentication.md) for more information. Also be sure to set the `Content-Type` HTTP header to `application/json`.
+To create a new object, make a `POST` request to the model's _list_ endpoint with JSON data pertaining to the object being created. Note that a REST API token is required for all write operations; see the [authentication documentation](../authentication/) for more information. Also be sure to set the `Content-Type` HTTP header to `application/json`.
 
 ```no-highlight
 curl -s -X POST \
@@ -375,12 +425,51 @@ http://netbox/api/ipam/prefixes/ \
 }
 ```
 
-### Modifying an Object
+### Creating Multiple Objects
 
-To modify an object which has already been created, make a `PATCH` request to the model's `detail` endpoint specifying its unique numeric ID. Include any data which you wish to update on the object. As with object creation, the `Authorization` and `Content-Type` headers must also be specified.
+To create multiple instances of a model using a single request, make a `POST` request to the model's _list_ endpoint with a list of JSON objects representing each instance to be created. If successful, the response will contain a list of the newly created instances. The example below illustrates the creation of three new sites.
 
 ```no-highlight
-$ curl -s -X PATCH \
+curl -X POST -H "Authorization: Token $TOKEN" \
+-H "Content-Type: application/json" \
+-H "Accept: application/json; indent=4" \
+http://netbox/api/dcim/sites/ \
+--data '[
+{"name": "Site 1", "slug": "site-1", "region": {"name": "United States"}},
+{"name": "Site 2", "slug": "site-2", "region": {"name": "United States"}},
+{"name": "Site 3", "slug": "site-3", "region": {"name": "United States"}}
+]'
+```
+
+```json
+[
+    {
+        "id": 21,
+        "url": "http://netbox/api/dcim/sites/21/",
+        "name": "Site 1",
+        ...
+    },
+    {
+        "id": 22,
+        "url": "http://netbox/api/dcim/sites/22/",
+        "name": "Site 2",
+        ...
+    },
+    {
+        "id": 23,
+        "url": "http://netbox/api/dcim/sites/23/",
+        "name": "Site 3",
+        ...
+    }
+]
+```
+
+### Modifying an Object
+
+To modify an object which has already been created, make a `PATCH` request to the model's _detail_ endpoint specifying its unique numeric ID. Include any data which you wish to update on the object. As with object creation, the `Authorization` and `Content-Type` headers must also be specified.
+
+```no-highlight
+curl -s -X PATCH \
 > -H "Authorization: Token 98dbec0b912e5f3ddec7183c48e73b38fa9ca793" \
 > -H "Content-Type: application/json" \
 > http://netbox/api/ipam/prefixes/18691/ \
@@ -419,6 +508,9 @@ $ curl -s -X PATCH \
 }
 ```
 
+!!! note "PUT versus PATCH"
+    The NetBox REST API support the use of either `PUT` or `PATCH` to modify an existing object. The difference is that a `PUT` request requires the user to specify a _complete_ representation of the object being modified, whereas a `PATCH` request need include only the attributes that are being updated. For most purposes, using `PATCH` is recommended.
+
 ### Deleting an Object
 
 To delete an object from NetBox, make a `DELETE` request to the model's _detail_ endpoint specifying its unique numeric ID. The `Authorization` header must be included to specify an authorization token, however this type of request does not support passing any data in the body.
diff --git a/docs/rest-api/working-with-secrets.md b/docs/rest-api/working-with-secrets.md
index 129bd0855..dafbb7239 100644
--- a/docs/rest-api/working-with-secrets.md
+++ b/docs/rest-api/working-with-secrets.md
@@ -1,16 +1,19 @@
 # Working with Secrets
 
-As with most other objects, the NetBox API can be used to create, modify, and delete secrets. However, additional steps are needed to encrypt or decrypt secret data.
+As with most other objects, the REST API can be used to view, create, modify, and delete secrets. However, additional steps are needed to encrypt or decrypt secret data.
 
 ## Generating a Session Key
 
 In order to encrypt or decrypt secret data, a session key must be attached to the API request. To generate a session key, send an authenticated request to the `/api/secrets/get-session-key/` endpoint with the private RSA key which matches your [UserKey](../../core-functionality/secrets/#user-keys). The private key must be POSTed with the name `private_key`.
 
-```
-$ curl -X POST http://localhost:8000/api/secrets/get-session-key/ \
--H "Authorization: Token c639d619ecbeb1f3055c4141ba6870e20572edd7" \
+```no-highlight
+$ curl -X POST http://netbox/api/secrets/get-session-key/ \
+-H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4" \
 --data-urlencode "private_key@<filename>"
+```
+
+```json
 {
     "session_key": "dyEnxlc9lnGzaOAV1dV/xqYPV63njIbdZYOgnAlGPHk="
 }
@@ -19,94 +22,106 @@ $ curl -X POST http://localhost:8000/api/secrets/get-session-key/ \
 !!! note
     To read the private key from a file, use the convention above. Alternatively, the private key can be read from an environment variable using `--data-urlencode "private_key=$PRIVATE_KEY"`.
 
-The request uses your private key to unlock your stored copy of the master key and generate a session key which can be attached in the `X-Session-Key` header of future API requests.
+The request uses the provided private key to unlock your stored copy of the master key and generate a temporary session key, which can be attached in the `X-Session-Key` header of future API requests.
 
 ## Retrieving Secrets
 
 A session key is not needed to retrieve unencrypted secrets: The secret is returned like any normal object with its `plaintext` field set to null.
 
-```
-$ curl http://localhost:8000/api/secrets/secrets/2587/ \
--H "Authorization: Token c639d619ecbeb1f3055c4141ba6870e20572edd7" \
+```no-highlight
+$ curl http://netbox/api/secrets/secrets/2587/ \
+-H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4"
+```
+
+```json
 {
     "id": 2587,
+    "url": "http://netbox/api/secrets/secrets/2587/",
     "device": {
         "id": 1827,
-        "url": "http://localhost:8000/api/dcim/devices/1827/",
+        "url": "http://netbox/api/dcim/devices/1827/",
         "name": "MyTestDevice",
         "display_name": "MyTestDevice"
     },
     "role": {
         "id": 1,
-        "url": "http://localhost:8000/api/secrets/secret-roles/1/",
+        "url": "http://netbox/api/secrets/secret-roles/1/",
         "name": "Login Credentials",
         "slug": "login-creds"
     },
     "name": "admin",
     "plaintext": null,
     "hash": "pbkdf2_sha256$1000$G6mMFe4FetZQ$f+0itZbAoUqW5pd8+NH8W5rdp/2QNLIBb+LGdt4OSKA=",
+    "tags": [],
+    "custom_fields": {},
     "created": "2017-03-21",
     "last_updated": "2017-03-21T19:28:44.265582Z"
 }
 ```
 
-To decrypt a secret, we must include our session key in the `X-Session-Key` header:
+To decrypt a secret, we must include our session key in the `X-Session-Key` header when sending the `GET` request:
 
-```
-$ curl http://localhost:8000/api/secrets/secrets/2587/ \
--H "Authorization: Token c639d619ecbeb1f3055c4141ba6870e20572edd7" \
+```no-highlight
+$ curl http://netbox/api/secrets/secrets/2587/ \
+-H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4" \
 -H "X-Session-Key: dyEnxlc9lnGzaOAV1dV/xqYPV63njIbdZYOgnAlGPHk="
+```
+
+```json
 {
     "id": 2587,
+    "url": "http://netbox/api/secrets/secrets/2587/",
     "device": {
         "id": 1827,
-        "url": "http://localhost:8000/api/dcim/devices/1827/",
+        "url": "http://netbox/api/dcim/devices/1827/",
         "name": "MyTestDevice",
         "display_name": "MyTestDevice"
     },
     "role": {
         "id": 1,
-        "url": "http://localhost:8000/api/secrets/secret-roles/1/",
+        "url": "http://netbox/api/secrets/secret-roles/1/",
         "name": "Login Credentials",
         "slug": "login-creds"
     },
     "name": "admin",
     "plaintext": "foobar",
     "hash": "pbkdf2_sha256$1000$G6mMFe4FetZQ$f+0itZbAoUqW5pd8+NH8W5rdp/2QNLIBb+LGdt4OSKA=",
+    "tags": [],
+    "custom_fields": {},
     "created": "2017-03-21",
     "last_updated": "2017-03-21T19:28:44.265582Z"
 }
 ```
 
-Lists of secrets can be decrypted in this manner as well:
+Multiple secrets within a list can be decrypted in this manner as well:
 
-```
-$ curl http://localhost:8000/api/secrets/secrets/?limit=3 \
--H "Authorization: Token c639d619ecbeb1f3055c4141ba6870e20572edd7" \
+```no-highlight
+$ curl http://netbox/api/secrets/secrets/?limit=3 \
+-H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4" \
 -H "X-Session-Key: dyEnxlc9lnGzaOAV1dV/xqYPV63njIbdZYOgnAlGPHk="
+```
+
+```json
 {
     "count": 3482,
-    "next": "http://localhost:8000/api/secrets/secrets/?limit=3&offset=3",
+    "next": "http://netbox/api/secrets/secrets/?limit=3&offset=3",
     "previous": null,
     "results": [
         {
             "id": 2587,
-            ...
             "plaintext": "foobar",
             ...
         },
         {
             "id": 2588,
-            ...
             "plaintext": "MyP@ssw0rd!",
             ...
         },
         {
             "id": 2589,
-            ...
             "plaintext": "AnotherSecret!",
             ...
         },
@@ -114,25 +129,44 @@ $ curl http://localhost:8000/api/secrets/secrets/?limit=3 \
 }
 ```
 
-## Creating Secrets
+## Creating and Updating Secrets
 
-Session keys are also used to decrypt new or modified secrets. This is done by setting the `plaintext` field of the submitted object:
+Session keys are required when creating or modifying secrets. The secret's `plaintext` attribute is set to its non-encrypted value, and NetBox uses the session key to compute and store the encrypted value.
 
-```
-$ curl -X POST http://localhost:8000/api/secrets/secrets/ \
+```no-highlight
+$ curl -X POST http://netbox/api/secrets/secrets/ \
 -H "Content-Type: application/json" \
--H "Authorization: Token c639d619ecbeb1f3055c4141ba6870e20572edd7" \
+-H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4" \
 -H "X-Session-Key: dyEnxlc9lnGzaOAV1dV/xqYPV63njIbdZYOgnAlGPHk=" \
 --data '{"device": 1827, "role": 1, "name": "backup", "plaintext": "Drowssap1"}'
+```
+
+```json
 {
-    "id": 2590,
-    "device": 1827,
-    "role": 1,
+    "id": 6194,
+    "url": "http://netbox/api/secrets/secrets/9194/",
+    "device": {
+        "id": 1827,
+        "url": "http://netbox/api/dcim/devices/1827/",
+        "name": "device43",
+        "display_name": "device43"
+    },
+    "role": {
+        "id": 1,
+        "url": "http://netbox/api/secrets/secret-roles/1/",
+        "name": "Login Credentials",
+        "slug": "login-creds"
+    },
     "name": "backup",
-    "plaintext": "Drowssap1"
+    "plaintext": "Drowssap1",
+    "hash": "pbkdf2_sha256$1000$J9db8sI5vBrd$IK6nFXnFl+K+nR5/KY8RSDxU1skYL8G69T5N3jZxM7c=",
+    "tags": [],
+    "custom_fields": {},
+    "created": "2020-08-05",
+    "last_updated": "2020-08-05T16:51:14.990506Z"
 }
 ```
 
 !!! note
-    Don't forget to include the `Content-Type: application/json` header when making a POST request.
+    Don't forget to include the `Content-Type: application/json` header when making a POST or PATCH request.
diff --git a/mkdocs.yml b/mkdocs.yml
index 477c8e653..a94aa3cc4 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -67,7 +67,6 @@ nav:
         - Filtering: 'rest-api/filtering.md'
         - Authentication: 'rest-api/authentication.md'
         - Working with Secrets: 'rest-api/working-with-secrets.md'
-        - Examples: 'rest-api/examples.md'
     - Development:
         - Introduction: 'development/index.md'
         - Style Guide: 'development/style-guide.md'

From bdb8263610a60eceacf8c60877fbae948b19417d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 14:04:35 -0400
Subject: [PATCH 426/505] Standardize API requests

---
 docs/rest-api/authentication.md | 4 ++--
 docs/rest-api/overview.md       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/rest-api/authentication.md b/docs/rest-api/authentication.md
index 7dc66bf28..5d5777483 100644
--- a/docs/rest-api/authentication.md
+++ b/docs/rest-api/authentication.md
@@ -9,7 +9,7 @@ The NetBox REST API primarily employs token-based authentication. For convenienc
 An authentication token is attached to a request by setting the `Authorization` header to the string `Token` followed by a space and the user's token:
 
 ```
-$ curl -H "Authorization: Token d2f763479f703d80de0ec15254237bc651f9cdc0" \
+$ curl -H "Authorization: Token $TOKEN" \
 -H "Accept: application/json; indent=4" \
 http://netbox/api/dcim/sites/
 {
@@ -23,7 +23,7 @@ http://netbox/api/dcim/sites/
 A token is not required for read-only operations which have been exempted from permissions enforcement (using the [`EXEMPT_VIEW_PERMISSIONS`](../../configuration/optional-settings/#exempt_view_permissions) configuration parameter). However, if a token _is_ required but not present in a request, the API will return a 403 (Forbidden) response:
 
 ```
-$ curl -H "Accept: application/json; indent=4" http://localhost/api/dcim/sites/
+$ curl http://netbox/api/dcim/sites/
 {
     "detail": "Authentication credentials were not provided."
 }
diff --git a/docs/rest-api/overview.md b/docs/rest-api/overview.md
index bdf76f444..d16cd059d 100644
--- a/docs/rest-api/overview.md
+++ b/docs/rest-api/overview.md
@@ -474,7 +474,7 @@ To modify an object which has already been created, make a `PATCH` request to th
 
 ```no-highlight
 curl -s -X PATCH \
-> -H "Authorization: Token 98dbec0b912e5f3ddec7183c48e73b38fa9ca793" \
+> -H "Authorization: Token $TOKEN" \
 > -H "Content-Type: application/json" \
 > http://netbox/api/ipam/prefixes/18691/ \
 > --data '{"status": "reserved"}' | jq '.'

From 0d68d0c059f9bb162622861e7c0c482c8bc907ab Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 15:55:47 -0400
Subject: [PATCH 427/505] Replace annotate_depth() with annotate_tree()

---
 netbox/ipam/querysets.py | 44 ++++++++++++++--------------------------
 netbox/ipam/views.py     | 13 +++---------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py
index 6d2dc6f33..102954f13 100644
--- a/netbox/ipam/querysets.py
+++ b/netbox/ipam/querysets.py
@@ -3,34 +3,20 @@ from utilities.querysets import RestrictedQuerySet
 
 class PrefixQuerySet(RestrictedQuerySet):
 
-    def annotate_depth(self, limit=None):
+    def annotate_tree(self):
         """
-        Iterate through a QuerySet of Prefixes and annotate the hierarchical level of each. While it would be preferable
-        to do this using .annotate() on the QuerySet to count the unique parents of each prefix, that approach introduces
-        performance issues at scale.
-
-        Because we're adding a non-field attribute to the model, annotation must be made *after* any QuerySet
-        modifications.
+        Annotate the number of parent and child prefixes for each Prefix. Raw SQL is needed for these subqueries
+        because we need to cast NULL VRF values to integers for comparison. (NULL != NULL).
         """
-        queryset = self
-        stack = []
-        for p in queryset:
-            try:
-                prev_p = stack[-1]
-            except IndexError:
-                prev_p = None
-            if prev_p is not None:
-                while (p.prefix not in prev_p.prefix) or p.prefix == prev_p.prefix:
-                    stack.pop()
-                    try:
-                        prev_p = stack[-1]
-                    except IndexError:
-                        prev_p = None
-                        break
-            if prev_p is not None:
-                prev_p.has_children = True
-            stack.append(p)
-            p.depth = len(stack) - 1
-        if limit is None:
-            return queryset
-        return list(filter(lambda p: p.depth <= limit, queryset))
+        return self.extra(
+            select={
+                'parents': 'SELECT COUNT(U0."prefix") AS "c" '
+                           'FROM "ipam_prefix" U0 '
+                           'WHERE (U0."prefix" >> "ipam_prefix"."prefix" '
+                           'AND COALESCE(U0."vrf_id", 0) = COALESCE("ipam_prefix"."vrf_id", 0))',
+                'children': 'SELECT COUNT(U1."prefix") AS "c" '
+                            'FROM "ipam_prefix" U1 '
+                            'WHERE (U1."prefix" << "ipam_prefix"."prefix" '
+                            'AND COALESCE(U1."vrf_id", 0) = COALESCE("ipam_prefix"."vrf_id", 0))',
+            }
+        )
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index ec067e705..52db68127 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -221,9 +221,7 @@ class AggregateView(ObjectView):
             'site', 'role'
         ).order_by(
             'prefix'
-        ).annotate_depth(
-            limit=0
-        )
+        ).annotate_tree()
 
         # Add available prefixes to the table if requested
         if request.GET.get('show_available', 'true') == 'true':
@@ -326,11 +324,6 @@ class PrefixListView(ObjectListView):
     table = tables.PrefixDetailTable
     template_name = 'ipam/prefix_list.html'
 
-    def alter_queryset(self, request):
-        # Show only top-level prefixes by default (unless searching)
-        limit = None if request.GET.get('expand') or request.GET.get('q') else 0
-        return self.queryset.annotate_depth(limit=limit)
-
 
 class PrefixView(ObjectView):
     queryset = Prefix.objects.prefetch_related('vrf', 'site__region', 'tenant__group', 'vlan__group', 'role')
@@ -353,7 +346,7 @@ class PrefixView(ObjectView):
             prefix__net_contains=str(prefix.prefix)
         ).prefetch_related(
             'site', 'role'
-        ).annotate_depth()
+        ).annotate_tree()
         parent_prefix_table = tables.PrefixTable(list(parent_prefixes), orderable=False)
         parent_prefix_table.exclude = ('vrf',)
 
@@ -386,7 +379,7 @@ class PrefixPrefixesView(ObjectView):
         # Child prefixes table
         child_prefixes = prefix.get_child_prefixes().restrict(request.user, 'view').prefetch_related(
             'site', 'vlan', 'role',
-        ).annotate_depth(limit=0)
+        ).annotate_tree()
 
         # Add available prefixes to the table if requested
         if child_prefixes and request.GET.get('show_available', 'true') == 'true':

From e8df9be7020a9b781cc65e86e947fa9f6b9af4dc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 16:16:51 -0400
Subject: [PATCH 428/505] Add LTE and GTE filters for prefix mask length

---
 netbox/ipam/filters.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py
index 0856c9f1c..79fc05334 100644
--- a/netbox/ipam/filters.py
+++ b/netbox/ipam/filters.py
@@ -144,8 +144,16 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         label='Prefixes which contain this prefix or IP',
     )
     mask_length = django_filters.NumberFilter(
-        method='filter_mask_length',
-        label='Mask length',
+        field_name='prefix',
+        lookup_expr='net_mask_length'
+    )
+    mask_length__gte = django_filters.NumberFilter(
+        field_name='prefix',
+        lookup_expr='net_mask_length__gte'
+    )
+    mask_length__lte = django_filters.NumberFilter(
+        field_name='prefix',
+        lookup_expr='net_mask_length__lte'
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VRF.objects.all(),
@@ -262,11 +270,6 @@ class PrefixFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, Cre
         except (AddrFormatError, ValueError):
             return queryset.none()
 
-    def filter_mask_length(self, queryset, name, value):
-        if not value:
-            return queryset
-        return queryset.filter(prefix__net_mask_length=value)
-
 
 class IPAddressFilterSet(BaseFilterSet, TenancyFilterSet, CustomFieldFilterSet, CreatedUpdatedFilterSet):
     q = django_filters.CharFilter(

From d384f25ec222776cdd06c6813fae832f7a705569 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 5 Aug 2020 16:48:45 -0400
Subject: [PATCH 429/505] Replace expand/collpase with max mask length for
 prefixes list

---
 netbox/ipam/forms.py                     |  4 ----
 netbox/ipam/tables.py                    | 12 +++++++-----
 netbox/ipam/views.py                     |  2 +-
 netbox/templates/ipam/prefix_list.html   | 15 +++++++++++++--
 netbox/utilities/templatetags/helpers.py |  8 ++++++++
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index ade7fc994..e14f61872 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -511,10 +511,6 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
             choices=BOOLEAN_WITH_BLANK_CHOICES
         )
     )
-    expand = forms.BooleanField(
-        required=False,
-        label='Expand prefix hierarchy'
-    )
     tag = TagFilterField(model)
 
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index d20ec1819..37fa1a9eb 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -39,10 +39,10 @@ ROLE_VLAN_COUNT = """
 """
 
 PREFIX_LINK = """
-{% if record.has_children %}
-    <span class="text-nowrap" style="padding-left: {{ record.depth }}0px "><i class="fa fa-caret-right"></i></a>
+{% if record.children %}
+    <span class="text-nowrap" style="padding-left: {{ record.parents }}0px "><i class="fa fa-caret-right"></i></a>
 {% else %}
-    <span class="text-nowrap" style="padding-left: {{ record.depth }}9px">
+    <span class="text-nowrap" style="padding-left: {{ record.parents }}9px">
 {% endif %}
     <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if parent.vrf %}&vrf={{ parent.vrf.pk }}{% endif %}{% if parent.site %}&site={{ parent.site.pk }}{% endif %}{% if parent.tenant %}&tenant_group={{ parent.tenant.group.pk }}&tenant={{ parent.tenant.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
 </span>
@@ -336,8 +336,10 @@ class PrefixTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = Prefix
-        fields = ('pk', 'prefix', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'description')
-        default_columns = ('pk', 'prefix', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'description')
+        fields = (
+            'pk', 'prefix', 'children', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'description',
+        )
+        default_columns = ('pk', 'prefix', 'children', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'description')
         row_attrs = {
             'class': lambda record: 'success' if not record.pk else '',
         }
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index 52db68127..8ea33764c 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -318,7 +318,7 @@ class RoleBulkDeleteView(BulkDeleteView):
 #
 
 class PrefixListView(ObjectListView):
-    queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role')
+    queryset = Prefix.objects.prefetch_related('site', 'vrf__tenant', 'tenant', 'vlan', 'role').annotate_tree()
     filterset = filters.PrefixFilterSet
     filterset_form = forms.PrefixFilterForm
     table = tables.PrefixDetailTable
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
index 00f0b7fe9..c4c6ea157 100644
--- a/netbox/templates/ipam/prefix_list.html
+++ b/netbox/templates/ipam/prefix_list.html
@@ -3,7 +3,18 @@
 
 {% block buttons %}
     <div class="btn-group" role="group">
-        <a href="{% url 'ipam:prefix_list' %}{% querystring request expand=None page=1 %}" class="btn btn-default{% if not request.GET.expand %} active{% endif %}">Collapse</a>
-        <a href="{% url 'ipam:prefix_list' %}{% querystring request expand='on' page=1 %}" class="btn btn-default{% if request.GET.expand %} active{% endif %}">Expand</a>
+        <div class="dropdown">
+            <button class="btn btn-default dropdown-toggle" type="button" id="max_length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                Max Length{% if "mask_length__lte" in request.GET %}: {{ request.GET.mask_length__lte }}{% endif %}
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="max_length">
+                {% for i in "4,8,12,16,20,24,28,32,40,48,56,64"|split %}
+                    <li><a href="{% url 'ipam:prefix_list' %}{% querystring request mask_length__lte=i page=1 %}">
+                        {{ i }} {% if request.GET.mask_length__lte == i %}<i class="fa fa-check"></i>{% endif %}
+                    </a></li>
+                {% endfor %}
+            </ul>
+        </div>
     </div>
 {% endblock %}
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index 99dd0c65c..151ca99cb 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -199,6 +199,14 @@ def has_perms(user, permissions_list):
     return user.has_perms(permissions_list)
 
 
+@register.filter()
+def split(string, sep=','):
+    """
+    Split a string by the given value (default: comma)
+    """
+    return string.split(sep)
+
+
 #
 # Tags
 #

From c36d8b2256b0af2263c27193c942d04aa473fd27 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 09:14:20 -0400
Subject: [PATCH 430/505] Fix default display of child count in prefix tables

---
 netbox/ipam/tables.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 37fa1a9eb..5a4e2c133 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -337,9 +337,9 @@ class PrefixTable(BaseTable):
     class Meta(BaseTable.Meta):
         model = Prefix
         fields = (
-            'pk', 'prefix', 'children', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'description',
+            'pk', 'prefix', 'status', 'children', 'vrf', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'description',
         )
-        default_columns = ('pk', 'prefix', 'children', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'description')
+        default_columns = ('pk', 'prefix', 'status', 'vrf', 'tenant', 'site', 'vlan', 'role', 'description')
         row_attrs = {
             'class': lambda record: 'success' if not record.pk else '',
         }
@@ -359,11 +359,11 @@ class PrefixDetailTable(PrefixTable):
 
     class Meta(PrefixTable.Meta):
         fields = (
-            'pk', 'prefix', 'status', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'description',
-            'tags',
+            'pk', 'prefix', 'status', 'children', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'is_pool',
+            'description', 'tags',
         )
         default_columns = (
-            'pk', 'prefix', 'status', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'description',
+            'pk', 'prefix', 'status', 'children', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'description',
         )
 
 

From 0f397fa41086b1fdd008464652d0c516575af29a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 09:20:20 -0400
Subject: [PATCH 431/505] Replicate 'max length' field in PrefixFilterForm for
 consistency

---
 netbox/ipam/forms.py                   |  3 ++
 netbox/templates/inc/search_panel.html | 55 ++++++++++++++------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index e14f61872..15c69c504 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -437,6 +437,9 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         'q', 'within_include', 'family', 'mask_length', 'vrf_id', 'status', 'region', 'site', 'role', 'tenant_group',
         'tenant', 'is_pool', 'expand',
     ]
+    mask_length__lte = forms.IntegerField(
+        widget=forms.HiddenInput()
+    )
     q = forms.CharField(
         required=False,
         label='Search'
diff --git a/netbox/templates/inc/search_panel.html b/netbox/templates/inc/search_panel.html
index b156791ff..5302f71b9 100644
--- a/netbox/templates/inc/search_panel.html
+++ b/netbox/templates/inc/search_panel.html
@@ -7,33 +7,36 @@
     </div>
     <div class="panel-body">
         <form action="." method="get" class="form">
-                {% for field in filter_form %}
-                    <div class="form-group">
-                        {% if field.name == "q" %}
-                            <div class="input-group">
-                                <input type="text" name="q" class="form-control" placeholder="Search" {% if request.GET.q %}value="{{ request.GET.q }}" {% endif %}/>
-                                <span class="input-group-btn">
-                                    <button type="submit" class="btn btn-primary">
-                                        <span class="fa fa-search" aria-hidden="true"></span>
-                                    </button>
-                                </span>
-                            </div>
-                        {% elif field|widget_type == 'checkboxinput' %}
-                            <label for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
-                        {% else %}
-                            {{ field.label_tag }}
-                            {{ field }}
-                        {% endif %}
-                    </div>
-                {% endfor %}
-                <div class="text-right noprint">
-                    <button type="submit" class="btn btn-primary">
-                        <span class="fa fa-search" aria-hidden="true"></span> Apply
-                    </button>
-                    <a href="." class="btn btn-default">
-                        <span class="fa fa-remove" aria-hidden="true"></span> Clear
-                    </a>
+            {% for field in filter_form.hidden_fields %}
+                {{ field }}
+            {% endfor %}
+            {% for field in filter_form.visible_fields %}
+                <div class="form-group">
+                    {% if field.name == "q" %}
+                        <div class="input-group">
+                            <input type="text" name="q" class="form-control" placeholder="Search" {% if request.GET.q %}value="{{ request.GET.q }}" {% endif %}/>
+                            <span class="input-group-btn">
+                                <button type="submit" class="btn btn-primary">
+                                    <span class="fa fa-search" aria-hidden="true"></span>
+                                </button>
+                            </span>
+                        </div>
+                    {% elif field|widget_type == 'checkboxinput' %}
+                        <label for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
+                    {% else %}
+                        {{ field.label_tag }}
+                        {{ field }}
+                    {% endif %}
                 </div>
+            {% endfor %}
+            <div class="text-right noprint">
+                <button type="submit" class="btn btn-primary">
+                    <span class="fa fa-search" aria-hidden="true"></span> Apply
+                </button>
+                <a href="." class="btn btn-default">
+                    <span class="fa fa-remove" aria-hidden="true"></span> Clear
+                </a>
+            </div>
         </form>
     </div>
 </div>

From 63671053021a32c7939d6bca3cfdb70defd6c6d0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 09:44:33 -0400
Subject: [PATCH 432/505] Changelog for #4639

---
 docs/release-notes/version-2.9.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index d564978bd..62bc7ac20 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+* [#4639](https://github.com/netbox-community/netbox/issues/4639) - Improve performance of web UI prefixes list
 * [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
 * [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
 * [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page

From b1ec332a5689317495a9e1188cbdc1d14675080a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 13:19:22 -0400
Subject: [PATCH 433/505] Fixes #4951: Redirect to device inventory view after
 creting a new inventory item

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/templates/dcim/device.html | 2 +-
 netbox/utilities/views.py         | 4 ----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 62bc7ac20..ca4a29436 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -20,6 +20,7 @@
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 * [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
 * [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view
+* [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creting a new inventory item
 * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
 
 ### Other Changes
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index ff3cc71f8..864dddd0c 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -75,7 +75,7 @@
                         <li><a href="{% url 'dcim:devicebay_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}">Device Bays</a></li>
                     {% endif %}
                     {% if perms.dcim.add_inventoryitem %}
-                        <li><a href="{% url 'dcim:inventoryitem_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}">Inventory Items</a></li>
+                        <li><a href="{% url 'dcim:inventoryitem_add' %}?device={{ device.pk }}&return_url={% url 'dcim:device_inventory' pk=device.pk %}">Inventory Items</a></li>
                     {% endif %}
                 </ul>
             </div>
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 5f87ed1bf..b472be524 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -1281,10 +1281,6 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
                     ))
                     if '_addanother' in request.POST:
                         return redirect(request.get_full_path())
-                    elif 'device_type' in form.cleaned_data:
-                        return redirect(form.cleaned_data['device_type'].get_absolute_url())
-                    elif 'device' in form.cleaned_data:
-                        return redirect(form.cleaned_data['device'].get_absolute_url())
                     else:
                         return redirect(self.get_return_url(request))
 

From 4a516103a6ab37f2c88b1f61af1cdd0f37b27760 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 15:53:23 -0400
Subject: [PATCH 434/505] Extend ObjectPermission constraints to OR multiple
 JSON objects

---
 docs/administration/permissions.md    | 16 +++++++++-------
 docs/models/users/objectpermission.md | 22 +++++++++++++++++++---
 netbox/netbox/authentication.py       |  5 ++++-
 netbox/users/admin.py                 | 13 +++++++++----
 netbox/utilities/querysets.py         |  9 ++++++++-
 5 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/docs/administration/permissions.md b/docs/administration/permissions.md
index c2942c8a9..c66c65543 100644
--- a/docs/administration/permissions.md
+++ b/docs/administration/permissions.md
@@ -6,13 +6,15 @@ NetBox v2.9 introduced a new object-based permissions framework, which replace's
 
 ### Example Constraint Definitions
 
-| Query Filter | Permission Constraints |
-| ------------ | --------------------- |
-| `filter(status='active')` | `{"status": "active"}` |
-| `filter(status='active', role='testing')` | `{"status": "active", "role": "testing"}` |
-| `filter(status__in=['planned', 'reserved'])` | `{"status__in": ["planned", "reserved"]}` |
-| `filter(name__startswith('Foo')` | `{"name__startswith": "Foo"}` |
-| `filter(vid__gte=100, vid__lt=200)` | `{"vid__gte": 100, "vid__lt": 200}` |
+| Constraints | Description |
+| ----------- | ----------- |
+| `{"status": "active"}` | Status is active |
+| `{"status__in": ["planned", "reserved"]}` | Status is active **OR** reserved |
+| `{"status": "active", "role": "testing"}` | Status is active **OR** role is testing |
+| `{"name__startswith": "Foo"}` | Name starts with "Foo" (case-sensitive) |
+| `{"name__iendswith": "bar"}` | Name ends with "bar" (case-insensitive) |
+| `{"vid__gte": 100, "vid__lt": 200}` | VLAN ID is greater than or equal to 100 **AND** less than 200 |
+| `[{"vid__lt": 200}, {"status": "reserved"}]` | VLAN ID is less than 200 **OR** status is reserved |
 
 ## Permissions Enforcement
 
diff --git a/docs/models/users/objectpermission.md b/docs/models/users/objectpermission.md
index 4e3ef0e0b..48970dd05 100644
--- a/docs/models/users/objectpermission.md
+++ b/docs/models/users/objectpermission.md
@@ -25,9 +25,9 @@ In addition to these, permissions can also grant custom actions that may be requ
 
 ## Constraints
 
-Constraints are expressed as a JSON object representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
+Constraints are expressed as a JSON object or list representing a [Django query filter](https://docs.djangoproject.com/en/stable/ref/models/querysets/#field-lookups). This is the same syntax that you would pass to the QuerySet `filter()` method when performing a query using the Django ORM. As with query filters, double underscores can be used to traverse related objects or invoke lookup expressions. Some example queries and their corresponding definitions are shown below.
 
-All constraints defined on a permission are applied with a logical AND. For example, suppose you assign a permission for the site model with the following constraints.
+All attributes defined within a single JSON object are applied with a logical AND. For example, suppose you assign a permission for the site model with the following constraints.
 
 ```json
 {
@@ -36,4 +36,20 @@ All constraints defined on a permission are applied with a logical AND. For exam
 }
 ```
 
-The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region. To achieve a logical OR with a different set of constraints, simply create another permission assignment for the same model and user/group. 
+The permission will grant access only to sites which have a status of "active" **and** which are assigned to the "Americas" region.
+
+To achieve a logical OR with a different set of constraints, define multiple objects within a list. For example, if you want to constrain the permission to VLANs with an ID between 100 and 199 _or_ a status of "reserved," do the following:
+
+```json
+[
+  {
+    "vid__gte": 100,
+    "vid__lt": 200
+  },
+  {
+    "status": "reserved"
+  }
+]
+```
+
+Additionally, where multiple permissions have been assigned for an object type, their collective constraints will be merged using a logical "OR" operation.
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 8971bdb52..92127fdae 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -75,7 +75,10 @@ class ObjectPermissionBackend(ModelBackend):
         obj_perm_constraints = self.get_all_permissions(user_obj)[perm]
         constraints = Q()
         for perm_constraints in obj_perm_constraints:
-            if perm_constraints:
+            if type(perm_constraints) is list:
+                for c in obj_perm_constraints:
+                    constraints |= Q(**c)
+            elif perm_constraints:
                 constraints |= Q(**perm_constraints)
             else:
                 # Found ObjectPermission with null constraints; allow model-level access
diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 134e9d026..1fac75899 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -4,6 +4,7 @@ from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group, User
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, ValidationError
+from django.db.models import Q
 
 from extras.admin import order_content_types
 from .models import AdminGroup, AdminUser, ObjectPermission, Token, UserConfig
@@ -136,7 +137,8 @@ class ObjectPermissionForm(forms.ModelForm):
         help_texts = {
             'actions': 'Actions granted in addition to those listed above',
             'constraints': 'JSON expression of a queryset filter that will return only permitted objects. Leave null '
-                           'to match all objects of this type.'
+                           'to match all objects of this type. A list of multiple objects will result in a logical OR '
+                           'operation.'
         }
         labels = {
             'actions': 'Additional actions'
@@ -167,8 +169,8 @@ class ObjectPermissionForm(forms.ModelForm):
                     self.instance.actions.remove(action)
 
     def clean(self):
-        object_types = self.cleaned_data['object_types']
-        constraints = self.cleaned_data['constraints']
+        object_types = self.cleaned_data.get('object_types')
+        constraints = self.cleaned_data.get('constraints')
 
         # Append any of the selected CRUD checkboxes to the actions list
         if not self.cleaned_data.get('actions'):
@@ -184,10 +186,13 @@ class ObjectPermissionForm(forms.ModelForm):
         # Validate the specified model constraints by attempting to execute a query. We don't care whether the query
         # returns anything; we just want to make sure the specified constraints are valid.
         if constraints:
+            # Normalize the constraints to a list of dicts
+            if type(constraints) is not list:
+                constraints = [constraints]
             for ct in object_types:
                 model = ct.model_class()
                 try:
-                    model.objects.filter(**constraints).exists()
+                    model.objects.filter(*[Q(**c) for c in constraints]).exists()
                 except FieldError as e:
                     raise ValidationError({
                         'constraints': f'Invalid filter for {model}: {e}'
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index e748e7a23..40f221b10 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -44,8 +44,15 @@ class RestrictedQuerySet(QuerySet):
         else:
             attrs = Q()
             for perm_attrs in user._object_perm_cache[permission_required]:
-                if perm_attrs:
+                if type(perm_attrs) is list:
+                    for p in perm_attrs:
+                        attrs |= Q(**p)
+                elif perm_attrs:
                     attrs |= Q(**perm_attrs)
+                else:
+                    # Any permission with null constraints grants access to _all_ instances
+                    attrs = Q()
+                    break
             qs = self.filter(attrs)
 
         return qs

From 2b9dad934cad3f821bfa37e9aa591d31af42d49c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 16:11:15 -0400
Subject: [PATCH 435/505] Changelog for #4946

---
 docs/release-notes/version-2.9.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index ca4a29436..2df7ba945 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -8,6 +8,7 @@
 * [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
 * [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
 * [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
+* [#4946](https://github.com/netbox-community/netbox/issues/4946) - Extend ObjectPermission to OR multiple constraints
 
 ### Bug Fixes
 

From 14724f3e1acf44f3eec269bb3948ba8ef045ab90 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 6 Aug 2020 16:22:18 -0400
Subject: [PATCH 436/505] Bump Django to 3.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0ab9ca3de..502d97795 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.1rc1
+Django==3.1
 django-cacheops==5.0.1
 django-cors-headers==3.4.0
 django-debug-toolbar==2.2

From 09015c98c4c42e13f39608e4bab87aeade44d7bf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 7 Aug 2020 08:54:02 -0400
Subject: [PATCH 437/505] Fixes #4903: Fix member count when searching for
 virtual chassis

---
 docs/release-notes/version-2.9.md | 3 ++-
 netbox/dcim/api/views.py          | 2 +-
 netbox/dcim/views.py              | 2 +-
 netbox/netbox/views.py            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 2df7ba945..6097daee3 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -12,6 +12,7 @@
 
 ### Bug Fixes
 
+* [#4903](https://github.com/netbox-community/netbox/issues/4903) - Fix member count when searching for virtual chassis
 * [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
 * [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
 * [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
@@ -21,7 +22,7 @@
 * [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
 * [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
 * [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view
-* [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creting a new inventory item
+* [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creating a new inventory item
 * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
 
 ### Other Changes
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index 86d72c16c..d7bb8b09c 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -608,7 +608,7 @@ class CableViewSet(ModelViewSet):
 
 class VirtualChassisViewSet(ModelViewSet):
     queryset = VirtualChassis.objects.prefetch_related('tags').annotate(
-        member_count=Count('members')
+        member_count=Count('members', distinct=True)
     ).order_by(*VirtualChassis._meta.ordering)
     serializer_class = serializers.VirtualChassisSerializer
     filterset_class = filters.VirtualChassisFilterSet
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index f3e4b204d..c016f6e54 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2180,7 +2180,7 @@ class InterfaceConnectionsListView(ObjectListView):
 
 class VirtualChassisListView(ObjectListView):
     queryset = VirtualChassis.objects.prefetch_related('master').annotate(
-        member_count=Count('members')
+        member_count=Count('members', distinct=True)
     ).order_by(*VirtualChassis._meta.ordering)
     table = tables.VirtualChassisTable
     filterset = filters.VirtualChassisFilterSet
diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py
index a743947fe..647c3e74d 100644
--- a/netbox/netbox/views.py
+++ b/netbox/netbox/views.py
@@ -100,7 +100,7 @@ SEARCH_TYPES = OrderedDict((
     }),
     ('virtualchassis', {
         'queryset': VirtualChassis.objects.prefetch_related('master').annotate(
-            member_count=Count('members')
+            member_count=Count('members', distinct=True)
         ).order_by(*VirtualChassis._meta.ordering),
         'filterset': VirtualChassisFilterSet,
         'table': VirtualChassisTable,

From 1dfed14bc9c344ac46ac2471603108e9ccbd6411 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 7 Aug 2020 12:06:53 -0400
Subject: [PATCH 438/505] Fixes #4968: Fix exception when activating user keys
 in admin UI

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/secrets/admin.py           | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 6097daee3..bddb08336 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -24,6 +24,7 @@
 * [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view
 * [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creating a new inventory item
 * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
+* [#4968](https://github.com/netbox-community/netbox/issues/4968) - Fix exception when activating user keys in admin UI
 
 ### Other Changes
 
diff --git a/netbox/secrets/admin.py b/netbox/secrets/admin.py
index e11128674..ceb6e0426 100644
--- a/netbox/secrets/admin.py
+++ b/netbox/secrets/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin, messages
+from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.shortcuts import redirect, render
 
 from .forms import ActivateUserKeyForm
@@ -50,7 +51,9 @@ class UserKeyAdmin(admin.ModelAdmin):
                         request, "Invalid private key provided. Unable to retrieve master key.", extra_tags='error'
                     )
         else:
-            form = ActivateUserKeyForm(initial={'_selected_action': request.POST.getlist(admin.ACTION_CHECKBOX_NAME)})
+            form = ActivateUserKeyForm(
+                initial={'_selected_action': request.POST.getlist(ACTION_CHECKBOX_NAME)}
+            )
 
         return render(request, 'activate_keys.html', {
             'form': form,

From aca3ca9d653c54166e7c780bf5f68658a599acc2 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 7 Aug 2020 14:09:55 -0400
Subject: [PATCH 439/505] Simplify the aggregation of constraint sets

---
 netbox/netbox/authentication.py | 13 ++++---------
 netbox/users/models.py          |  8 ++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index 92127fdae..6057fc08e 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -1,4 +1,5 @@
 import logging
+from collections import defaultdict
 
 from django.conf import settings
 from django.contrib.auth.backends import ModelBackend, RemoteUserBackend as _RemoteUserBackend
@@ -30,15 +31,12 @@ class ObjectPermissionBackend(ModelBackend):
         ).prefetch_related('object_types')
 
         # Create a dictionary mapping permissions to their constraints
-        perms = dict()
+        perms = defaultdict(list)
         for obj_perm in object_permissions:
             for object_type in obj_perm.object_types.all():
                 for action in obj_perm.actions:
                     perm_name = f"{object_type.app_label}.{action}_{object_type.model}"
-                    if perm_name in perms:
-                        perms[perm_name].append(obj_perm.constraints)
-                    else:
-                        perms[perm_name] = [obj_perm.constraints]
+                    perms[perm_name].extend(obj_perm.list_constraints())
 
         return perms
 
@@ -75,10 +73,7 @@ class ObjectPermissionBackend(ModelBackend):
         obj_perm_constraints = self.get_all_permissions(user_obj)[perm]
         constraints = Q()
         for perm_constraints in obj_perm_constraints:
-            if type(perm_constraints) is list:
-                for c in obj_perm_constraints:
-                    constraints |= Q(**c)
-            elif perm_constraints:
+            if perm_constraints:
                 constraints |= Q(**perm_constraints)
             else:
                 # Found ObjectPermission with null constraints; allow model-level access
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 6edbd9352..b25a75134 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -285,3 +285,11 @@ class ObjectPermission(models.Model):
 
     def __str__(self):
         return self.name
+
+    def list_constraints(self):
+        """
+        Return all constraint sets as a list (even if only a single set is defined).
+        """
+        if type(self.constraints) is not list:
+            return [self.constraints]
+        return self.constraints

From e6bc55af858c061616eb2ff610e374e43bf03639 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 7 Aug 2020 16:19:18 -0400
Subject: [PATCH 440/505] #4969: Remove user and group assignment from
 SecretRole

---
 docs/models/secrets/secretrole.md             |  2 -
 netbox/secrets/api/views.py                   | 10 ++--
 netbox/secrets/forms.py                       |  8 +--
 .../0009_secretrole_drop_users_groups.py      | 20 +++++++
 netbox/secrets/models.py                      | 27 ----------
 netbox/secrets/tables.py                      |  2 +-
 netbox/secrets/templatetags/__init__.py       |  0
 netbox/secrets/templatetags/secret_helpers.py | 12 -----
 netbox/secrets/tests/test_views.py            |  2 -
 netbox/templates/secrets/inc/secret_tr.html   | 25 ++++-----
 netbox/templates/secrets/secret.html          | 52 ++++++++-----------
 netbox/templates/secrets/secret_edit.html     |  3 +-
 .../migrations/0009_replicate_permissions.py  | 47 ++++++++++++-----
 13 files changed, 93 insertions(+), 117 deletions(-)
 create mode 100644 netbox/secrets/migrations/0009_secretrole_drop_users_groups.py
 delete mode 100644 netbox/secrets/templatetags/__init__.py
 delete mode 100644 netbox/secrets/templatetags/secret_helpers.py

diff --git a/docs/models/secrets/secretrole.md b/docs/models/secrets/secretrole.md
index 8997ed52a..23f68912b 100644
--- a/docs/models/secrets/secretrole.md
+++ b/docs/models/secrets/secretrole.md
@@ -7,5 +7,3 @@ Each secret is assigned a functional role which indicates what it is used for. S
 * RADIUS/TACACS+ keys
 * IKE key strings
 * Routing protocol shared secrets
-
-Roles are also used to control access to secrets. Each role is assigned an arbitrary number of groups and/or users. Only the users associated with a role have permission to decrypt the secrets assigned to that role. (A superuser has permission to decrypt all secrets, provided they have an active user key.)
diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py
index 3ad87a8ff..4c88e30ea 100644
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -38,7 +38,7 @@ class SecretRoleViewSet(ModelViewSet):
 
 class SecretViewSet(ModelViewSet):
     queryset = Secret.objects.prefetch_related(
-        'device__primary_ip4', 'device__primary_ip6', 'role', 'role__users', 'role__groups', 'tags',
+        'device__primary_ip4', 'device__primary_ip6', 'role', 'tags',
     )
     serializer_class = serializers.SecretSerializer
     filterset_class = filters.SecretFilterSet
@@ -84,8 +84,8 @@ class SecretViewSet(ModelViewSet):
 
         secret = self.get_object()
 
-        # Attempt to decrypt the secret if the user is permitted and the master key is known
-        if secret.decryptable_by(request.user) and self.master_key is not None:
+        # Attempt to decrypt the secret if the master key is known
+        if self.master_key is not None:
             secret.decrypt(self.master_key)
 
         serializer = self.get_serializer(secret)
@@ -102,9 +102,7 @@ class SecretViewSet(ModelViewSet):
             if self.master_key is not None:
                 secrets = []
                 for secret in page:
-                    # Enforce role permissions
-                    if secret.decryptable_by(request.user):
-                        secret.decrypt(self.master_key)
+                    secret.decrypt(self.master_key)
                     secrets.append(secret)
                 serializer = self.get_serializer(secrets, many=True)
             else:
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index e59819246..54178f46b 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -46,13 +46,7 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
 
     class Meta:
         model = SecretRole
-        fields = [
-            'name', 'slug', 'description', 'users', 'groups',
-        ]
-        widgets = {
-            'users': StaticSelect2Multiple(),
-            'groups': StaticSelect2Multiple(),
-        }
+        fields = ('name', 'slug', 'description')
 
 
 class SecretRoleCSVForm(CSVModelForm):
diff --git a/netbox/secrets/migrations/0009_secretrole_drop_users_groups.py b/netbox/secrets/migrations/0009_secretrole_drop_users_groups.py
new file mode 100644
index 000000000..e4110b505
--- /dev/null
+++ b/netbox/secrets/migrations/0009_secretrole_drop_users_groups.py
@@ -0,0 +1,20 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('secrets', '0008_standardize_description'),
+        ('users', '0009_replicate_permissions'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='secretrole',
+            name='groups',
+        ),
+        migrations.RemoveField(
+            model_name='secretrole',
+            name='users',
+        ),
+    ]
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index e5e53399c..6209b5700 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -239,9 +239,6 @@ class SecretRole(ChangeLoggedModel):
     """
     A SecretRole represents an arbitrary functional classification of Secrets. For example, a user might define roles
     such as "Login Credentials" or "SNMP Communities."
-
-    By default, only superusers will have access to decrypt Secrets. To allow other users to decrypt Secrets, grant them
-    access to the appropriate SecretRoles either individually or by group.
     """
     name = models.CharField(
         max_length=50,
@@ -254,16 +251,6 @@ class SecretRole(ChangeLoggedModel):
         max_length=200,
         blank=True,
     )
-    users = models.ManyToManyField(
-        to=User,
-        related_name='secretroles',
-        blank=True
-    )
-    groups = models.ManyToManyField(
-        to=Group,
-        related_name='secretroles',
-        blank=True
-    )
 
     objects = RestrictedQuerySet.as_manager()
 
@@ -285,14 +272,6 @@ class SecretRole(ChangeLoggedModel):
             self.description,
         )
 
-    def has_member(self, user):
-        """
-        Check whether the given user has belongs to this SecretRole. Note that superusers belong to all roles.
-        """
-        if user.is_superuser:
-            return True
-        return user in self.users.all() or user.groups.filter(pk__in=self.groups.all()).exists()
-
 
 @extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
 class Secret(ChangeLoggedModel, CustomFieldModel):
@@ -453,9 +432,3 @@ class Secret(ChangeLoggedModel, CustomFieldModel):
         if not self.hash:
             raise Exception("Hash has not been generated for this secret.")
         return check_password(plaintext, self.hash, preferred=SecretValidationHasher())
-
-    def decryptable_by(self, user):
-        """
-        Check whether the given user has permission to decrypt this Secret.
-        """
-        return self.role.has_member(user)
diff --git a/netbox/secrets/tables.py b/netbox/secrets/tables.py
index f773a278f..5e8c5a8b4 100644
--- a/netbox/secrets/tables.py
+++ b/netbox/secrets/tables.py
@@ -18,7 +18,7 @@ class SecretRoleTable(BaseTable):
 
     class Meta(BaseTable.Meta):
         model = SecretRole
-        fields = ('pk', 'name', 'secret_count', 'description', 'slug', 'users', 'groups', 'actions')
+        fields = ('pk', 'name', 'secret_count', 'description', 'slug', 'actions')
         default_columns = ('pk', 'name', 'secret_count', 'description', 'actions')
 
 
diff --git a/netbox/secrets/templatetags/__init__.py b/netbox/secrets/templatetags/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/netbox/secrets/templatetags/secret_helpers.py b/netbox/secrets/templatetags/secret_helpers.py
deleted file mode 100644
index 142c0d2cb..000000000
--- a/netbox/secrets/templatetags/secret_helpers.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django import template
-
-
-register = template.Library()
-
-
-@register.filter()
-def decryptable_by(secret, user):
-    """
-    Determine whether a given User is permitted to decrypt a Secret.
-    """
-    return secret.decryptable_by(user)
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index ea8e6ed48..3b7519b7b 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -25,8 +25,6 @@ class SecretRoleTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             'name': 'Secret Role X',
             'slug': 'secret-role-x',
             'description': 'A secret role',
-            'users': [],
-            'groups': [],
         }
 
         cls.csv_data = (
diff --git a/netbox/templates/secrets/inc/secret_tr.html b/netbox/templates/secrets/inc/secret_tr.html
index 3c60928ae..2af609289 100644
--- a/netbox/templates/secrets/inc/secret_tr.html
+++ b/netbox/templates/secrets/inc/secret_tr.html
@@ -1,23 +1,16 @@
-{% load secret_helpers %}
 <tr>
     <td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td>
     <td>{{ secret.name }}</td>
     <td id="secret_{{ secret.pk }}">********</td>
     <td class="text-right noprint">
-        {% if secret|decryptable_by:request.user %}
-            <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
-                <i class="fa fa-lock"></i> Unlock
-            </button>
-            <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
-                <i class="fa fa-copy"></i> Copy
-            </button>
-            <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
-                <i class="fa fa-unlock-alt"></i> Lock
-            </button>
-        {% else %}
-            <button class="btn btn-xs btn-default" disabled="disabled" title="Permission denied">
-                <i class="fa fa-lock"></i> Unlock
-            </button>
-        {% endif %}
+        <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
+            <i class="fa fa-lock"></i> Unlock
+        </button>
+        <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
+            <i class="fa fa-copy"></i> Copy
+        </button>
+        <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
+            <i class="fa fa-unlock-alt"></i> Lock
+        </button>
     </td>
 </tr>
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index 3ddb2fe98..841d9843a 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -2,7 +2,6 @@
 {% load buttons %}
 {% load custom_links %}
 {% load helpers %}
-{% load secret_helpers %}
 {% load static %}
 {% load plugins %}
 
@@ -70,38 +69,31 @@
         {% plugin_left_page secret %}
 	</div>
 	<div class="col-md-6">
-        {% if secret|decryptable_by:request.user %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Secret Data</strong>
-                </div>
-                <div class="panel-body">
-                    <form id="secret_form">
-                        {% csrf_token %}
-                    </form>
-                    <div class="row">
-                        <div class="col-md-2">Secret</div>
-                        <div class="col-md-6" id="secret_{{ secret.pk }}">********</div>
-                        <div class="col-md-4 text-right noprint">
-                            <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
-                                <i class="fa fa-lock"></i> Unlock
-                            </button>
-                            <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
-                                <i class="fa fa-copy"></i> Copy
-                            </button>
-                            <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
-                                <i class="fa fa-unlock-alt"></i> Lock
-                            </button>
-                        </div>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <strong>Secret Data</strong>
+            </div>
+            <div class="panel-body">
+                <form id="secret_form">
+                    {% csrf_token %}
+                </form>
+                <div class="row">
+                    <div class="col-md-2">Secret</div>
+                    <div class="col-md-6" id="secret_{{ secret.pk }}">********</div>
+                    <div class="col-md-4 text-right noprint">
+                        <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
+                            <i class="fa fa-lock"></i> Unlock
+                        </button>
+                        <button class="btn btn-xs btn-default copy-secret collapse" secret-id="{{ secret.pk }}" data-clipboard-target="#secret_{{ secret.pk }}">
+                            <i class="fa fa-copy"></i> Copy
+                        </button>
+                        <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
+                            <i class="fa fa-unlock-alt"></i> Lock
+                        </button>
                     </div>
                 </div>
             </div>
-        {% else %}
-            <div class="alert alert-warning">
-                <i class="fa fa-warning" aria-hidden="true"></i>
-                You do not have permission to decrypt this secret.
-            </div>
-        {% endif %}
+        </div>
         {% include 'extras/inc/tags_panel.html' with tags=secret.tags.all url='secrets:secret_list' %}
         {% plugin_right_page secret %}
     </div>
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html
index 6893e2d14..0cb1eefef 100644
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 {% load static %}
 {% load form_helpers %}
-{% load secret_helpers %}
 
 {% block content %}
 <form action="." method="post" class="form form-horizontal">
@@ -30,7 +29,7 @@
             <div class="panel panel-default">
                 <div class="panel-heading"><strong>Secret Data</strong></div>
                 <div class="panel-body">
-                    {% if obj.pk and obj|decryptable_by:request.user %}
+                    {% if obj.pk %}
                         <div class="form-group">
                             <label class="col-md-3 control-label required">Current Plaintext</label>
                             <div class="col-md-7">
diff --git a/netbox/users/migrations/0009_replicate_permissions.py b/netbox/users/migrations/0009_replicate_permissions.py
index 4583da302..eacb63964 100644
--- a/netbox/users/migrations/0009_replicate_permissions.py
+++ b/netbox/users/migrations/0009_replicate_permissions.py
@@ -1,5 +1,5 @@
 from django.db import migrations
-
+from django.db.models import Q
 
 ACTIONS = ['view', 'add', 'change', 'delete']
 
@@ -10,6 +10,7 @@ def replicate_permissions(apps, schema_editor):
     """
     Permission = apps.get_model('auth', 'Permission')
     ObjectPermission = apps.get_model('users', 'ObjectPermission')
+    SecretRole = apps.get_model('secrets', 'SecretRole')
 
     # TODO: Optimize this iteration so that ObjectPermissions with identical sets of users and groups
     # are combined into a single ObjectPermission instance.
@@ -24,17 +25,39 @@ def replicate_permissions(apps, schema_editor):
             action = perm.codename
 
         if perm.group_set.exists() or perm.user_set.exists():
-            obj_perm = ObjectPermission(
-                # Copy name from original Permission object
-                name=f'{perm.content_type.app_label}.{perm.codename}'[:100],
-                actions=[action]
-            )
-            obj_perm.save()
-            obj_perm.object_types.add(perm.content_type)
-            if perm.group_set.exists():
-                obj_perm.groups.add(*list(perm.group_set.all()))
-            if perm.user_set.exists():
-                obj_perm.users.add(*list(perm.user_set.all()))
+
+            # Handle replication of SecretRole user/group assignments for Secrets
+            if perm.codename == 'view_secret':
+                for secretrole in SecretRole.objects.prefetch_related('users', 'groups'):
+                    obj_perm = ObjectPermission(
+                        name=f'{perm.content_type.app_label}.{perm.codename} ({secretrole.name})'[:100],
+                        actions=[action],
+                        constraints={'role__name': secretrole.name}
+                    )
+                    obj_perm.save()
+                    obj_perm.object_types.add(perm.content_type)
+                    # Assign only users/groups who both a) are assigned to the SecretRole and b) have the view_secret
+                    # permission
+                    obj_perm.groups.add(
+                        *list(secretrole.groups.filter(permissions=perm))
+                    )
+                    obj_perm.users.add(*list(secretrole.users.filter(
+                        Q(user_permissions=perm) | Q(groups__permissions=perm)
+                    )))
+
+            else:
+                obj_perm = ObjectPermission(
+                    # Copy name from original Permission object
+                    name=f'{perm.content_type.app_label}.{perm.codename}'[:100],
+                    actions=[action]
+                )
+                obj_perm.save()
+                obj_perm.object_types.add(perm.content_type)
+
+                if perm.group_set.exists():
+                    obj_perm.groups.add(*list(perm.group_set.all()))
+                if perm.user_set.exists():
+                    obj_perm.users.add(*list(perm.user_set.all()))
 
 
 class Migration(migrations.Migration):

From 365b6f5e17d0c37cfdeb5c177b1d5fa64b82e226 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 10 Aug 2020 11:28:41 -0400
Subject: [PATCH 441/505] Changelog for #4969

---
 docs/release-notes/version-2.9.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index bddb08336..8ac51f050 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -9,6 +9,7 @@
 * [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
 * [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
 * [#4946](https://github.com/netbox-community/netbox/issues/4946) - Extend ObjectPermission to OR multiple constraints
+* [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
 
 ### Bug Fixes
 

From d7e2acd0ade631231f8386968255f0567cae27df Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 10 Aug 2020 13:53:28 -0400
Subject: [PATCH 442/505] Optimize schema migration for VM interface
 replication

---
 .../migrations/0016_replicate_interfaces.py   | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/netbox/virtualization/migrations/0016_replicate_interfaces.py b/netbox/virtualization/migrations/0016_replicate_interfaces.py
index 455a82869..a9c474083 100644
--- a/netbox/virtualization/migrations/0016_replicate_interfaces.py
+++ b/netbox/virtualization/migrations/0016_replicate_interfaces.py
@@ -16,11 +16,14 @@ def replicate_interfaces(apps, schema_editor):
     vminterface_ct = ContentType.objects.get_for_model(VMInterface)
 
     # Replicate dcim.Interface instances assigned to VirtualMachines
-    original_interfaces = Interface.objects.filter(virtual_machine__isnull=False)
+    original_interfaces = Interface.objects.prefetch_related('tagged_vlans').filter(
+        virtual_machine__isnull=False
+    )
+    interfaces_count = len(original_interfaces)
     if show_output:
-        print(f"\n    Replicating {len(original_interfaces)} VM interfaces...", end='', flush=True)
-    for i, interface in enumerate(original_interfaces, start=1):
-        vminterface = VMInterface(
+        print(f"\n    Replicating {interfaces_count} VM interfaces...", flush=True)
+    new_interfaces = [
+        VMInterface(
             virtual_machine=interface.virtual_machine,
             name=interface.name,
             enabled=interface.enabled,
@@ -29,29 +32,45 @@ def replicate_interfaces(apps, schema_editor):
             mode=interface.mode,
             description=interface.description,
             untagged_vlan=interface.untagged_vlan,
-        )
-        vminterface.save()
+        ) for interface in original_interfaces
+    ]
+    VMInterface.objects.bulk_create(new_interfaces, batch_size=1000)
+
+    # Pre-fetch the PKs of interfaces with tags/IP addresses
+    interfaces_with_tags = TaggedItem.objects.filter(
+        content_type=interface_ct
+    ).values_list('object_id', flat=True)
+    interfaces_with_ips = IPAddress.objects.filter(
+        assigned_object_id__isnull=False
+    ).values_list('assigned_object_id', flat=True)
+
+    if show_output:
+        print(f"    Replicating assigned objects...", flush=True)
+    for i, interface in enumerate(original_interfaces):
+        vminterface = new_interfaces[i]
 
         # Copy tagged VLANs
-        vminterface.tagged_vlans.set(interface.tagged_vlans.all())
+        if interface.tagged_vlans.exists():
+            vminterface.tagged_vlans.set(interface.tagged_vlans.all())
 
         # Reassign tags to the new instance
-        TaggedItem.objects.filter(
-            content_type=interface_ct, object_id=interface.pk
-        ).update(
-            content_type=vminterface_ct, object_id=vminterface.pk
-        )
+        if interface.pk in interfaces_with_tags:
+            TaggedItem.objects.filter(content_type=interface_ct, object_id=interface.pk).update(
+                content_type=vminterface_ct,
+                object_id=vminterface.pk
+            )
 
         # Update any assigned IPAddresses
-        IPAddress.objects.filter(assigned_object_id=interface.pk).update(
-            assigned_object_type=vminterface_ct,
-            assigned_object_id=vminterface.pk
-        )
+        if interface.pk in interfaces_with_ips:
+            IPAddress.objects.filter(assigned_object_type=interface_ct, assigned_object_id=interface.pk).update(
+                assigned_object_type=vminterface_ct,
+                assigned_object_id=vminterface.pk
+            )
 
         # Progress counter
-        if show_output and not i % 250:
-            percentage = int(i / len(original_interfaces) * 100)
-            print(f"    {i}/{len(original_interfaces)} ({percentage}%)", flush=True)
+        if show_output and not i % 1000:
+            percentage = int(i / interfaces_count * 100)
+            print(f"      {i}/{interfaces_count} ({percentage}%)", flush=True)
 
     # Verify that all interfaces have been replicated
     replicated_count = VMInterface.objects.count()

From 93da6b6edfb423201a4d5544cfc988eb12371796 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 10 Aug 2020 15:56:55 -0400
Subject: [PATCH 443/505] #2006: Clean up report views

---
 netbox/extras/models/models.py             |  4 +-
 netbox/extras/views.py                     | 69 +++++++++-------------
 netbox/templates/extras/report.html        | 24 +++++---
 netbox/templates/extras/report_list.html   | 19 +++++-
 netbox/templates/extras/report_result.html | 26 +-------
 5 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index 9b5c77fcb..f3810e7c5 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -571,7 +571,6 @@ class Script(models.Model):
     """
     Dummy model used to generate permissions for custom scripts. Does not exist in the database.
     """
-
     class Meta:
         managed = False
 
@@ -585,7 +584,6 @@ class Report(models.Model):
     """
     Dummy model used to generate permissions for reports. Does not exist in the database.
     """
-
     class Meta:
         managed = False
 
@@ -606,7 +604,7 @@ class JobResult(models.Model):
         related_name='job_results',
         verbose_name='Object types',
         limit_choices_to=FeatureQuery('job_results'),
-        help_text="The object type to which this job result applies.",
+        help_text="The object type to which this job result applies",
         on_delete=models.CASCADE,
     )
     created = models.DateTimeField(
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 9f3715953..cd813d280 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -342,18 +342,7 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
         })
 
 
-class GetReportMixin:
-    def _get_report(self, name, module=None):
-        if module is None:
-            module, name = name.split('.', 1)
-        report = get_report(module, name)
-        if report is None:
-            raise Http404
-
-        return report
-
-
-class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
+class ReportView(ContentTypePermissionRequiredMixin, View):
     """
     Display a single Report and its associated JobResult (if any).
     """
@@ -362,7 +351,9 @@ class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
 
     def get(self, request, module, name):
 
-        report = self._get_report(name, module)
+        report = get_report(module, name)
+        if report is None:
+            raise Http404
 
         report_content_type = ContentType.objects.get(app_label='extras', model='report')
         report.result = JobResult.objects.filter(
@@ -382,50 +373,48 @@ class ReportView(GetReportMixin, ContentTypePermissionRequiredMixin, View):
         if not request.user.has_perm('extras.run_report'):
             return HttpResponseForbidden()
 
-        report = self._get_report(name, module)
-        form = ConfirmationForm(request.POST)
+        report = get_report(module, name)
+        if report is None:
+            raise Http404
 
         # Allow execution only if RQ worker process is running
         if not Worker.count(get_connection('default')):
             messages.error(request, "Unable to run report: RQ worker process not running.")
+            return render(request, 'extras/report.html', {
+                'report': report,
+            })
 
-        elif form.is_valid():
+        # Run the Report. A new JobResult is created.
+        report_content_type = ContentType.objects.get(app_label='extras', model='report')
+        job_result = JobResult.enqueue_job(
+            run_report,
+            report.full_name,
+            report_content_type,
+            request.user
+        )
 
-            # Run the Report. A new JobResult is created.
-            report_content_type = ContentType.objects.get(app_label='extras', model='report')
-            job_result = JobResult.enqueue_job(
-                run_report,
-                report.full_name,
-                report_content_type,
-                request.user
-            )
-
-            return redirect('extras:report_result', job_result_pk=job_result.pk)
-
-        return render(request, 'extras/report.html', {
-            'report': report,
-            'run_form': form,
-        })
+        return redirect('extras:report_result', job_result_pk=job_result.pk)
 
 
-class ReportResultView(ContentTypePermissionRequiredMixin, GetReportMixin, View):
-
+class ReportResultView(ContentTypePermissionRequiredMixin, View):
+    """
+    Display a JobResult pertaining to the execution of a Report.
+    """
     def get_required_permission(self):
         return 'extras.view_report'
 
     def get(self, request, job_result_pk):
-        result = get_object_or_404(JobResult.objects.all(), pk=job_result_pk)
         report_content_type = ContentType.objects.get(app_label='extras', model='report')
-        if result.obj_type != report_content_type:
-            raise Http404
+        jobresult = get_object_or_404(JobResult.objects.all(), pk=job_result_pk, obj_type=report_content_type)
 
-        report = self._get_report(result.name)
+        # Retrieve the Report and attach the JobResult to it
+        module, report_name = jobresult.name.split('.')
+        report = get_report(module, report_name)
+        report.result = jobresult
 
         return render(request, 'extras/report_result.html', {
             'report': report,
-            'result': result,
-            'class_name': report.name,
-            'run_form': ConfirmationForm(),
+            'result': jobresult,
         })
 
 
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 58bee4059..355c21c00 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -3,7 +3,7 @@
 
 {% block title %}{{ report.name }}{% endblock %}
 
-{% block content %}
+{% block header %}
     <div class="row noprint">
         <div class="col-md-12">
             <ol class="breadcrumb">
@@ -17,21 +17,29 @@
         <div class="pull-right noprint">
             <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
                 {% csrf_token %}
-                {{ run_form }}
-                <button type="submit" name="_run" class="btn btn-primary"><i class="fa fa-play"></i> Run Report</button>
+                <button type="submit" name="_run" class="btn btn-primary">
+                    {% if report.result %}
+                        <i class="fa fa-refresh"></i> Run Again
+                    {% else %}
+                        <i class="fa fa-play"></i> Run Report
+                    {% endif %}
+                </button>
             </form>
         </div>
     {% endif %}
     <h1>{{ report.name }}</h1>
+    {% if report.description %}
+        <p class="lead">{{ report.description }}</p>
+    {% endif %}
+{% endblock %}
+
+{% block content %}
     <div class="row">
         <div class="col-md-12">
-            {% if report.description %}
-                <p class="lead">{{ report.description }}</p>
-            {% endif %}
             {% if report.result %}
-                <p>Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
+                Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
                     <strong>{{ report.result.created }}</strong>
-                </a></p>
+                </a>
             {% endif %}
         </div>
     </div>
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 7918366d9..528eb6157 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -15,6 +15,7 @@
                                 <th>Status</th>
                                 <th>Description</th>
                                 <th class="text-right">Last Run</th>
+                                <th></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -36,10 +37,26 @@
                                             <span class="text-muted">Never</span>
                                         {% endif %}
                                     </td>
+                                <td>
+                                    {% if perms.extras.run_report %}
+                                        <div class="pull-right noprint">
+                                            <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
+                                                {% csrf_token %}
+                                                <button type="submit" name="_run" class="btn btn-primary btn-xs">
+                                                    {% if report.result %}
+                                                        <i class="fa fa-refresh"></i> Run Again
+                                                    {% else %}
+                                                        <i class="fa fa-play"></i> Run Report
+                                                    {% endif %}
+                                                </button>
+                                            </form>
+                                        </div>
+                                    {% endif %}
+                                </td>
                                 </tr>
                                 {% for method, stats in report.result.data.items %}
                                     <tr>
-                                        <td colspan="3" class="method">
+                                        <td colspan="4" class="method">
                                             {{ method }}
                                         </td>
                                         <td class="text-right text-nowrap report-stats">
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index 784e79aa3..e1c46fe90 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -1,34 +1,12 @@
-{% extends 'base.html' %}
+{% extends 'extras/report.html' %}
 {% load helpers %}
 {% load static %}
 
-{% block title %}{{ report.name }}{% endblock %}
+{% block title %}{{ report.name }} - {{ result.get_status_display }}{% endblock %}
 
 {% block content %}
-    <div class="row noprint">
-        <div class="col-md-12">
-            <ol class="breadcrumb">
-                <li><a href="{% url 'extras:report_list' %}">Reports</a></li>
-                <li><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
-                <li>{{ report.name }}</li>
-            </ol>
-        </div>
-    </div>
-    {% if perms.extras.run_report %}
-        <div class="pull-right noprint">
-            <form action="{% url 'extras:report' module=report.module name=report.name %}" method="post">
-                {% csrf_token %}
-                {{ run_form }}
-                <button type="submit" name="_run" class="btn btn-primary"><i class="fa fa-play"></i> Run Report</button>
-            </form>
-        </div>
-    {% endif %}
-    <h1>{{ report.name }}</h1>
     <div class="row">
         <div class="col-md-12">
-            {% if report.description %}
-                <p class="lead">{{ report.description }}</p>
-            {% endif %}
             <p>
                 Run: <strong>{{ result.created }}</strong>
                 {% if result.completed %}

From c163ec1e8d0469542373275df7bca7fdb7d6ff72 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 10 Aug 2020 16:27:24 -0400
Subject: [PATCH 444/505] Clean up custom script templates

---
 netbox/templates/extras/script_list.html   | 4 +++-
 netbox/templates/extras/script_result.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 98803b6a6..caf9c34fd 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -28,7 +28,9 @@
                                     </td>
                                     <td>{{ script.Meta.description }}</td>
                                     {% if script.result %}
-                                        <td class="text-right">{{ script.result.created }}</td>
+                                        <td class="text-right">
+                                            <a href="{% url 'extras:script_result' job_result_pk=script.result.pk %}">{{ script.result.created }}</a>
+                                        </td>
                                     {% else %}
                                         <td class="text-right text-muted">Never</td>
                                     {% endif %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index d225a4e10..88013e05e 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -4,7 +4,7 @@
 {% load log_levels %}
 {% load static %}
 
-{% block title %}{{ script }}{% endblock %}
+{% block title %}{{ script }} - {{ result.get_status_display }}{% endblock %}
 
 {% block content %}
     <div class="row noprint">

From eadd2d68547f1a9a4419e2083a10adfbd5ca58c1 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 11 Aug 2020 12:56:27 -0400
Subject: [PATCH 445/505] Remove obsolete livesearch Javascript

---
 netbox/project-static/js/livesearch.js        | 62 -------------------
 .../circuits/circuittermination_edit.html     |  1 -
 netbox/templates/dcim/cable_connect.html      |  4 --
 netbox/templates/ipam/ipaddress_edit.html     |  4 --
 4 files changed, 71 deletions(-)
 delete mode 100644 netbox/project-static/js/livesearch.js

diff --git a/netbox/project-static/js/livesearch.js b/netbox/project-static/js/livesearch.js
deleted file mode 100644
index 92902acfd..000000000
--- a/netbox/project-static/js/livesearch.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$(document).ready(function() {
-    var search_field = $('#id_livesearch');
-    var real_field = $('#id_' + search_field.attr('data-field'));
-    var select_fields = $('#select select');
-    var search_key = search_field.attr('data-key');
-    var label = search_field.attr('data-label');
-    if (!label) {
-        label = 'name';
-    }
-
-    // Update livesearch text when real field changes
-    if (real_field.val()) {
-        search_field.val(real_field.children('option:selected').text());
-    }
-    real_field.change(function() {
-        if (real_field.val()) {
-            search_field.val(real_field.children('option:selected').text());
-        } else {
-            search_field.val('');
-        }
-    });
-
-    search_field.autocomplete({
-        source: function(request, response) {
-            $.ajax({
-                type: 'GET',
-                url: search_field.attr('data-source') + '?brief=1',
-                data: search_key + '=' + request.term,
-                success: function(data) {
-                    var choices = [];
-                    $.each(data.results, function (index, choice) {
-                        choices.push({
-                            value: choice.id,
-                            label: choice[label]
-                        });
-                    });
-                    response(choices);
-                }
-            });
-        },
-        select: function(event, ui) {
-            event.preventDefault();
-            search_field.val(ui.item.label);
-            select_fields.val('');
-            real_field.empty();
-            select_fields.attr('disabled', 'disabled');
-            real_field.append($("<option></option>").attr('value', ui.item.value).text(ui.item.label));
-            real_field.change();
-            // Disable parent selection fields
-            // $('select[filter-for="' + real_field.attr('name') + '"]').val('');
-        },
-        minLength: 3,
-        delay: 500
-    });
-
-    search_field.change(function() {
-        if (!search_field.val()) {
-            select_fields.removeAttr('disabled');
-            select_fields.val('');
-        }
-    });
-});
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index ce8af5a23..8a6171e5f 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -87,7 +87,6 @@
 {% endblock %}
 
 {% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
 <script type="text/javascript">
     $("a.set_speed").click(function(e) {
         e.preventDefault();
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html
index 1a7c9411e..644dfd3dc 100644
--- a/netbox/templates/dcim/cable_connect.html
+++ b/netbox/templates/dcim/cable_connect.html
@@ -157,7 +157,3 @@
     {% endwith %}
 </form>
 {% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index 0748bc5ca..852743c77 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -87,7 +87,3 @@
         </div>
     {% endif %}
 {% endblock %}
-
-{% block javascript %}
-<script src="{% static 'js/livesearch.js' %}?v{{ settings.VERSION }}"></script>
-{% endblock %}

From 5b438c3f30425a1c494abfadfc537f47e05c214c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 11 Aug 2020 15:09:23 -0400
Subject: [PATCH 446/505] Refactor utility form resources into separate modules

---
 netbox/utilities/forms.py            | 843 ---------------------------
 netbox/utilities/forms/__init__.py   |   5 +
 netbox/utilities/forms/constants.py  |  14 +
 netbox/utilities/forms/fields.py     | 317 ++++++++++
 netbox/utilities/forms/forms.py      | 175 ++++++
 netbox/utilities/forms/utils.py      | 136 +++++
 netbox/utilities/forms/widgets.py    | 266 +++++++++
 netbox/utilities/tests/test_forms.py |   4 +-
 8 files changed, 915 insertions(+), 845 deletions(-)
 delete mode 100644 netbox/utilities/forms.py
 create mode 100644 netbox/utilities/forms/__init__.py
 create mode 100644 netbox/utilities/forms/constants.py
 create mode 100644 netbox/utilities/forms/fields.py
 create mode 100644 netbox/utilities/forms/forms.py
 create mode 100644 netbox/utilities/forms/utils.py
 create mode 100644 netbox/utilities/forms/widgets.py

diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
deleted file mode 100644
index 0e1768387..000000000
--- a/netbox/utilities/forms.py
+++ /dev/null
@@ -1,843 +0,0 @@
-import csv
-import json
-import re
-from io import StringIO
-
-import django_filters
-import yaml
-from django import forms
-from django.conf import settings
-from django.contrib.postgres.forms import SimpleArrayField
-from django.forms.fields import JSONField as _JSONField, InvalidJSONInput
-from django.core.exceptions import MultipleObjectsReturned
-from django.db.models import Count
-from django.forms import BoundField
-from django.forms.models import fields_for_model
-from django.urls import reverse
-
-from utilities.querysets import RestrictedQuerySet
-from .choices import ColorChoices, unpack_grouped_choices
-from .validators import EnhancedURLValidator
-
-NUMERIC_EXPANSION_PATTERN = r'\[((?:\d+[?:,-])+\d+)\]'
-ALPHANUMERIC_EXPANSION_PATTERN = r'\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]'
-IP4_EXPANSION_PATTERN = r'\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]'
-IP6_EXPANSION_PATTERN = r'\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]'
-BOOLEAN_WITH_BLANK_CHOICES = (
-    ('', '---------'),
-    ('True', 'Yes'),
-    ('False', 'No'),
-)
-
-
-def parse_numeric_range(string, base=10):
-    """
-    Expand a numeric range (continuous or not) into a decimal or
-    hexadecimal list, as specified by the base parameter
-      '0-3,5' => [0, 1, 2, 3, 5]
-      '2,8-b,d,f' => [2, 8, 9, a, b, d, f]
-    """
-    values = list()
-    for dash_range in string.split(','):
-        try:
-            begin, end = dash_range.split('-')
-        except ValueError:
-            begin, end = dash_range, dash_range
-        begin, end = int(begin.strip(), base=base), int(end.strip(), base=base) + 1
-        values.extend(range(begin, end))
-    return list(set(values))
-
-
-def parse_alphanumeric_range(string):
-    """
-    Expand an alphanumeric range (continuous or not) into a list.
-    'a-d,f' => [a, b, c, d, f]
-    '0-3,a-d' => [0, 1, 2, 3, a, b, c, d]
-    """
-    values = []
-    for dash_range in string.split(','):
-        try:
-            begin, end = dash_range.split('-')
-            vals = begin + end
-            # Break out of loop if there's an invalid pattern to return an error
-            if (not (vals.isdigit() or vals.isalpha())) or (vals.isalpha() and not (vals.isupper() or vals.islower())):
-                return []
-        except ValueError:
-            begin, end = dash_range, dash_range
-        if begin.isdigit() and end.isdigit():
-            for n in list(range(int(begin), int(end) + 1)):
-                values.append(n)
-        else:
-            # Value-based
-            if begin == end:
-                values.append(begin)
-            # Range-based
-            else:
-                # Not a valid range (more than a single character)
-                if not len(begin) == len(end) == 1:
-                    raise forms.ValidationError('Range "{}" is invalid.'.format(dash_range))
-                for n in list(range(ord(begin), ord(end) + 1)):
-                    values.append(chr(n))
-    return values
-
-
-def expand_alphanumeric_pattern(string):
-    """
-    Expand an alphabetic pattern into a list of strings.
-    """
-    lead, pattern, remnant = re.split(ALPHANUMERIC_EXPANSION_PATTERN, string, maxsplit=1)
-    parsed_range = parse_alphanumeric_range(pattern)
-    for i in parsed_range:
-        if re.search(ALPHANUMERIC_EXPANSION_PATTERN, remnant):
-            for string in expand_alphanumeric_pattern(remnant):
-                yield "{}{}{}".format(lead, i, string)
-        else:
-            yield "{}{}{}".format(lead, i, remnant)
-
-
-def expand_ipaddress_pattern(string, family):
-    """
-    Expand an IP address pattern into a list of strings. Examples:
-      '192.0.2.[1,2,100-250]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.100/24' ... '192.0.2.250/24']
-      '2001:db8:0:[0,fd-ff]::/64' => ['2001:db8:0:0::/64', '2001:db8:0:fd::/64', ... '2001:db8:0:ff::/64']
-    """
-    if family not in [4, 6]:
-        raise Exception("Invalid IP address family: {}".format(family))
-    if family == 4:
-        regex = IP4_EXPANSION_PATTERN
-        base = 10
-    else:
-        regex = IP6_EXPANSION_PATTERN
-        base = 16
-    lead, pattern, remnant = re.split(regex, string, maxsplit=1)
-    parsed_range = parse_numeric_range(pattern, base)
-    for i in parsed_range:
-        if re.search(regex, remnant):
-            for string in expand_ipaddress_pattern(remnant, family):
-                yield ''.join([lead, format(i, 'x' if family == 6 else 'd'), string])
-        else:
-            yield ''.join([lead, format(i, 'x' if family == 6 else 'd'), remnant])
-
-
-def add_blank_choice(choices):
-    """
-    Add a blank choice to the beginning of a choices list.
-    """
-    return ((None, '---------'),) + tuple(choices)
-
-
-def form_from_model(model, fields):
-    """
-    Return a Form class with the specified fields derived from a model. This is useful when we need a form to be used
-    for creating objects, but want to avoid the model's validation (e.g. for bulk create/edit functions). All fields
-    are marked as not required.
-    """
-    form_fields = fields_for_model(model, fields=fields)
-    for field in form_fields.values():
-        field.required = False
-
-    return type('FormFromModel', (forms.Form,), form_fields)
-
-
-def restrict_form_fields(form, user, action='view'):
-    """
-    Restrict all form fields which reference a RestrictedQuerySet. This ensures that users see only permitted objects
-    as available choices.
-    """
-    for field in form.fields.values():
-        if hasattr(field, 'queryset') and issubclass(field.queryset.__class__, RestrictedQuerySet):
-            field.queryset = field.queryset.restrict(user, action)
-
-
-#
-# Widgets
-#
-
-class SmallTextarea(forms.Textarea):
-    """
-    Subclass used for rendering a smaller textarea element.
-    """
-    pass
-
-
-class SlugWidget(forms.TextInput):
-    """
-    Subclass TextInput and add a slug regeneration button next to the form field.
-    """
-    template_name = 'widgets/sluginput.html'
-
-
-class ColorSelect(forms.Select):
-    """
-    Extends the built-in Select widget to colorize each <option>.
-    """
-    option_template_name = 'widgets/colorselect_option.html'
-
-    def __init__(self, *args, **kwargs):
-        kwargs['choices'] = add_blank_choice(ColorChoices)
-        super().__init__(*args, **kwargs)
-        self.attrs['class'] = 'netbox-select2-color-picker'
-
-
-class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
-    """
-    A Select widget for NullBooleanFields
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Override the built-in choice labels
-        self.choices = (
-            ('1', '---------'),
-            ('2', 'Yes'),
-            ('3', 'No'),
-        )
-        self.attrs['class'] = 'netbox-select2-static'
-
-
-class SelectWithDisabled(forms.Select):
-    """
-    Modified the stock Select widget to accept choices using a dict() for a label. The dict for each option must include
-    'label' (string) and 'disabled' (boolean).
-    """
-    option_template_name = 'widgets/selectwithdisabled_option.html'
-
-
-class StaticSelect2(SelectWithDisabled):
-    """
-    A static content using the Select2 widget
-
-    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
-        name of the filter-for field (child field) and the value is the name of the query param filter.
-    """
-
-    def __init__(self, filter_for=None, *args, **kwargs):
-
-        super().__init__(*args, **kwargs)
-
-        self.attrs['class'] = 'netbox-select2-static'
-        if filter_for:
-            for key, value in filter_for.items():
-                self.add_filter_for(key, value)
-
-    def add_filter_for(self, name, value):
-        """
-        Add details for an additional query param in the form of a data-filter-for-* attribute.
-
-        :param name: The name of the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-filter-for-{}'.format(name)] = value
-
-
-class StaticSelect2Multiple(StaticSelect2, forms.SelectMultiple):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.attrs['data-multiple'] = 1
-
-
-class SelectWithPK(StaticSelect2):
-    """
-    Include the primary key of each option in the option label (e.g. "Router7 (4721)").
-    """
-    option_template_name = 'widgets/select_option_with_pk.html'
-
-
-class ContentTypeSelect(StaticSelect2):
-    """
-    Appends an `api-value` attribute equal to the slugified model name for each ContentType. For example:
-        <option value="37" api-value="console-server-port">console server port</option>
-    This attribute can be used to reference the relevant API endpoint for a particular ContentType.
-    """
-    option_template_name = 'widgets/select_contenttype.html'
-
-
-class NumericArrayField(SimpleArrayField):
-
-    def to_python(self, value):
-        value = ','.join([str(n) for n in parse_numeric_range(value)])
-        return super().to_python(value)
-
-
-class APISelect(SelectWithDisabled):
-    """
-    A select widget populated via an API call
-
-    :param api_url: API endpoint URL. Required if not set automatically by the parent field.
-    :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`.
-    :param value_field: (Optional) Field to use for the option value in selection list. Defaults to `id`.
-    :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
-    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
-        name of the filter-for field (child field) and the value is the name of the query param filter.
-    :param conditional_query_params: (Optional) A dict of URL query params to append to the URL if the
-        condition is met. The condition is the dict key and is specified in the form `<field_name>__<field_value>`.
-        If the provided field value is selected for the given field, the URL query param will be appended to
-        the rendered URL. The value is the in the from `<param_name>=<param_value>`. This is useful in cases where
-        a particular field value dictates an additional API filter.
-    :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
-        name of the query param and the value if the query param's value.
-    :param null_option: If true, include the static null option in the selection list.
-    """
-    def __init__(
-        self,
-        api_url=None,
-        display_field=None,
-        value_field=None,
-        disabled_indicator=None,
-        filter_for=None,
-        conditional_query_params=None,
-        additional_query_params=None,
-        null_option=False,
-        full=False,
-        *args,
-        **kwargs
-    ):
-
-        super().__init__(*args, **kwargs)
-
-        self.attrs['class'] = 'netbox-select2-api'
-        if api_url:
-            self.attrs['data-url'] = '/{}{}'.format(settings.BASE_PATH, api_url.lstrip('/'))  # Inject BASE_PATH
-        if full:
-            self.attrs['data-full'] = full
-        if display_field:
-            self.attrs['display-field'] = display_field
-        if value_field:
-            self.attrs['value-field'] = value_field
-        if disabled_indicator:
-            self.attrs['disabled-indicator'] = disabled_indicator
-        if filter_for:
-            for key, value in filter_for.items():
-                self.add_filter_for(key, value)
-        if conditional_query_params:
-            for key, value in conditional_query_params.items():
-                self.add_conditional_query_param(key, value)
-        if additional_query_params:
-            for key, value in additional_query_params.items():
-                self.add_additional_query_param(key, value)
-        if null_option:
-            self.attrs['data-null-option'] = 1
-
-    def add_filter_for(self, name, value):
-        """
-        Add details for an additional query param in the form of a data-filter-for-* attribute.
-
-        :param name: The name of the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-filter-for-{}'.format(name)] = value
-
-    def add_additional_query_param(self, name, value):
-        """
-        Add details for an additional query param in the form of a data-* JSON-encoded list attribute.
-
-        :param name: The name of the query param
-        :param value: The value of the query param
-        """
-        key = 'data-additional-query-param-{}'.format(name)
-
-        values = json.loads(self.attrs.get(key, '[]'))
-        values.append(value)
-
-        self.attrs[key] = json.dumps(values)
-
-    def add_conditional_query_param(self, condition, value):
-        """
-        Add details for a URL query strings to append to the URL if the condition is met.
-        The condition is specified in the form `<field_name>__<field_value>`.
-
-        :param condition: The condition for the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-conditional-query-param-{}'.format(condition)] = value
-
-
-class APISelectMultiple(APISelect, forms.SelectMultiple):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.attrs['data-multiple'] = 1
-
-
-class DatePicker(forms.TextInput):
-    """
-    Date picker using Flatpickr.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.attrs['class'] = 'date-picker'
-        self.attrs['placeholder'] = 'YYYY-MM-DD'
-
-
-class DateTimePicker(forms.TextInput):
-    """
-    DateTime picker using Flatpickr.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.attrs['class'] = 'datetime-picker'
-        self.attrs['placeholder'] = 'YYYY-MM-DD hh:mm:ss'
-
-
-class TimePicker(forms.TextInput):
-    """
-    Time picker using Flatpickr.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.attrs['class'] = 'time-picker'
-        self.attrs['placeholder'] = 'hh:mm:ss'
-
-
-#
-# Form fields
-#
-
-class CSVDataField(forms.CharField):
-    """
-    A CharField (rendered as a Textarea) which accepts CSV-formatted data. It returns data as a two-tuple: The first
-    item is a dictionary of column headers, mapping field names to the attribute by which they match a related object
-    (where applicable). The second item is a list of dictionaries, each representing a discrete row of CSV data.
-
-    :param from_form: The form from which the field derives its validation rules.
-    """
-    widget = forms.Textarea
-
-    def __init__(self, from_form, *args, **kwargs):
-
-        form = from_form()
-        self.model = form.Meta.model
-        self.fields = form.fields
-        self.required_fields = [
-            name for name, field in form.fields.items() if field.required
-        ]
-
-        super().__init__(*args, **kwargs)
-
-        self.strip = False
-        if not self.label:
-            self.label = ''
-        if not self.initial:
-            self.initial = ','.join(self.required_fields) + '\n'
-        if not self.help_text:
-            self.help_text = 'Enter the list of column headers followed by one line per record to be imported, using ' \
-                             'commas to separate values. Multi-line data and values containing commas may be wrapped ' \
-                             'in double quotes.'
-
-    def to_python(self, value):
-
-        records = []
-        reader = csv.reader(StringIO(value.strip()))
-
-        # Consume the first line of CSV data as column headers. Create a dictionary mapping each header to an optional
-        # "to" field specifying how the related object is being referenced. For example, importing a Device might use a
-        # `site.slug` header, to indicate the related site is being referenced by its slug.
-        headers = {}
-        for header in next(reader):
-            if '.' in header:
-                field, to_field = header.split('.', 1)
-                headers[field] = to_field
-            else:
-                headers[header] = None
-
-        # Parse CSV rows into a list of dictionaries mapped from the column headers.
-        for i, row in enumerate(reader, start=1):
-            if len(row) != len(headers):
-                raise forms.ValidationError(
-                    f"Row {i}: Expected {len(headers)} columns but found {len(row)}"
-                )
-            row = [col.strip() for col in row]
-            record = dict(zip(headers.keys(), row))
-            records.append(record)
-
-        return headers, records
-
-    def validate(self, value):
-        headers, records = value
-
-        # Validate provided column headers
-        for field, to_field in headers.items():
-            if field not in self.fields:
-                raise forms.ValidationError(f'Unexpected column header "{field}" found.')
-            if to_field and not hasattr(self.fields[field], 'to_field_name'):
-                raise forms.ValidationError(f'Column "{field}" is not a related object; cannot use dots')
-            if to_field and not hasattr(self.fields[field].queryset.model, to_field):
-                raise forms.ValidationError(f'Invalid related object attribute for column "{field}": {to_field}')
-
-        # Validate required fields
-        for f in self.required_fields:
-            if f not in headers:
-                raise forms.ValidationError(f'Required column header "{f}" not found.')
-
-        return value
-
-
-class CSVChoiceField(forms.ChoiceField):
-    """
-    Invert the provided set of choices to take the human-friendly label as input, and return the database value.
-    """
-    def __init__(self, choices, *args, **kwargs):
-        super().__init__(choices=choices, *args, **kwargs)
-        self.choices = [(label, label) for value, label in unpack_grouped_choices(choices)]
-        self.choice_values = {label: value for value, label in unpack_grouped_choices(choices)}
-
-    def clean(self, value):
-        value = super().clean(value)
-        if not value:
-            return ''
-        if value not in self.choice_values:
-            raise forms.ValidationError("Invalid choice: {}".format(value))
-        return self.choice_values[value]
-
-
-class CSVModelChoiceField(forms.ModelChoiceField):
-    """
-    Provides additional validation for model choices entered as CSV data.
-    """
-    default_error_messages = {
-        'invalid_choice': 'Object not found.',
-    }
-
-    def to_python(self, value):
-        try:
-            return super().to_python(value)
-        except MultipleObjectsReturned as e:
-            raise forms.ValidationError(
-                f'"{value}" is not a unique value for this field; multiple objects were found'
-            )
-
-
-class ExpandableNameField(forms.CharField):
-    """
-    A field which allows for numeric range expansion
-      Example: 'Gi0/[1-3]' => ['Gi0/1', 'Gi0/2', 'Gi0/3']
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not self.help_text:
-            self.help_text = """
-                Alphanumeric ranges are supported for bulk creation. Mixed cases and types within a single range
-                are not supported. Examples:
-                <ul>
-                    <li><code>[ge,xe]-0/0/[0-9]</code></li>
-                    <li><code>e[0-3][a-d,f]</code></li>
-                </ul>
-                """
-
-    def to_python(self, value):
-        if not value:
-            return ''
-        if re.search(ALPHANUMERIC_EXPANSION_PATTERN, value):
-            return list(expand_alphanumeric_pattern(value))
-        return [value]
-
-
-class ExpandableIPAddressField(forms.CharField):
-    """
-    A field which allows for expansion of IP address ranges
-      Example: '192.0.2.[1-254]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.3/24' ... '192.0.2.254/24']
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not self.help_text:
-            self.help_text = 'Specify a numeric range to create multiple IPs.<br />'\
-                             'Example: <code>192.0.2.[1,5,100-254]/24</code>'
-
-    def to_python(self, value):
-        # Hackish address family detection but it's all we have to work with
-        if '.' in value and re.search(IP4_EXPANSION_PATTERN, value):
-            return list(expand_ipaddress_pattern(value, 4))
-        elif ':' in value and re.search(IP6_EXPANSION_PATTERN, value):
-            return list(expand_ipaddress_pattern(value, 6))
-        return [value]
-
-
-class CommentField(forms.CharField):
-    """
-    A textarea with support for Markdown rendering. Exists mostly just to add a standard help_text.
-    """
-    widget = forms.Textarea
-    default_label = ''
-    # TODO: Port Markdown cheat sheet to internal documentation
-    default_helptext = '<i class="fa fa-info-circle"></i> '\
-                       '<a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">'\
-                       'Markdown</a> syntax is supported'
-
-    def __init__(self, *args, **kwargs):
-        required = kwargs.pop('required', False)
-        label = kwargs.pop('label', self.default_label)
-        help_text = kwargs.pop('help_text', self.default_helptext)
-        super().__init__(required=required, label=label, help_text=help_text, *args, **kwargs)
-
-
-class SlugField(forms.SlugField):
-    """
-    Extend the built-in SlugField to automatically populate from a field called `name` unless otherwise specified.
-    """
-    def __init__(self, slug_source='name', *args, **kwargs):
-        label = kwargs.pop('label', "Slug")
-        help_text = kwargs.pop('help_text', "URL-friendly unique shorthand")
-        widget = kwargs.pop('widget', SlugWidget)
-        super().__init__(label=label, help_text=help_text, widget=widget, *args, **kwargs)
-        self.widget.attrs['slug-source'] = slug_source
-
-
-class TagFilterField(forms.MultipleChoiceField):
-    """
-    A filter field for the tags of a model. Only the tags used by a model are displayed.
-
-    :param model: The model of the filter
-    """
-    widget = StaticSelect2Multiple
-
-    def __init__(self, model, *args, **kwargs):
-        def get_choices():
-            tags = model.tags.annotate(
-                count=Count('extras_taggeditem_items')
-            ).order_by('name')
-            return [
-                (str(tag.slug), '{} ({})'.format(tag.name, tag.count)) for tag in tags
-            ]
-
-        # Choices are fetched each time the form is initialized
-        super().__init__(label='Tags', choices=get_choices, required=False, *args, **kwargs)
-
-
-class DynamicModelChoiceMixin:
-    filter = django_filters.ModelChoiceFilter
-    widget = APISelect
-
-    def get_bound_field(self, form, field_name):
-        bound_field = BoundField(form, self, field_name)
-
-        # Modify the QuerySet of the field before we return it. Limit choices to any data already bound: Options
-        # will be populated on-demand via the APISelect widget.
-        data = bound_field.value()
-        if data:
-            field_name = getattr(self, 'to_field_name') or 'pk'
-            filter = self.filter(field_name=field_name)
-            try:
-                self.queryset = filter.filter(self.queryset, data)
-            except TypeError:
-                # Catch any error caused by invalid initial data passed from the user
-                self.queryset = self.queryset.none()
-        else:
-            self.queryset = self.queryset.none()
-
-        # Set the data URL on the APISelect widget (if not already set)
-        widget = bound_field.field.widget
-        if not widget.attrs.get('data-url'):
-            app_label = self.queryset.model._meta.app_label
-            model_name = self.queryset.model._meta.model_name
-            data_url = reverse('{}-api:{}-list'.format(app_label, model_name))
-            widget.attrs['data-url'] = data_url
-
-        return bound_field
-
-
-class DynamicModelChoiceField(DynamicModelChoiceMixin, forms.ModelChoiceField):
-    """
-    Override get_bound_field() to avoid pre-populating field choices with a SQL query. The field will be
-    rendered only with choices set via bound data. Choices are populated on-demand via the APISelect widget.
-    """
-    pass
-
-
-class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultipleChoiceField):
-    """
-    A multiple-choice version of DynamicModelChoiceField.
-    """
-    filter = django_filters.ModelMultipleChoiceFilter
-    widget = APISelectMultiple
-
-
-class LaxURLField(forms.URLField):
-    """
-    Modifies Django's built-in URLField to remove the requirement for fully-qualified domain names
-    (e.g. http://myserver/ is valid)
-    """
-    default_validators = [EnhancedURLValidator()]
-
-
-class JSONField(_JSONField):
-    """
-    Custom wrapper around Django's built-in JSONField to avoid presenting "null" as the default text.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not self.help_text:
-            self.help_text = 'Enter context data in <a href="https://json.org/">JSON</a> format.'
-            self.widget.attrs['placeholder'] = ''
-
-    def prepare_value(self, value):
-        if isinstance(value, InvalidJSONInput):
-            return value
-        if value is None:
-            return ''
-        return json.dumps(value, sort_keys=True, indent=4)
-
-
-#
-# Forms
-#
-
-class BootstrapMixin(forms.BaseForm):
-    """
-    Add the base Bootstrap CSS classes to form elements.
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        exempt_widgets = [
-            forms.CheckboxInput,
-            forms.ClearableFileInput,
-            forms.FileInput,
-            forms.RadioSelect
-        ]
-
-        for field_name, field in self.fields.items():
-            if field.widget.__class__ not in exempt_widgets:
-                css = field.widget.attrs.get('class', '')
-                field.widget.attrs['class'] = ' '.join([css, 'form-control']).strip()
-            if field.required and not isinstance(field.widget, forms.FileInput):
-                field.widget.attrs['required'] = 'required'
-            if 'placeholder' not in field.widget.attrs:
-                field.widget.attrs['placeholder'] = field.label
-
-
-class ReturnURLForm(forms.Form):
-    """
-    Provides a hidden return URL field to control where the user is directed after the form is submitted.
-    """
-    return_url = forms.CharField(required=False, widget=forms.HiddenInput())
-
-
-class ConfirmationForm(BootstrapMixin, ReturnURLForm):
-    """
-    A generic confirmation form. The form is not valid unless the confirm field is checked.
-    """
-    confirm = forms.BooleanField(required=True, widget=forms.HiddenInput(), initial=True)
-
-
-class BulkEditForm(forms.Form):
-    """
-    Base form for editing multiple objects in bulk
-    """
-    def __init__(self, model, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.model = model
-        self.nullable_fields = []
-
-        # Copy any nullable fields defined in Meta
-        if hasattr(self.Meta, 'nullable_fields'):
-            self.nullable_fields = self.Meta.nullable_fields
-
-
-class BulkRenameForm(forms.Form):
-    """
-    An extendable form to be used for renaming objects in bulk.
-    """
-    find = forms.CharField()
-    replace = forms.CharField()
-    use_regex = forms.BooleanField(
-        required=False,
-        initial=True,
-        label='Use regular expressions'
-    )
-
-    def clean(self):
-
-        # Validate regular expression in "find" field
-        if self.cleaned_data['use_regex']:
-            try:
-                re.compile(self.cleaned_data['find'])
-            except re.error:
-                raise forms.ValidationError({
-                    'find': "Invalid regular expression"
-                })
-
-
-class CSVModelForm(forms.ModelForm):
-    """
-    ModelForm used for the import of objects in CSV format.
-    """
-    def __init__(self, *args, headers=None, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Modify the model form to accommodate any customized to_field_name properties
-        if headers:
-            for field, to_field in headers.items():
-                if to_field is not None:
-                    self.fields[field].to_field_name = to_field
-
-
-class ImportForm(BootstrapMixin, forms.Form):
-    """
-    Generic form for creating an object from JSON/YAML data
-    """
-    data = forms.CharField(
-        widget=forms.Textarea,
-        help_text="Enter object data in JSON or YAML format. Note: Only a single object/document is supported."
-    )
-    format = forms.ChoiceField(
-        choices=(
-            ('json', 'JSON'),
-            ('yaml', 'YAML')
-        ),
-        initial='yaml'
-    )
-
-    def clean(self):
-
-        data = self.cleaned_data['data']
-        format = self.cleaned_data['format']
-
-        # Process JSON/YAML data
-        if format == 'json':
-            try:
-                self.cleaned_data['data'] = json.loads(data)
-                # Check for multiple JSON objects
-                if type(self.cleaned_data['data']) is not dict:
-                    raise forms.ValidationError({
-                        'data': "Import is limited to one object at a time."
-                    })
-            except json.decoder.JSONDecodeError as err:
-                raise forms.ValidationError({
-                    'data': "Invalid JSON data: {}".format(err)
-                })
-        else:
-            # Check for multiple YAML documents
-            if '\n---' in data:
-                raise forms.ValidationError({
-                    'data': "Import is limited to one object at a time."
-                })
-            try:
-                self.cleaned_data['data'] = yaml.load(data, Loader=yaml.SafeLoader)
-            except yaml.error.YAMLError as err:
-                raise forms.ValidationError({
-                    'data': "Invalid YAML data: {}".format(err)
-                })
-
-
-class TableConfigForm(BootstrapMixin, forms.Form):
-    """
-    Form for configuring user's table preferences.
-    """
-    columns = forms.MultipleChoiceField(
-        choices=[],
-        widget=forms.SelectMultiple(
-            attrs={'size': 10}
-        ),
-        help_text="Use the buttons below to arrange columns in the desired order, then select all columns to display."
-    )
-
-    def __init__(self, table, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Initialize columns field based on table attributes
-        self.fields['columns'].choices = table.configurable_columns
-        self.fields['columns'].initial = table.visible_columns
diff --git a/netbox/utilities/forms/__init__.py b/netbox/utilities/forms/__init__.py
new file mode 100644
index 000000000..ce958a99e
--- /dev/null
+++ b/netbox/utilities/forms/__init__.py
@@ -0,0 +1,5 @@
+from .constants import *
+from .fields import *
+from .forms import *
+from .utils import *
+from .widgets import *
diff --git a/netbox/utilities/forms/constants.py b/netbox/utilities/forms/constants.py
new file mode 100644
index 000000000..624ad5dac
--- /dev/null
+++ b/netbox/utilities/forms/constants.py
@@ -0,0 +1,14 @@
+# String expansion patterns
+NUMERIC_EXPANSION_PATTERN = r'\[((?:\d+[?:,-])+\d+)\]'
+ALPHANUMERIC_EXPANSION_PATTERN = r'\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]'
+
+# IP address expansion patterns
+IP4_EXPANSION_PATTERN = r'\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]'
+IP6_EXPANSION_PATTERN = r'\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]'
+
+# Boolean widget choices
+BOOLEAN_WITH_BLANK_CHOICES = (
+    ('', '---------'),
+    ('True', 'Yes'),
+    ('False', 'No'),
+)
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
new file mode 100644
index 000000000..b4948a419
--- /dev/null
+++ b/netbox/utilities/forms/fields.py
@@ -0,0 +1,317 @@
+import csv
+import json
+import re
+from io import StringIO
+
+import django_filters
+from django import forms
+from django.forms.fields import JSONField as _JSONField, InvalidJSONInput
+from django.core.exceptions import MultipleObjectsReturned
+from django.db.models import Count
+from django.forms import BoundField
+from django.urls import reverse
+
+from utilities.choices import unpack_grouped_choices
+from utilities.validators import EnhancedURLValidator
+from . import widgets
+from .constants import *
+from .utils import expand_alphanumeric_pattern, expand_ipaddress_pattern
+
+__all__ = (
+    'CommentField',
+    'CSVChoiceField',
+    'CSVDataField',
+    'CSVModelChoiceField',
+    'DynamicModelChoiceField',
+    'DynamicModelMultipleChoiceField',
+    'ExpandableIPAddressField',
+    'ExpandableNameField',
+    'JSONField',
+    'LaxURLField',
+    'SlugField',
+    'TagFilterField',
+)
+
+
+class CSVDataField(forms.CharField):
+    """
+    A CharField (rendered as a Textarea) which accepts CSV-formatted data. It returns data as a two-tuple: The first
+    item is a dictionary of column headers, mapping field names to the attribute by which they match a related object
+    (where applicable). The second item is a list of dictionaries, each representing a discrete row of CSV data.
+
+    :param from_form: The form from which the field derives its validation rules.
+    """
+    widget = forms.Textarea
+
+    def __init__(self, from_form, *args, **kwargs):
+
+        form = from_form()
+        self.model = form.Meta.model
+        self.fields = form.fields
+        self.required_fields = [
+            name for name, field in form.fields.items() if field.required
+        ]
+
+        super().__init__(*args, **kwargs)
+
+        self.strip = False
+        if not self.label:
+            self.label = ''
+        if not self.initial:
+            self.initial = ','.join(self.required_fields) + '\n'
+        if not self.help_text:
+            self.help_text = 'Enter the list of column headers followed by one line per record to be imported, using ' \
+                             'commas to separate values. Multi-line data and values containing commas may be wrapped ' \
+                             'in double quotes.'
+
+    def to_python(self, value):
+
+        records = []
+        reader = csv.reader(StringIO(value.strip()))
+
+        # Consume the first line of CSV data as column headers. Create a dictionary mapping each header to an optional
+        # "to" field specifying how the related object is being referenced. For example, importing a Device might use a
+        # `site.slug` header, to indicate the related site is being referenced by its slug.
+        headers = {}
+        for header in next(reader):
+            if '.' in header:
+                field, to_field = header.split('.', 1)
+                headers[field] = to_field
+            else:
+                headers[header] = None
+
+        # Parse CSV rows into a list of dictionaries mapped from the column headers.
+        for i, row in enumerate(reader, start=1):
+            if len(row) != len(headers):
+                raise forms.ValidationError(
+                    f"Row {i}: Expected {len(headers)} columns but found {len(row)}"
+                )
+            row = [col.strip() for col in row]
+            record = dict(zip(headers.keys(), row))
+            records.append(record)
+
+        return headers, records
+
+    def validate(self, value):
+        headers, records = value
+
+        # Validate provided column headers
+        for field, to_field in headers.items():
+            if field not in self.fields:
+                raise forms.ValidationError(f'Unexpected column header "{field}" found.')
+            if to_field and not hasattr(self.fields[field], 'to_field_name'):
+                raise forms.ValidationError(f'Column "{field}" is not a related object; cannot use dots')
+            if to_field and not hasattr(self.fields[field].queryset.model, to_field):
+                raise forms.ValidationError(f'Invalid related object attribute for column "{field}": {to_field}')
+
+        # Validate required fields
+        for f in self.required_fields:
+            if f not in headers:
+                raise forms.ValidationError(f'Required column header "{f}" not found.')
+
+        return value
+
+
+class CSVChoiceField(forms.ChoiceField):
+    """
+    Invert the provided set of choices to take the human-friendly label as input, and return the database value.
+    """
+    def __init__(self, choices, *args, **kwargs):
+        super().__init__(choices=choices, *args, **kwargs)
+        self.choices = [(label, label) for value, label in unpack_grouped_choices(choices)]
+        self.choice_values = {label: value for value, label in unpack_grouped_choices(choices)}
+
+    def clean(self, value):
+        value = super().clean(value)
+        if not value:
+            return ''
+        if value not in self.choice_values:
+            raise forms.ValidationError("Invalid choice: {}".format(value))
+        return self.choice_values[value]
+
+
+class CSVModelChoiceField(forms.ModelChoiceField):
+    """
+    Provides additional validation for model choices entered as CSV data.
+    """
+    default_error_messages = {
+        'invalid_choice': 'Object not found.',
+    }
+
+    def to_python(self, value):
+        try:
+            return super().to_python(value)
+        except MultipleObjectsReturned as e:
+            raise forms.ValidationError(
+                f'"{value}" is not a unique value for this field; multiple objects were found'
+            )
+
+
+class ExpandableNameField(forms.CharField):
+    """
+    A field which allows for numeric range expansion
+      Example: 'Gi0/[1-3]' => ['Gi0/1', 'Gi0/2', 'Gi0/3']
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.help_text:
+            self.help_text = """
+                Alphanumeric ranges are supported for bulk creation. Mixed cases and types within a single range
+                are not supported. Examples:
+                <ul>
+                    <li><code>[ge,xe]-0/0/[0-9]</code></li>
+                    <li><code>e[0-3][a-d,f]</code></li>
+                </ul>
+                """
+
+    def to_python(self, value):
+        if not value:
+            return ''
+        if re.search(ALPHANUMERIC_EXPANSION_PATTERN, value):
+            return list(expand_alphanumeric_pattern(value))
+        return [value]
+
+
+class ExpandableIPAddressField(forms.CharField):
+    """
+    A field which allows for expansion of IP address ranges
+      Example: '192.0.2.[1-254]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.3/24' ... '192.0.2.254/24']
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.help_text:
+            self.help_text = 'Specify a numeric range to create multiple IPs.<br />'\
+                             'Example: <code>192.0.2.[1,5,100-254]/24</code>'
+
+    def to_python(self, value):
+        # Hackish address family detection but it's all we have to work with
+        if '.' in value and re.search(IP4_EXPANSION_PATTERN, value):
+            return list(expand_ipaddress_pattern(value, 4))
+        elif ':' in value and re.search(IP6_EXPANSION_PATTERN, value):
+            return list(expand_ipaddress_pattern(value, 6))
+        return [value]
+
+
+class CommentField(forms.CharField):
+    """
+    A textarea with support for Markdown rendering. Exists mostly just to add a standard help_text.
+    """
+    widget = forms.Textarea
+    default_label = ''
+    # TODO: Port Markdown cheat sheet to internal documentation
+    default_helptext = '<i class="fa fa-info-circle"></i> '\
+                       '<a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet" target="_blank">'\
+                       'Markdown</a> syntax is supported'
+
+    def __init__(self, *args, **kwargs):
+        required = kwargs.pop('required', False)
+        label = kwargs.pop('label', self.default_label)
+        help_text = kwargs.pop('help_text', self.default_helptext)
+        super().__init__(required=required, label=label, help_text=help_text, *args, **kwargs)
+
+
+class SlugField(forms.SlugField):
+    """
+    Extend the built-in SlugField to automatically populate from a field called `name` unless otherwise specified.
+    """
+    def __init__(self, slug_source='name', *args, **kwargs):
+        label = kwargs.pop('label', "Slug")
+        help_text = kwargs.pop('help_text', "URL-friendly unique shorthand")
+        widget = kwargs.pop('widget', widgets.SlugWidget)
+        super().__init__(label=label, help_text=help_text, widget=widget, *args, **kwargs)
+        self.widget.attrs['slug-source'] = slug_source
+
+
+class TagFilterField(forms.MultipleChoiceField):
+    """
+    A filter field for the tags of a model. Only the tags used by a model are displayed.
+
+    :param model: The model of the filter
+    """
+    widget = widgets.StaticSelect2Multiple
+
+    def __init__(self, model, *args, **kwargs):
+        def get_choices():
+            tags = model.tags.annotate(
+                count=Count('extras_taggeditem_items')
+            ).order_by('name')
+            return [
+                (str(tag.slug), '{} ({})'.format(tag.name, tag.count)) for tag in tags
+            ]
+
+        # Choices are fetched each time the form is initialized
+        super().__init__(label='Tags', choices=get_choices, required=False, *args, **kwargs)
+
+
+class DynamicModelChoiceMixin:
+    filter = django_filters.ModelChoiceFilter
+    widget = widgets.APISelect
+
+    def get_bound_field(self, form, field_name):
+        bound_field = BoundField(form, self, field_name)
+
+        # Modify the QuerySet of the field before we return it. Limit choices to any data already bound: Options
+        # will be populated on-demand via the APISelect widget.
+        data = bound_field.value()
+        if data:
+            field_name = getattr(self, 'to_field_name') or 'pk'
+            filter = self.filter(field_name=field_name)
+            try:
+                self.queryset = filter.filter(self.queryset, data)
+            except TypeError:
+                # Catch any error caused by invalid initial data passed from the user
+                self.queryset = self.queryset.none()
+        else:
+            self.queryset = self.queryset.none()
+
+        # Set the data URL on the APISelect widget (if not already set)
+        widget = bound_field.field.widget
+        if not widget.attrs.get('data-url'):
+            app_label = self.queryset.model._meta.app_label
+            model_name = self.queryset.model._meta.model_name
+            data_url = reverse('{}-api:{}-list'.format(app_label, model_name))
+            widget.attrs['data-url'] = data_url
+
+        return bound_field
+
+
+class DynamicModelChoiceField(DynamicModelChoiceMixin, forms.ModelChoiceField):
+    """
+    Override get_bound_field() to avoid pre-populating field choices with a SQL query. The field will be
+    rendered only with choices set via bound data. Choices are populated on-demand via the APISelect widget.
+    """
+    pass
+
+
+class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultipleChoiceField):
+    """
+    A multiple-choice version of DynamicModelChoiceField.
+    """
+    filter = django_filters.ModelMultipleChoiceFilter
+    widget = widgets.APISelectMultiple
+
+
+class LaxURLField(forms.URLField):
+    """
+    Modifies Django's built-in URLField to remove the requirement for fully-qualified domain names
+    (e.g. http://myserver/ is valid)
+    """
+    default_validators = [EnhancedURLValidator()]
+
+
+class JSONField(_JSONField):
+    """
+    Custom wrapper around Django's built-in JSONField to avoid presenting "null" as the default text.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not self.help_text:
+            self.help_text = 'Enter context data in <a href="https://json.org/">JSON</a> format.'
+            self.widget.attrs['placeholder'] = ''
+
+    def prepare_value(self, value):
+        if isinstance(value, InvalidJSONInput):
+            return value
+        if value is None:
+            return ''
+        return json.dumps(value, sort_keys=True, indent=4)
diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py
new file mode 100644
index 000000000..bc68f29f6
--- /dev/null
+++ b/netbox/utilities/forms/forms.py
@@ -0,0 +1,175 @@
+import json
+import re
+
+import yaml
+from django import forms
+
+
+__all__ = (
+    'BootstrapMixin',
+    'BulkEditForm',
+    'BulkRenameForm',
+    'ConfirmationForm',
+    'CSVModelForm',
+    'ImportForm',
+    'ReturnURLForm',
+    'TableConfigForm',
+)
+
+
+class BootstrapMixin(forms.BaseForm):
+    """
+    Add the base Bootstrap CSS classes to form elements.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        exempt_widgets = [
+            forms.CheckboxInput,
+            forms.ClearableFileInput,
+            forms.FileInput,
+            forms.RadioSelect
+        ]
+
+        for field_name, field in self.fields.items():
+            if field.widget.__class__ not in exempt_widgets:
+                css = field.widget.attrs.get('class', '')
+                field.widget.attrs['class'] = ' '.join([css, 'form-control']).strip()
+            if field.required and not isinstance(field.widget, forms.FileInput):
+                field.widget.attrs['required'] = 'required'
+            if 'placeholder' not in field.widget.attrs:
+                field.widget.attrs['placeholder'] = field.label
+
+
+class ReturnURLForm(forms.Form):
+    """
+    Provides a hidden return URL field to control where the user is directed after the form is submitted.
+    """
+    return_url = forms.CharField(required=False, widget=forms.HiddenInput())
+
+
+class ConfirmationForm(BootstrapMixin, ReturnURLForm):
+    """
+    A generic confirmation form. The form is not valid unless the confirm field is checked.
+    """
+    confirm = forms.BooleanField(required=True, widget=forms.HiddenInput(), initial=True)
+
+
+class BulkEditForm(forms.Form):
+    """
+    Base form for editing multiple objects in bulk
+    """
+    def __init__(self, model, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.model = model
+        self.nullable_fields = []
+
+        # Copy any nullable fields defined in Meta
+        if hasattr(self.Meta, 'nullable_fields'):
+            self.nullable_fields = self.Meta.nullable_fields
+
+
+class BulkRenameForm(forms.Form):
+    """
+    An extendable form to be used for renaming objects in bulk.
+    """
+    find = forms.CharField()
+    replace = forms.CharField()
+    use_regex = forms.BooleanField(
+        required=False,
+        initial=True,
+        label='Use regular expressions'
+    )
+
+    def clean(self):
+
+        # Validate regular expression in "find" field
+        if self.cleaned_data['use_regex']:
+            try:
+                re.compile(self.cleaned_data['find'])
+            except re.error:
+                raise forms.ValidationError({
+                    'find': "Invalid regular expression"
+                })
+
+
+class CSVModelForm(forms.ModelForm):
+    """
+    ModelForm used for the import of objects in CSV format.
+    """
+    def __init__(self, *args, headers=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Modify the model form to accommodate any customized to_field_name properties
+        if headers:
+            for field, to_field in headers.items():
+                if to_field is not None:
+                    self.fields[field].to_field_name = to_field
+
+
+class ImportForm(BootstrapMixin, forms.Form):
+    """
+    Generic form for creating an object from JSON/YAML data
+    """
+    data = forms.CharField(
+        widget=forms.Textarea,
+        help_text="Enter object data in JSON or YAML format. Note: Only a single object/document is supported."
+    )
+    format = forms.ChoiceField(
+        choices=(
+            ('json', 'JSON'),
+            ('yaml', 'YAML')
+        ),
+        initial='yaml'
+    )
+
+    def clean(self):
+
+        data = self.cleaned_data['data']
+        format = self.cleaned_data['format']
+
+        # Process JSON/YAML data
+        if format == 'json':
+            try:
+                self.cleaned_data['data'] = json.loads(data)
+                # Check for multiple JSON objects
+                if type(self.cleaned_data['data']) is not dict:
+                    raise forms.ValidationError({
+                        'data': "Import is limited to one object at a time."
+                    })
+            except json.decoder.JSONDecodeError as err:
+                raise forms.ValidationError({
+                    'data': "Invalid JSON data: {}".format(err)
+                })
+        else:
+            # Check for multiple YAML documents
+            if '\n---' in data:
+                raise forms.ValidationError({
+                    'data': "Import is limited to one object at a time."
+                })
+            try:
+                self.cleaned_data['data'] = yaml.load(data, Loader=yaml.SafeLoader)
+            except yaml.error.YAMLError as err:
+                raise forms.ValidationError({
+                    'data': "Invalid YAML data: {}".format(err)
+                })
+
+
+class TableConfigForm(BootstrapMixin, forms.Form):
+    """
+    Form for configuring user's table preferences.
+    """
+    columns = forms.MultipleChoiceField(
+        choices=[],
+        widget=forms.SelectMultiple(
+            attrs={'size': 10}
+        ),
+        help_text="Use the buttons below to arrange columns in the desired order, then select all columns to display."
+    )
+
+    def __init__(self, table, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Initialize columns field based on table attributes
+        self.fields['columns'].choices = table.configurable_columns
+        self.fields['columns'].initial = table.visible_columns
diff --git a/netbox/utilities/forms/utils.py b/netbox/utilities/forms/utils.py
new file mode 100644
index 000000000..dc001be1a
--- /dev/null
+++ b/netbox/utilities/forms/utils.py
@@ -0,0 +1,136 @@
+import re
+
+from django import forms
+from django.forms.models import fields_for_model
+
+from utilities.querysets import RestrictedQuerySet
+from .constants import *
+
+__all__ = (
+    'add_blank_choice',
+    'expand_alphanumeric_pattern',
+    'expand_ipaddress_pattern',
+    'form_from_model',
+    'parse_alphanumeric_range',
+    'parse_numeric_range',
+    'restrict_form_fields',
+)
+
+
+def parse_numeric_range(string, base=10):
+    """
+    Expand a numeric range (continuous or not) into a decimal or
+    hexadecimal list, as specified by the base parameter
+      '0-3,5' => [0, 1, 2, 3, 5]
+      '2,8-b,d,f' => [2, 8, 9, a, b, d, f]
+    """
+    values = list()
+    for dash_range in string.split(','):
+        try:
+            begin, end = dash_range.split('-')
+        except ValueError:
+            begin, end = dash_range, dash_range
+        begin, end = int(begin.strip(), base=base), int(end.strip(), base=base) + 1
+        values.extend(range(begin, end))
+    return list(set(values))
+
+
+def parse_alphanumeric_range(string):
+    """
+    Expand an alphanumeric range (continuous or not) into a list.
+    'a-d,f' => [a, b, c, d, f]
+    '0-3,a-d' => [0, 1, 2, 3, a, b, c, d]
+    """
+    values = []
+    for dash_range in string.split(','):
+        try:
+            begin, end = dash_range.split('-')
+            vals = begin + end
+            # Break out of loop if there's an invalid pattern to return an error
+            if (not (vals.isdigit() or vals.isalpha())) or (vals.isalpha() and not (vals.isupper() or vals.islower())):
+                return []
+        except ValueError:
+            begin, end = dash_range, dash_range
+        if begin.isdigit() and end.isdigit():
+            for n in list(range(int(begin), int(end) + 1)):
+                values.append(n)
+        else:
+            # Value-based
+            if begin == end:
+                values.append(begin)
+            # Range-based
+            else:
+                # Not a valid range (more than a single character)
+                if not len(begin) == len(end) == 1:
+                    raise forms.ValidationError('Range "{}" is invalid.'.format(dash_range))
+                for n in list(range(ord(begin), ord(end) + 1)):
+                    values.append(chr(n))
+    return values
+
+
+def expand_alphanumeric_pattern(string):
+    """
+    Expand an alphabetic pattern into a list of strings.
+    """
+    lead, pattern, remnant = re.split(ALPHANUMERIC_EXPANSION_PATTERN, string, maxsplit=1)
+    parsed_range = parse_alphanumeric_range(pattern)
+    for i in parsed_range:
+        if re.search(ALPHANUMERIC_EXPANSION_PATTERN, remnant):
+            for string in expand_alphanumeric_pattern(remnant):
+                yield "{}{}{}".format(lead, i, string)
+        else:
+            yield "{}{}{}".format(lead, i, remnant)
+
+
+def expand_ipaddress_pattern(string, family):
+    """
+    Expand an IP address pattern into a list of strings. Examples:
+      '192.0.2.[1,2,100-250]/24' => ['192.0.2.1/24', '192.0.2.2/24', '192.0.2.100/24' ... '192.0.2.250/24']
+      '2001:db8:0:[0,fd-ff]::/64' => ['2001:db8:0:0::/64', '2001:db8:0:fd::/64', ... '2001:db8:0:ff::/64']
+    """
+    if family not in [4, 6]:
+        raise Exception("Invalid IP address family: {}".format(family))
+    if family == 4:
+        regex = IP4_EXPANSION_PATTERN
+        base = 10
+    else:
+        regex = IP6_EXPANSION_PATTERN
+        base = 16
+    lead, pattern, remnant = re.split(regex, string, maxsplit=1)
+    parsed_range = parse_numeric_range(pattern, base)
+    for i in parsed_range:
+        if re.search(regex, remnant):
+            for string in expand_ipaddress_pattern(remnant, family):
+                yield ''.join([lead, format(i, 'x' if family == 6 else 'd'), string])
+        else:
+            yield ''.join([lead, format(i, 'x' if family == 6 else 'd'), remnant])
+
+
+def add_blank_choice(choices):
+    """
+    Add a blank choice to the beginning of a choices list.
+    """
+    return ((None, '---------'),) + tuple(choices)
+
+
+def form_from_model(model, fields):
+    """
+    Return a Form class with the specified fields derived from a model. This is useful when we need a form to be used
+    for creating objects, but want to avoid the model's validation (e.g. for bulk create/edit functions). All fields
+    are marked as not required.
+    """
+    form_fields = fields_for_model(model, fields=fields)
+    for field in form_fields.values():
+        field.required = False
+
+    return type('FormFromModel', (forms.Form,), form_fields)
+
+
+def restrict_form_fields(form, user, action='view'):
+    """
+    Restrict all form fields which reference a RestrictedQuerySet. This ensures that users see only permitted objects
+    as available choices.
+    """
+    for field in form.fields.values():
+        if hasattr(field, 'queryset') and issubclass(field.queryset.__class__, RestrictedQuerySet):
+            field.queryset = field.queryset.restrict(user, action)
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
new file mode 100644
index 000000000..1c9d654f3
--- /dev/null
+++ b/netbox/utilities/forms/widgets.py
@@ -0,0 +1,266 @@
+import json
+
+from django import forms
+from django.conf import settings
+from django.contrib.postgres.forms import SimpleArrayField
+
+from utilities.choices import ColorChoices
+from .utils import add_blank_choice, parse_numeric_range
+
+__all__ = (
+    'APISelect',
+    'APISelectMultiple',
+    'BulkEditNullBooleanSelect',
+    'ColorSelect',
+    'ContentTypeSelect',
+    'DatePicker',
+    'DateTimePicker',
+    'NumericArrayField',
+    'SelectWithDisabled',
+    'SelectWithPK',
+    'SlugWidget',
+    'SmallTextarea',
+    'StaticSelect2',
+    'StaticSelect2Multiple',
+    'TimePicker',
+)
+
+
+class SmallTextarea(forms.Textarea):
+    """
+    Subclass used for rendering a smaller textarea element.
+    """
+    pass
+
+
+class SlugWidget(forms.TextInput):
+    """
+    Subclass TextInput and add a slug regeneration button next to the form field.
+    """
+    template_name = 'widgets/sluginput.html'
+
+
+class ColorSelect(forms.Select):
+    """
+    Extends the built-in Select widget to colorize each <option>.
+    """
+    option_template_name = 'widgets/colorselect_option.html'
+
+    def __init__(self, *args, **kwargs):
+        kwargs['choices'] = add_blank_choice(ColorChoices)
+        super().__init__(*args, **kwargs)
+        self.attrs['class'] = 'netbox-select2-color-picker'
+
+
+class BulkEditNullBooleanSelect(forms.NullBooleanSelect):
+    """
+    A Select widget for NullBooleanFields
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Override the built-in choice labels
+        self.choices = (
+            ('1', '---------'),
+            ('2', 'Yes'),
+            ('3', 'No'),
+        )
+        self.attrs['class'] = 'netbox-select2-static'
+
+
+class SelectWithDisabled(forms.Select):
+    """
+    Modified the stock Select widget to accept choices using a dict() for a label. The dict for each option must include
+    'label' (string) and 'disabled' (boolean).
+    """
+    option_template_name = 'widgets/selectwithdisabled_option.html'
+
+
+class StaticSelect2(SelectWithDisabled):
+    """
+    A static content using the Select2 widget
+
+    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
+        name of the filter-for field (child field) and the value is the name of the query param filter.
+    """
+
+    def __init__(self, filter_for=None, *args, **kwargs):
+
+        super().__init__(*args, **kwargs)
+
+        self.attrs['class'] = 'netbox-select2-static'
+        if filter_for:
+            for key, value in filter_for.items():
+                self.add_filter_for(key, value)
+
+    def add_filter_for(self, name, value):
+        """
+        Add details for an additional query param in the form of a data-filter-for-* attribute.
+
+        :param name: The name of the query param
+        :param value: The value of the query param
+        """
+        self.attrs['data-filter-for-{}'.format(name)] = value
+
+
+class StaticSelect2Multiple(StaticSelect2, forms.SelectMultiple):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.attrs['data-multiple'] = 1
+
+
+class SelectWithPK(StaticSelect2):
+    """
+    Include the primary key of each option in the option label (e.g. "Router7 (4721)").
+    """
+    option_template_name = 'widgets/select_option_with_pk.html'
+
+
+class ContentTypeSelect(StaticSelect2):
+    """
+    Appends an `api-value` attribute equal to the slugified model name for each ContentType. For example:
+        <option value="37" api-value="console-server-port">console server port</option>
+    This attribute can be used to reference the relevant API endpoint for a particular ContentType.
+    """
+    option_template_name = 'widgets/select_contenttype.html'
+
+
+class NumericArrayField(SimpleArrayField):
+
+    def to_python(self, value):
+        value = ','.join([str(n) for n in parse_numeric_range(value)])
+        return super().to_python(value)
+
+
+class APISelect(SelectWithDisabled):
+    """
+    A select widget populated via an API call
+
+    :param api_url: API endpoint URL. Required if not set automatically by the parent field.
+    :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`.
+    :param value_field: (Optional) Field to use for the option value in selection list. Defaults to `id`.
+    :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
+    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
+        name of the filter-for field (child field) and the value is the name of the query param filter.
+    :param conditional_query_params: (Optional) A dict of URL query params to append to the URL if the
+        condition is met. The condition is the dict key and is specified in the form `<field_name>__<field_value>`.
+        If the provided field value is selected for the given field, the URL query param will be appended to
+        the rendered URL. The value is the in the from `<param_name>=<param_value>`. This is useful in cases where
+        a particular field value dictates an additional API filter.
+    :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
+        name of the query param and the value if the query param's value.
+    :param null_option: If true, include the static null option in the selection list.
+    """
+    def __init__(
+        self,
+        api_url=None,
+        display_field=None,
+        value_field=None,
+        disabled_indicator=None,
+        filter_for=None,
+        conditional_query_params=None,
+        additional_query_params=None,
+        null_option=False,
+        full=False,
+        *args,
+        **kwargs
+    ):
+
+        super().__init__(*args, **kwargs)
+
+        self.attrs['class'] = 'netbox-select2-api'
+        if api_url:
+            self.attrs['data-url'] = '/{}{}'.format(settings.BASE_PATH, api_url.lstrip('/'))  # Inject BASE_PATH
+        if full:
+            self.attrs['data-full'] = full
+        if display_field:
+            self.attrs['display-field'] = display_field
+        if value_field:
+            self.attrs['value-field'] = value_field
+        if disabled_indicator:
+            self.attrs['disabled-indicator'] = disabled_indicator
+        if filter_for:
+            for key, value in filter_for.items():
+                self.add_filter_for(key, value)
+        if conditional_query_params:
+            for key, value in conditional_query_params.items():
+                self.add_conditional_query_param(key, value)
+        if additional_query_params:
+            for key, value in additional_query_params.items():
+                self.add_additional_query_param(key, value)
+        if null_option:
+            self.attrs['data-null-option'] = 1
+
+    def add_filter_for(self, name, value):
+        """
+        Add details for an additional query param in the form of a data-filter-for-* attribute.
+
+        :param name: The name of the query param
+        :param value: The value of the query param
+        """
+        self.attrs['data-filter-for-{}'.format(name)] = value
+
+    def add_additional_query_param(self, name, value):
+        """
+        Add details for an additional query param in the form of a data-* JSON-encoded list attribute.
+
+        :param name: The name of the query param
+        :param value: The value of the query param
+        """
+        key = 'data-additional-query-param-{}'.format(name)
+
+        values = json.loads(self.attrs.get(key, '[]'))
+        values.append(value)
+
+        self.attrs[key] = json.dumps(values)
+
+    def add_conditional_query_param(self, condition, value):
+        """
+        Add details for a URL query strings to append to the URL if the condition is met.
+        The condition is specified in the form `<field_name>__<field_value>`.
+
+        :param condition: The condition for the query param
+        :param value: The value of the query param
+        """
+        self.attrs['data-conditional-query-param-{}'.format(condition)] = value
+
+
+class APISelectMultiple(APISelect, forms.SelectMultiple):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.attrs['data-multiple'] = 1
+
+
+class DatePicker(forms.TextInput):
+    """
+    Date picker using Flatpickr.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.attrs['class'] = 'date-picker'
+        self.attrs['placeholder'] = 'YYYY-MM-DD'
+
+
+class DateTimePicker(forms.TextInput):
+    """
+    DateTime picker using Flatpickr.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.attrs['class'] = 'datetime-picker'
+        self.attrs['placeholder'] = 'YYYY-MM-DD hh:mm:ss'
+
+
+class TimePicker(forms.TextInput):
+    """
+    Time picker using Flatpickr.
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.attrs['class'] = 'time-picker'
+        self.attrs['placeholder'] = 'hh:mm:ss'
diff --git a/netbox/utilities/tests/test_forms.py b/netbox/utilities/tests/test_forms.py
index d6af27b93..dcd15872b 100644
--- a/netbox/utilities/tests/test_forms.py
+++ b/netbox/utilities/tests/test_forms.py
@@ -2,8 +2,8 @@ from django import forms
 from django.test import TestCase
 
 from ipam.forms import IPAddressCSVForm
-from ipam.models import VRF
-from utilities.forms import *
+from utilities.forms.fields import CSVDataField
+from utilities.forms.utils import expand_alphanumeric_pattern, expand_ipaddress_pattern
 
 
 class ExpandIPAddress(TestCase):

From 2c64d45c697455760b9b9c136e7a8b1791ecc140 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 11 Aug 2020 16:23:36 -0400
Subject: [PATCH 447/505] Drop support for conditional_query_params on
 APISelect

---
 netbox/project-static/js/forms.js | 14 --------------
 netbox/utilities/forms/widgets.py | 19 -------------------
 2 files changed, 33 deletions(-)

diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index 26c8338c2..9fed76f90 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -178,20 +178,6 @@ $(document).ready(function() {
                     }
                 });
 
-                // Conditional query params
-                $.each(element.attributes, function(index, attr){
-                    if (attr.name.includes("data-conditional-query-param-")){
-                        var conditional = attr.name.split("data-conditional-query-param-")[1].split("__");
-                        var field = $("#id_" + conditional[0]);
-                        var field_value = conditional[1];
-
-                        if ($('option:selected', field).attr('api-value') === field_value){
-                            var _val = attr.value.split("=");
-                            parameters[_val[0]] = _val[1];
-                        }
-                    }
-                });
-
                 // Additional query params
                 $.each(element.attributes, function(index, attr){
                     if (attr.name.includes("data-additional-query-param-")){
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 1c9d654f3..80ff12ac3 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -145,11 +145,6 @@ class APISelect(SelectWithDisabled):
     :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
     :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
         name of the filter-for field (child field) and the value is the name of the query param filter.
-    :param conditional_query_params: (Optional) A dict of URL query params to append to the URL if the
-        condition is met. The condition is the dict key and is specified in the form `<field_name>__<field_value>`.
-        If the provided field value is selected for the given field, the URL query param will be appended to
-        the rendered URL. The value is the in the from `<param_name>=<param_value>`. This is useful in cases where
-        a particular field value dictates an additional API filter.
     :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
         name of the query param and the value if the query param's value.
     :param null_option: If true, include the static null option in the selection list.
@@ -161,7 +156,6 @@ class APISelect(SelectWithDisabled):
         value_field=None,
         disabled_indicator=None,
         filter_for=None,
-        conditional_query_params=None,
         additional_query_params=None,
         null_option=False,
         full=False,
@@ -185,9 +179,6 @@ class APISelect(SelectWithDisabled):
         if filter_for:
             for key, value in filter_for.items():
                 self.add_filter_for(key, value)
-        if conditional_query_params:
-            for key, value in conditional_query_params.items():
-                self.add_conditional_query_param(key, value)
         if additional_query_params:
             for key, value in additional_query_params.items():
                 self.add_additional_query_param(key, value)
@@ -217,16 +208,6 @@ class APISelect(SelectWithDisabled):
 
         self.attrs[key] = json.dumps(values)
 
-    def add_conditional_query_param(self, condition, value):
-        """
-        Add details for a URL query strings to append to the URL if the condition is met.
-        The condition is specified in the form `<field_name>__<field_value>`.
-
-        :param condition: The condition for the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-conditional-query-param-{}'.format(condition)] = value
-
 
 class APISelectMultiple(APISelect, forms.SelectMultiple):
 

From fdc43f8279c720ce6118402dea66ae9e7b8b9740 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 11 Aug 2020 17:00:28 -0400
Subject: [PATCH 448/505] Add display_field kwarg to DynamicModelChoiceMixin

---
 netbox/dcim/forms.py             | 46 ++++++++++++--------------------
 netbox/extras/forms.py           |  2 +-
 netbox/ipam/forms.py             | 12 +++------
 netbox/utilities/forms/fields.py | 11 ++++++++
 netbox/virtualization/forms.py   | 14 +++++-----
 5 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index febeeaa12..49fa1173d 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -716,9 +716,7 @@ class RackElevationFilterForm(RackFilterForm):
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
-        widget=APISelectMultiple(
-            display_field='display_name',
-        )
+        display_field='display_name'
     )
 
     def __init__(self, *args, **kwargs):
@@ -1048,9 +1046,7 @@ class ComponentTemplateCreateForm(ComponentForm):
     )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
-        widget=APISelect(
-            display_field='model'
-        )
+        display_field='model'
     )
     description = forms.CharField(
         required=False
@@ -1739,9 +1735,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
-        widget=APISelect(
-            display_field='display_name'
-        )
+        display_field='display_name'
     )
     position = forms.TypedChoiceField(
         required=False,
@@ -1764,9 +1758,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
-        widget=APISelect(
-            display_field='model'
-        )
+        display_field='model'
     )
     device_role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all()
@@ -2078,9 +2070,7 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
         required=False,
-        widget=APISelect(
-            display_field="model",
-        )
+        display_field='model'
     )
     device_role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all(),
@@ -2184,9 +2174,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         queryset=DeviceType.objects.all(),
         required=False,
         label='Model',
-        widget=APISelectMultiple(
-            display_field="model",
-        )
+        display_field='model'
     )
     platform = DynamicModelMultipleChoiceField(
         queryset=Platform.objects.all(),
@@ -2715,8 +2703,8 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         label='Untagged VLAN',
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -2727,8 +2715,8 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         label='Tagged VLANs',
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -2816,8 +2804,8 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -2827,8 +2815,8 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -2885,8 +2873,8 @@ class InterfaceBulkEditForm(
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -2896,8 +2884,8 @@ class InterfaceBulkEditForm(
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -3514,8 +3502,8 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
         queryset=Device.objects.all(),
         label='Device',
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             filter_for={
                 'termination_b_id': 'device_id',
             }
@@ -3632,8 +3620,8 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
     termination_b_circuit = DynamicModelChoiceField(
         queryset=Circuit.objects.all(),
         label='Circuit',
+        display_field='cid',
         widget=APISelect(
-            display_field='cid',
             filter_for={
                 'termination_b_id': 'circuit_id',
             }
@@ -3662,8 +3650,8 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
         queryset=Site.objects.all(),
         label='Site',
         required=False,
+        display_field='cid',
         widget=APISelect(
-            display_field='cid',
             filter_for={
                 'termination_b_rackgroup': 'site_id',
                 'termination_b_powerpanel': 'site_id',
@@ -3674,8 +3662,8 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
         queryset=RackGroup.objects.all(),
         label='Rack Group',
         required=False,
+        display_field='cid',
         widget=APISelect(
-            display_field='cid',
             filter_for={
                 'termination_b_powerpanel': 'rackgroup_id',
             }
@@ -4199,8 +4187,8 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form):
         queryset=Device.objects.filter(
             virtual_chassis__isnull=True
         ),
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             disabled_indicator='virtual_chassis'
         )
     )
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index a565375c5..30279e012 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -413,9 +413,9 @@ class ObjectChangeFilterForm(BootstrapMixin, forms.Form):
     user = DynamicModelMultipleChoiceField(
         queryset=User.objects.all(),
         required=False,
+        display_field='username',
         widget=APISelectMultiple(
             api_url='/api/users/users/',
-            display_field='username'
         )
     )
     changed_object_type = forms.ModelChoiceField(
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 15c69c504..aad3eaade 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -287,9 +287,7 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         label='VLAN',
-        widget=APISelect(
-            display_field='display_name'
-        )
+        display_field='display_name'
     )
     role = DynamicModelChoiceField(
         queryset=Role.objects.all(),
@@ -569,8 +567,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             filter_for={
                 'nat_device': 'rack_id'
             },
@@ -583,8 +581,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         queryset=Device.objects.all(),
         required=False,
         label='Device',
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             filter_for={
                 'nat_inside': 'device_id'
             }
@@ -604,9 +602,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         queryset=IPAddress.objects.all(),
         required=False,
         label='IP Address',
-        widget=APISelect(
-            display_field='address'
-        )
+        display_field='address'
     )
     primary_for_parent = forms.BooleanField(
         required=False,
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index b4948a419..fbcc285a9 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -11,6 +11,7 @@ from django.db.models import Count
 from django.forms import BoundField
 from django.urls import reverse
 
+from utilities.api import get_serializer_for_model
 from utilities.choices import unpack_grouped_choices
 from utilities.validators import EnhancedURLValidator
 from . import widgets
@@ -247,6 +248,16 @@ class DynamicModelChoiceMixin:
     filter = django_filters.ModelChoiceFilter
     widget = widgets.APISelect
 
+    def __init__(self, *args, display_field='name', **kwargs):
+        self.display_field = display_field
+
+        super().__init__(*args, **kwargs)
+
+    def widget_attrs(self, widget):
+        return {
+            'display-field': self.display_field
+        }
+
     def get_bound_field(self, form, field_name):
         bound_field = BoundField(form, self, field_name)
 
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index d32b08ffa..b1a2de6aa 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -240,8 +240,8 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
     )
     devices = DynamicModelMultipleChoiceField(
         queryset=Device.objects.filter(cluster__isnull=True),
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             disabled_indicator='cluster'
         )
     )
@@ -575,8 +575,8 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -586,8 +586,8 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -679,8 +679,8 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -690,8 +690,8 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -773,8 +773,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     untagged_vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelect(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',
@@ -784,8 +784,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
+        display_field='display_name',
         widget=APISelectMultiple(
-            display_field='display_name',
             full=True,
             additional_query_params={
                 'site_id': 'null',

From a831e525da52922f26ab311d8ac10c67a8a56b55 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 11 Aug 2020 17:19:40 -0400
Subject: [PATCH 449/505] Remove value_field from APISelect; reference
 to_field_name on field

---
 netbox/circuits/forms.py          | 22 +++----------
 netbox/dcim/forms.py              | 54 ++++---------------------------
 netbox/extras/forms.py            | 40 +++++------------------
 netbox/ipam/forms.py              | 13 +-------
 netbox/secrets/forms.py           |  5 +--
 netbox/tenancy/forms.py           |  3 --
 netbox/utilities/forms/fields.py  | 11 +++++--
 netbox/utilities/forms/widgets.py |  4 ---
 netbox/virtualization/forms.py    | 14 +-------
 9 files changed, 30 insertions(+), 136 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 341a7a9b7..70a220b58 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -108,7 +108,6 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -117,10 +116,7 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     asn = forms.IntegerField(
         required=False,
@@ -271,18 +267,12 @@ class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
     type = DynamicModelMultipleChoiceField(
         queryset=CircuitType.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     provider = DynamicModelMultipleChoiceField(
         queryset=Provider.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     status = forms.MultipleChoiceField(
         choices=CircuitStatusChoices,
@@ -294,7 +284,6 @@ class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -303,10 +292,7 @@ class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     commit_rate = forms.IntegerField(
         required=False,
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 49fa1173d..7700545df 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -70,7 +70,6 @@ class DeviceComponentFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field='slug',
             filter_for={
                 'site': 'region'
             }
@@ -81,7 +80,6 @@ class DeviceComponentFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'device_id': 'site',
             }
@@ -348,10 +346,7 @@ class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     tag = TagFilterField(model)
 
@@ -409,7 +404,6 @@ class RackGroupFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region',
                 'parent': 'region',
@@ -421,7 +415,6 @@ class RackGroupFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'parent': 'site',
             }
@@ -430,11 +423,7 @@ class RackGroupFilterForm(BootstrapMixin, forms.Form):
     parent = DynamicModelMultipleChoiceField(
         queryset=RackGroup.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            api_url="/api/dcim/rack-groups/",
-            value_field="slug",
-        )
+        required=False
     )
 
 
@@ -662,7 +651,6 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -673,7 +661,6 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'group_id': 'site'
             }
@@ -699,7 +686,6 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -861,10 +847,7 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     group_id = DynamicModelMultipleChoiceField(
         queryset=RackGroup.objects.prefetch_related('site'),
@@ -972,10 +955,7 @@ class DeviceTypeFilterForm(BootstrapMixin, CustomFieldFilterForm):
     manufacturer = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     subdevice_role = forms.MultipleChoiceField(
         choices=add_blank_choice(SubdeviceRoleChoices),
@@ -2116,7 +2096,6 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -2127,7 +2106,6 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'rack_group_id': 'site',
                 'rack_id': 'site',
@@ -2157,7 +2135,6 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
         )
     )
     manufacturer_id = DynamicModelMultipleChoiceField(
@@ -2181,7 +2158,6 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -3446,10 +3422,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm):
     manufacturer = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelect(
-            value_field="slug",
-        )
+        required=False
     )
     serial = forms.CharField(
         required=False
@@ -3900,7 +3873,6 @@ class CableFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'rack_id': 'site',
                 'device_id': 'site',
@@ -3912,7 +3884,6 @@ class CableFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field='slug',
             filter_for={
                 'device_id': 'tenant',
             }
@@ -3962,7 +3933,6 @@ class ConsoleConnectionFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'device_id': 'site',
             }
@@ -3981,7 +3951,6 @@ class PowerConnectionFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'device_id': 'site',
             }
@@ -4000,7 +3969,6 @@ class InterfaceConnectionFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'device_id': 'site',
             }
@@ -4240,7 +4208,6 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -4249,17 +4216,13 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     tenant_group = DynamicModelMultipleChoiceField(
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
             filter_for={
                 'tenant': 'group'
@@ -4271,7 +4234,6 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -4369,7 +4331,6 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -4380,7 +4341,6 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'rack_group_id': 'site',
             }
@@ -4589,7 +4549,6 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -4600,7 +4559,6 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'power_panel_id': 'site',
                 'rack_id': 'site',
diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index 30279e012..cecbfae72 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -290,42 +290,27 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     platform = DynamicModelMultipleChoiceField(
         queryset=Platform.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     cluster_group = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     cluster_id = DynamicModelMultipleChoiceField(
         queryset=Cluster.objects.all(),
@@ -335,26 +320,17 @@ class ConfigContextFilterForm(BootstrapMixin, forms.Form):
     tenant_group = DynamicModelMultipleChoiceField(
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     tenant = DynamicModelMultipleChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     tag = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
 
 
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index aad3eaade..393903d37 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -217,10 +217,7 @@ class AggregateFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=RIR.objects.all(),
         to_field_name='slug',
         required=False,
-        label='RIR',
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        label='RIR'
     )
     tag = TagFilterField(model)
 
@@ -481,7 +478,6 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -492,7 +488,6 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -501,7 +496,6 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -978,7 +972,6 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region',
             }
@@ -989,7 +982,6 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -1145,7 +1137,6 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region',
                 'group_id': 'region'
@@ -1157,7 +1148,6 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -1179,7 +1169,6 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index 54178f46b..d0ef5ba3a 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -178,10 +178,7 @@ class SecretFilterForm(BootstrapMixin, CustomFieldFilterForm):
     role = DynamicModelMultipleChoiceField(
         queryset=SecretRole.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field="slug",
-        )
+        required=False
     )
     tag = TagFilterField(model)
 
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 04a3980a1..436f37d3f 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -107,7 +107,6 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -154,7 +153,6 @@ class TenancyFilterForm(forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
             filter_for={
                 'tenant': 'group'
@@ -166,7 +164,6 @@ class TenancyFilterForm(forms.Form):
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index fbcc285a9..cfd025a4e 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -251,12 +251,19 @@ class DynamicModelChoiceMixin:
     def __init__(self, *args, display_field='name', **kwargs):
         self.display_field = display_field
 
+        # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference
+        # by widget_attrs()
+        self.to_field_name = kwargs.get('to_field_name')
+
         super().__init__(*args, **kwargs)
 
     def widget_attrs(self, widget):
-        return {
-            'display-field': self.display_field
+        attrs = {
+            'display-field': self.display_field,
         }
+        if self.to_field_name:
+            attrs['value-field'] = self.to_field_name
+        return attrs
 
     def get_bound_field(self, form, field_name):
         bound_field = BoundField(form, self, field_name)
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 80ff12ac3..0e03931f2 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -141,7 +141,6 @@ class APISelect(SelectWithDisabled):
 
     :param api_url: API endpoint URL. Required if not set automatically by the parent field.
     :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`.
-    :param value_field: (Optional) Field to use for the option value in selection list. Defaults to `id`.
     :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
     :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
         name of the filter-for field (child field) and the value is the name of the query param filter.
@@ -153,7 +152,6 @@ class APISelect(SelectWithDisabled):
         self,
         api_url=None,
         display_field=None,
-        value_field=None,
         disabled_indicator=None,
         filter_for=None,
         additional_query_params=None,
@@ -172,8 +170,6 @@ class APISelect(SelectWithDisabled):
             self.attrs['data-full'] = full
         if display_field:
             self.attrs['display-field'] = display_field
-        if value_field:
-            self.attrs['value-field'] = value_field
         if disabled_indicator:
             self.attrs['disabled-indicator'] = disabled_indicator
         if filter_for:
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index b1a2de6aa..b53c2b151 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -166,17 +166,13 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
     type = DynamicModelMultipleChoiceField(
         queryset=ClusterType.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            value_field='slug',
-        )
+        required=False
     )
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -187,7 +183,6 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field='slug',
             null_option=True,
         )
     )
@@ -196,7 +191,6 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field='slug',
             null_option=True,
         )
     )
@@ -496,7 +490,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -505,7 +498,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -519,7 +511,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             filter_for={
                 'site': 'region'
             }
@@ -530,7 +521,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )
@@ -539,7 +529,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
             additional_query_params={
                 'vm_role': "True"
@@ -556,7 +545,6 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         to_field_name='slug',
         required=False,
         widget=APISelectMultiple(
-            value_field="slug",
             null_option=True,
         )
     )

From f3fb85933f40fa65f3fafdb5d64310482e5d76ab Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 09:28:24 -0400
Subject: [PATCH 450/505] Add query_params attribute to DynamicModelChoiceMixin

---
 netbox/dcim/forms.py             | 68 ++++++++++---------------
 netbox/utilities/forms/fields.py | 10 +++-
 netbox/virtualization/forms.py   | 86 +++++++++++++-------------------
 3 files changed, 70 insertions(+), 94 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 7700545df..cf79458a6 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1746,11 +1746,9 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     platform = DynamicModelChoiceField(
         queryset=Platform.objects.all(),
         required=False,
-        widget=APISelect(
-            additional_query_params={
-                "manufacturer_id": "null"
-            }
-        )
+        query_params={
+            "manufacturer_id": "null"
+        }
     )
     cluster_group = DynamicModelChoiceField(
         queryset=ClusterGroup.objects.all(),
@@ -2680,24 +2678,20 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         required=False,
         label='Untagged VLAN',
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         label='Tagged VLANs',
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -2781,23 +2775,19 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
     field_order = (
         'device', 'name_pattern', 'label_pattern', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'description',
@@ -2850,23 +2840,19 @@ class InterfaceBulkEditForm(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
 
     class Meta:
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index cfd025a4e..065086c4e 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -248,8 +248,9 @@ class DynamicModelChoiceMixin:
     filter = django_filters.ModelChoiceFilter
     widget = widgets.APISelect
 
-    def __init__(self, *args, display_field='name', **kwargs):
+    def __init__(self, *args, display_field='name', query_params=None, **kwargs):
         self.display_field = display_field
+        self.query_params = query_params or {}
 
         # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference
         # by widget_attrs()
@@ -261,8 +262,15 @@ class DynamicModelChoiceMixin:
         attrs = {
             'display-field': self.display_field,
         }
+
+        # Set value-field attribute if the field specifies to_field_name
         if self.to_field_name:
             attrs['value-field'] = self.to_field_name
+
+        # Attach any static query parameters
+        for key, value in self.query_params.items():
+            widget.add_additional_query_param(key, value)
+
         return attrs
 
     def get_bound_field(self, form, field_name):
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index b53c2b151..f33d4645a 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -297,11 +297,9 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all(),
         required=False,
-        widget=APISelect(
-            additional_query_params={
-                "vm_role": "True"
-            }
-        )
+        query_params={
+            "vm_role": "True"
+        }
     )
     platform = DynamicModelChoiceField(
         queryset=Platform.objects.all(),
@@ -438,11 +436,9 @@ class VirtualMachineBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldB
             vm_role=True
         ),
         required=False,
-        widget=APISelect(
-            additional_query_params={
-                "vm_role": "True"
-            }
-        )
+        query_params={
+            "vm_role": "True"
+        }
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
@@ -528,12 +524,10 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         queryset=DeviceRole.objects.filter(vm_role=True),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-            additional_query_params={
-                'vm_role': "True"
-            }
-        )
+        query_params={
+            'vm_role': "True"
+        },
+        widget=APISelectMultiple(null_option=True)
     )
     status = forms.MultipleChoiceField(
         choices=VirtualMachineStatusChoices,
@@ -564,23 +558,19 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -668,23 +658,19 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -762,23 +748,19 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelect(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelect(full=True)
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
-        widget=APISelectMultiple(
-            full=True,
-            additional_query_params={
-                'site_id': 'null',
-            },
-        )
+        query_params={
+            'site_id': 'null',
+        },
+        widget=APISelectMultiple(full=True)
     )
 
     class Meta:

From 8a8b4e728a2cf1b074b600590d15100e2fa6c6cf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 09:47:13 -0400
Subject: [PATCH 451/505] Move null_option to DynamicModelChoiceMixin

---
 netbox/dcim/forms.py              | 40 +++++++++----------------------
 netbox/ipam/forms.py              | 32 +++++++------------------
 netbox/project-static/js/forms.js |  2 +-
 netbox/tenancy/forms.py           | 10 +++-----
 netbox/utilities/forms/fields.py  | 12 +++++++++-
 netbox/utilities/forms/widgets.py |  4 ----
 netbox/virtualization/forms.py    | 28 +++++++---------------
 7 files changed, 42 insertions(+), 86 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index cf79458a6..9c590c996 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -672,9 +672,7 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         ),
         required=False,
         label='Rack group',
-        widget=APISelectMultiple(
-            null_option=True
-        )
+        null_option='None'
     )
     status = forms.MultipleChoiceField(
         choices=RackStatusChoices,
@@ -685,9 +683,7 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         queryset=RackRole.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -853,9 +849,7 @@ class RackReservationFilterForm(BootstrapMixin, TenancyFilterForm):
         queryset=RackGroup.objects.prefetch_related('site'),
         required=False,
         label='Rack group',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -2124,9 +2118,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.all(),
@@ -2155,9 +2147,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         queryset=Platform.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     status = forms.MultipleChoiceField(
         choices=DeviceStatusChoices,
@@ -3879,8 +3869,8 @@ class CableFilterForm(BootstrapMixin, forms.Form):
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
+        null_option='None',
         widget=APISelectMultiple(
-            null_option=True,
             filter_for={
                 'device_id': 'rack_id',
             }
@@ -4208,8 +4198,8 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
+        null_option='None',
         widget=APISelectMultiple(
-            null_option=True,
             filter_for={
                 'tenant': 'group'
             }
@@ -4219,9 +4209,7 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -4336,9 +4324,7 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=RackGroup.objects.all(),
         required=False,
         label='Rack group (ID)',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -4555,17 +4541,13 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=PowerPanel.objects.all(),
         required=False,
         label='Power panel',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     rack_id = DynamicModelMultipleChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     status = forms.MultipleChoiceField(
         choices=PowerFeedStatusChoices,
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 393903d37..59ccf7807 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -464,9 +464,7 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         queryset=VRF.objects.all(),
         required=False,
         label='VRF',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='Global'
     )
     status = forms.MultipleChoiceField(
         choices=PrefixStatusChoices,
@@ -487,17 +485,13 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     role = DynamicModelMultipleChoiceField(
         queryset=Role.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     is_pool = forms.NullBooleanField(
         required=False,
@@ -910,9 +904,7 @@ class IPAddressFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterFo
         queryset=VRF.objects.all(),
         required=False,
         label='VRF',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='Global'
     )
     status = forms.MultipleChoiceField(
         choices=IPAddressStatusChoices,
@@ -981,9 +973,7 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
 
 
@@ -1147,17 +1137,13 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     group_id = DynamicModelMultipleChoiceField(
         queryset=VLANGroup.objects.all(),
         required=False,
         label='VLAN group',
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     status = forms.MultipleChoiceField(
         choices=VLANStatusChoices,
@@ -1168,9 +1154,7 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
         queryset=Role.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index 9fed76f90..c496a0377 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -247,7 +247,7 @@ $(document).ready(function() {
                 if (element.getAttribute('data-null-option') && data.previous === null) {
                     results.unshift({
                         id: 'null',
-                        text: 'None'
+                        text: element.getAttribute('data-null-option')
                     });
                 }
 
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 436f37d3f..13ff4da65 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -106,9 +106,7 @@ class TenantFilterForm(BootstrapMixin, CustomFieldFilterForm):
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -152,8 +150,8 @@ class TenancyFilterForm(forms.Form):
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
+        null_option='None',
         widget=APISelectMultiple(
-            null_option=True,
             filter_for={
                 'tenant': 'group'
             }
@@ -163,7 +161,5 @@ class TenancyFilterForm(forms.Form):
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 065086c4e..398a8a0e8 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -245,12 +245,18 @@ class TagFilterField(forms.MultipleChoiceField):
 
 
 class DynamicModelChoiceMixin:
+    """
+    :param display_field: The name of the attribute of an API response object to display in the selection list
+    :param query_params: A dictionary of additional key/value pairs to attach to the API request
+    :param null_option: The string used to represent a null selection (if any)
+    """
     filter = django_filters.ModelChoiceFilter
     widget = widgets.APISelect
 
-    def __init__(self, *args, display_field='name', query_params=None, **kwargs):
+    def __init__(self, *args, display_field='name', query_params=None, null_option=None, **kwargs):
         self.display_field = display_field
         self.query_params = query_params or {}
+        self.null_option = null_option
 
         # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference
         # by widget_attrs()
@@ -267,6 +273,10 @@ class DynamicModelChoiceMixin:
         if self.to_field_name:
             attrs['value-field'] = self.to_field_name
 
+        # Set the string used to represent a null option
+        if self.null_option is not None:
+            attrs['data-null-option'] = self.null_option
+
         # Attach any static query parameters
         for key, value in self.query_params.items():
             widget.add_additional_query_param(key, value)
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 0e03931f2..91c9656cb 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -146,7 +146,6 @@ class APISelect(SelectWithDisabled):
         name of the filter-for field (child field) and the value is the name of the query param filter.
     :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
         name of the query param and the value if the query param's value.
-    :param null_option: If true, include the static null option in the selection list.
     """
     def __init__(
         self,
@@ -155,7 +154,6 @@ class APISelect(SelectWithDisabled):
         disabled_indicator=None,
         filter_for=None,
         additional_query_params=None,
-        null_option=False,
         full=False,
         *args,
         **kwargs
@@ -178,8 +176,6 @@ class APISelect(SelectWithDisabled):
         if additional_query_params:
             for key, value in additional_query_params.items():
                 self.add_additional_query_param(key, value)
-        if null_option:
-            self.attrs['data-null-option'] = 1
 
     def add_filter_for(self, name, value):
         """
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index f33d4645a..e42a6597e 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -182,17 +182,13 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     group = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     tag = TagFilterField(model)
 
@@ -485,17 +481,13 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         queryset=ClusterGroup.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     cluster_type = DynamicModelMultipleChoiceField(
         queryset=ClusterType.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     cluster_id = DynamicModelMultipleChoiceField(
         queryset=Cluster.objects.all(),
@@ -516,18 +508,16 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.filter(vm_role=True),
         to_field_name='slug',
         required=False,
+        null_option='None',
         query_params={
             'vm_role': "True"
-        },
-        widget=APISelectMultiple(null_option=True)
+        }
     )
     status = forms.MultipleChoiceField(
         choices=VirtualMachineStatusChoices,
@@ -538,9 +528,7 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
         queryset=Platform.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            null_option=True,
-        )
+        null_option='None'
     )
     mac_address = forms.CharField(
         required=False,

From b917403c934060635141b8e770f166946ace4e8f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 10:05:12 -0400
Subject: [PATCH 452/505] Replace 'nullable' attribute with null_option

---
 netbox/dcim/forms.py              | 16 ++++------------
 netbox/ipam/forms.py              | 16 ++++------------
 netbox/project-static/js/forms.js |  8 ++++----
 netbox/tenancy/forms.py           |  4 +---
 netbox/virtualization/forms.py    | 12 +++---------
 5 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 9c590c996..f6d8fccab 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1747,12 +1747,10 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     cluster_group = DynamicModelChoiceField(
         queryset=ClusterGroup.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'cluster': 'group_id'
-            },
-            attrs={
-                'nullable': 'true'
             }
         )
     )
@@ -3438,12 +3436,10 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'termination_b_device': 'rack_id',
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -3982,12 +3978,10 @@ class VirtualChassisCreateForm(BootstrapMixin, forms.ModelForm):
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'members': 'rack_id'
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -4118,12 +4112,10 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form):
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'device': 'rack_id'
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 59ccf7807..d86895b2c 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -257,13 +257,11 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'vlan_group': 'site_id',
                 'vlan': 'site_id',
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -271,12 +269,10 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=VLANGroup.objects.all(),
         required=False,
         label='VLAN group',
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'vlan': 'group_id'
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -556,12 +552,10 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         required=False,
         label='Rack',
         display_field='display_name',
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'nat_device': 'rack_id'
-            },
-            attrs={
-                'nullable': 'true'
             }
         )
     )
@@ -985,12 +979,10 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'group': 'site_id'
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index c496a0377..c06eb3045 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -74,7 +74,7 @@ $(document).ready(function() {
         form.submit();
     });
 
-    // Parse URLs which may contain variable refrences to other field values
+    // Parse URLs which may contain variable references to other field values
     function parseURL(url) {
         var filter_regex = /\{\{([a-z_]+)\}\}/g;
         var match;
@@ -87,7 +87,7 @@ $(document).ready(function() {
                 rendered_url = rendered_url.replace(match[0], custom_attr);
             } else if (filter_field.val()) {
                 rendered_url = rendered_url.replace(match[0], filter_field.val());
-            } else if (filter_field.attr('nullable') == 'true') {
+            } else if (filter_field.attr('data-null-option')) {
                 rendered_url = rendered_url.replace(match[0], 'null');
             }
         }
@@ -123,7 +123,7 @@ $(document).ready(function() {
 
     // API backed selection
     // Includes live search and chained fields
-    // The `multiple` setting may be controled via a data-* attribute
+    // The `multiple` setting may be controlled via a data-* attribute
     $('.netbox-select2-api').select2({
         allowClear: true,
         placeholder: "---------",
@@ -165,7 +165,7 @@ $(document).ready(function() {
                 filter_for_elements.each(function(index, filter_for_element) {
                     var param_name = $(filter_for_element).attr(attr_name);
                     var is_required = $(filter_for_element).attr("required");
-                    var is_nullable = $(filter_for_element).attr("nullable");
+                    var is_nullable = $(filter_for_element).attr("data-null-option");
                     var is_visible = $(filter_for_element).is(":visible");
                     var value = $(filter_for_element).val();
 
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 13ff4da65..94df2fc95 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -119,12 +119,10 @@ class TenancyForm(forms.Form):
     tenant_group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 'tenant': 'group_id',
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index e42a6597e..b05dbb476 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -197,12 +197,10 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 "site": "region_id",
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -219,12 +217,10 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 "devices": "rack_id"
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )
@@ -278,12 +274,10 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     cluster_group = DynamicModelChoiceField(
         queryset=ClusterGroup.objects.all(),
         required=False,
+        null_option='None',
         widget=APISelect(
             filter_for={
                 "cluster": "group_id",
-            },
-            attrs={
-                'nullable': 'true',
             }
         )
     )

From d8d752b62313ffafef1f4e69f6c4c2d7fc1f071f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 10:14:21 -0400
Subject: [PATCH 453/505] Fix form for adding devices to a cluster

---
 .../virtualization/cluster_add_devices.html   | 30 -------------------
 netbox/virtualization/forms.py                |  8 ++---
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index 397f53d01..d53fc3a03 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -35,33 +35,3 @@
         </div>
     </form>
 {% endblock %}
-
-{% block javascript %}
-<script type="text/javascript">
-    $(document).ready(function() {
-        var device_list = $('#id_devices');
-        var disabled_indicator = device_list.attr('disabled-indicator');
-        $('#id_search').autocomplete({
-            source: function(request, response) {
-                $.ajax({
-                    type: 'GET',
-                    url: netbox_api_path + 'dcim/devices/',
-                    data: 'q=' + request.term,
-                    beforeSend: function() {
-                        device_list.empty();
-                    },
-                    success: function(data) {
-                        response($.map(data.results, function(item) {
-                            var option = $("<option></option>").attr("value", item['id']).text(item['display_name']);
-                            if (disabled_indicator && item[disabled_indicator]) {
-                                option.attr("disabled", "disabled");
-                            }
-                            device_list.append(option);
-                        }));
-                    }
-                });
-            }
-        });
-    });
-</script>
-{% endblock %}
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index b05dbb476..9bf55e497 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -225,11 +225,11 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
         )
     )
     devices = DynamicModelMultipleChoiceField(
-        queryset=Device.objects.filter(cluster__isnull=True),
+        queryset=Device.objects.all(),
         display_field='display_name',
-        widget=APISelectMultiple(
-            disabled_indicator='cluster'
-        )
+        query_params={
+            'cluster_id': 'null'
+        }
     )
 
     class Meta:

From d752c36ea8cf07f0aa0fbe83280b30269715b2c7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 10:17:21 -0400
Subject: [PATCH 454/505] Fix virtual chassis member add form

---
 netbox/dcim/forms.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index f6d8fccab..7e7a75125 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -4120,13 +4120,11 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form):
         )
     )
     device = DynamicModelChoiceField(
-        queryset=Device.objects.filter(
-            virtual_chassis__isnull=True
-        ),
+        queryset=Device.objects.all(),
         display_field='display_name',
-        widget=APISelect(
-            disabled_indicator='virtual_chassis'
-        )
+        query_params={
+            'virtual_chassis_id': 'null'
+        }
     )
 
     def clean_device(self):

From 100c8fef206642b1b7a60176a80249fad72430e8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 12:36:53 -0400
Subject: [PATCH 455/505] Add support for referencing peer field values in
 query_params

---
 netbox/circuits/forms.py          |  24 +-
 netbox/dcim/forms.py              | 526 ++++++++++++------------------
 netbox/ipam/forms.py              | 150 ++++-----
 netbox/project-static/js/forms.js |  11 +
 netbox/tenancy/forms.py           |  24 +-
 netbox/utilities/forms/widgets.py |   7 +-
 netbox/virtualization/forms.py    |  76 ++---
 7 files changed, 340 insertions(+), 478 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 70a220b58..23540a507 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -106,17 +106,15 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False
+        required=False,
+        query_params={
+            'region': '$region'
+        }
     )
     asn = forms.IntegerField(
         required=False,
@@ -282,17 +280,15 @@ class CircuitFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False
+        required=False,
+        query_params={
+            'region': '$region'
+        }
     )
     commit_rate = forms.IntegerField(
         required=False,
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 7e7a75125..dc79e40f0 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -68,27 +68,23 @@ class DeviceComponentFilterForm(BootstrapMixin, forms.Form):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'site',
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label='Device'
+        label='Device',
+        query_params={
+            'site': '$site'
+        }
     )
 
 
@@ -357,16 +353,14 @@ class SiteFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
 
 class RackGroupForm(BootstrapMixin, forms.ModelForm):
     site = DynamicModelChoiceField(
-        queryset=Site.objects.all(),
-        widget=APISelect(
-            filter_for={
-                'parent': 'site_id',
-            }
-        )
+        queryset=Site.objects.all()
     )
     parent = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     slug = SlugField()
 
@@ -402,28 +396,24 @@ class RackGroupFilterForm(BootstrapMixin, forms.Form):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region',
-                'parent': 'region',
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'parent': 'site',
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     parent = DynamicModelMultipleChoiceField(
         queryset=RackGroup.objects.all(),
         to_field_name='slug',
-        required=False
+        required=False,
+        query_params={
+            'region': '$region',
+            'site': '$site',
+        }
     )
 
 
@@ -458,16 +448,14 @@ class RackRoleCSVForm(CSVModelForm):
 
 class RackForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
-        queryset=Site.objects.all(),
-        widget=APISelect(
-            filter_for={
-                'group': 'site_id',
-            }
-        )
+        queryset=Site.objects.all()
     )
     group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     role = DynamicModelChoiceField(
         queryset=RackRole.objects.all(),
@@ -562,16 +550,14 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'group': 'site_id',
-            }
-        )
+        required=False
     )
     group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
@@ -649,30 +635,24 @@ class RackFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'group_id': 'site'
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     group_id = DynamicModelMultipleChoiceField(
-        queryset=RackGroup.objects.prefetch_related(
-            'site'
-        ),
+        queryset=RackGroup.objects.all(),
         required=False,
         label='Rack group',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'site': '$site'
+        }
     )
     status = forms.MultipleChoiceField(
         choices=RackStatusChoices,
@@ -698,16 +678,13 @@ class RackElevationFilterForm(RackFilterForm):
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
-        display_field='display_name'
+        display_field='display_name',
+        query_params={
+            'site': '$site',
+            'group_id': '$group_id',
+        }
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Filter the rack field based on the site and group
-        self.fields['site'].widget.add_filter_for('id', 'site')
-        self.fields['group_id'].widget.add_filter_for('id', 'group_id')
-
 
 #
 # Rack reservations
@@ -716,25 +693,21 @@ class RackElevationFilterForm(RackFilterForm):
 class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'rack_group': 'site_id',
-                'rack': 'site_id',
-            }
-        )
+        required=False
     )
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
         required=False,
-        widget=APISelect(
-            filter_for={
-                'rack': 'group_id'
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     rack = DynamicModelChoiceField(
-        queryset=Rack.objects.all()
+        queryset=Rack.objects.all(),
+        query_params={
+            'site_id': '$site',
+            'group_id': 'rack',
+        }
     )
     units = NumericArrayField(
         base_field=forms.IntegerField(),
@@ -1011,16 +984,14 @@ class ComponentTemplateCreateForm(ComponentForm):
     """
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'device_type': 'manufacturer_id'
-            }
-        )
+        required=False
     )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
-        display_field='model'
+        display_field='model',
+        query_params={
+            'manufacturer_id': '$manufacturer'
+        }
     )
     description = forms.CharField(
         required=False
@@ -1699,17 +1670,15 @@ class PlatformCSVForm(CSVModelForm):
 
 class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
-        queryset=Site.objects.all(),
-        widget=APISelect(
-            filter_for={
-                'rack': 'site_id'
-            }
-        )
+        queryset=Site.objects.all()
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
-        display_field='display_name'
+        display_field='display_name',
+        query_params={
+            'site_id': '$site'
+        }
     )
     position = forms.TypedChoiceField(
         required=False,
@@ -1717,22 +1686,22 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         help_text="The lowest-numbered unit occupied by the device",
         widget=APISelect(
             api_url='/api/dcim/racks/{{rack}}/elevation/',
-            disabled_indicator='device'
+            disabled_indicator='device',
+            additional_query_params={
+                'face': '$face'
+            }
         )
     )
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'device_type': 'manufacturer_id',
-                'platform': 'manufacturer_id'
-            }
-        )
+        required=False
     )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
-        display_field='model'
+        display_field='model',
+        query_params={
+            'manufacturer_id': '$manufacturer'
+        }
     )
     device_role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all()
@@ -1741,22 +1710,20 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         queryset=Platform.objects.all(),
         required=False,
         query_params={
-            "manufacturer_id": "null"
+            'manufacturer_id': ['$manufacturer', 'null']
         }
     )
     cluster_group = DynamicModelChoiceField(
         queryset=ClusterGroup.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                'cluster': 'group_id'
-            }
-        )
+        null_option='None'
     )
     cluster = DynamicModelChoiceField(
         queryset=Cluster.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'group_id': '$cluster_group'
+        }
     )
     comments = CommentField()
     local_context_data = JSONField(
@@ -1782,11 +1749,6 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
                                   "config context",
         }
         widgets = {
-            'face': StaticSelect2(
-                filter_for={
-                    'position': 'face'
-                }
-            ),
             'status': StaticSelect2(),
             'primary_ip4': StaticSelect2(),
             'primary_ip6': StaticSelect2(),
@@ -2084,39 +2046,33 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'rack_group_id': 'site',
-                'rack_id': 'site',
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     rack_group_id = DynamicModelMultipleChoiceField(
         queryset=RackGroup.objects.all(),
         required=False,
         label='Rack group',
-        widget=APISelectMultiple(
-            filter_for={
-                'rack_id': 'group_id',
-            }
-        )
+        query_params={
+            'site': '$site'
+        }
     )
     rack_id = DynamicModelMultipleChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'site': '$site',
+            'group_id': '$rack_group_id',
+        }
     )
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.all(),
@@ -2125,21 +2081,20 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
         widget=APISelectMultiple(
         )
     )
-    manufacturer_id = DynamicModelMultipleChoiceField(
+    manufacturer = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
+        to_field_name='slug',
         required=False,
-        label='Manufacturer',
-        widget=APISelectMultiple(
-            filter_for={
-                'device_type_id': 'manufacturer_id',
-            }
-        )
+        label='Manufacturer'
     )
     device_type_id = DynamicModelMultipleChoiceField(
         queryset=DeviceType.objects.all(),
         required=False,
         label='Model',
-        display_field='model'
+        display_field='model',
+        query_params={
+            'manufacturer': '$manufacturer'
+        }
     )
     platform = DynamicModelMultipleChoiceField(
         queryset=Platform.objects.all(),
@@ -3424,30 +3379,26 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
     termination_b_site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         label='Site',
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'termination_b_rack': 'site_id',
-                'termination_b_device': 'site_id',
-            }
-        )
+        required=False
     )
     termination_b_rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                'termination_b_device': 'rack_id',
-            }
-        )
+        query_params={
+            'site_id': '$termination_b_site'
+        }
     )
     termination_b_device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         label='Device',
         required=False,
         display_field='display_name',
+        query_params={
+            'site_id': '$termination_b_site',
+            'rack_id': '$termination_b_rack',
+        },
         widget=APISelect(
             filter_for={
                 'termination_b_id': 'device_id',
@@ -3545,27 +3496,21 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
     termination_b_provider = DynamicModelChoiceField(
         queryset=Provider.objects.all(),
         label='Provider',
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'termination_b_circuit': 'provider_id',
-            }
-        )
+        required=False
     )
     termination_b_site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         label='Site',
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'termination_b_circuit': 'site_id',
-            }
-        )
+        required=False
     )
     termination_b_circuit = DynamicModelChoiceField(
         queryset=Circuit.objects.all(),
         label='Circuit',
         display_field='cid',
+        query_params={
+            'provider_id': '$termination_b_provider',
+            'site_id': '$termination_b_site',
+        },
         widget=APISelect(
             filter_for={
                 'termination_b_id': 'circuit_id',
@@ -3595,29 +3540,25 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
         queryset=Site.objects.all(),
         label='Site',
         required=False,
-        display_field='cid',
-        widget=APISelect(
-            filter_for={
-                'termination_b_rackgroup': 'site_id',
-                'termination_b_powerpanel': 'site_id',
-            }
-        )
+        display_field='cid'
     )
     termination_b_rackgroup = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
         label='Rack Group',
         required=False,
         display_field='cid',
-        widget=APISelect(
-            filter_for={
-                'termination_b_powerpanel': 'rackgroup_id',
-            }
-        )
+        query_params={
+            'site_id': '$termination_b_site'
+        }
     )
     termination_b_powerpanel = DynamicModelChoiceField(
         queryset=PowerPanel.objects.all(),
         label='Power Panel',
         required=False,
+        query_params={
+            'site_id': '$termination_b_site',
+            'rack_group_id': '$termination_b_rackgroup',
+        },
         widget=APISelect(
             filter_for={
                 'termination_b_id': 'power_panel_id',
@@ -3843,34 +3784,21 @@ class CableFilterForm(BootstrapMixin, forms.Form):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'rack_id': 'site',
-                'device_id': 'site',
-            }
-        )
+        required=False
     )
     tenant = DynamicModelMultipleChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'tenant',
-            }
-        )
+        required=False
     )
     rack_id = DynamicModelMultipleChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
         null_option='None',
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'rack_id',
-            }
-        )
+        query_params={
+            'site': '$site'
+        }
     )
     type = forms.MultipleChoiceField(
         choices=add_blank_choice(CableTypeChoices),
@@ -3890,7 +3818,12 @@ class CableFilterForm(BootstrapMixin, forms.Form):
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label='Device'
+        label='Device',
+        query_params={
+            'site': '$site',
+            'tenant': '$tenant',
+            'rack_id': '$rack_id',
+        }
     )
     tag = TagFilterField(model)
 
@@ -3903,17 +3836,15 @@ class ConsoleConnectionFilterForm(BootstrapMixin, forms.Form):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'site',
-            }
-        )
+        required=False
     )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label='Device'
+        label='Device',
+        query_params={
+            'site': '$site'
+        }
     )
 
 
@@ -3921,17 +3852,15 @@ class PowerConnectionFilterForm(BootstrapMixin, forms.Form):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'site',
-            }
-        )
+        required=False
     )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label='Device'
+        label='Device',
+        query_params={
+            'site': '$site'
+        }
     )
 
 
@@ -3939,17 +3868,15 @@ class InterfaceConnectionFilterForm(BootstrapMixin, forms.Form):
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'device_id': 'site',
-            }
-        )
+        required=False
     )
     device_id = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
-        label='Device'
+        label='Device',
+        query_params={
+            'site': '$site'
+        }
     )
 
 
@@ -3967,27 +3894,23 @@ class DeviceSelectionForm(forms.Form):
 class VirtualChassisCreateForm(BootstrapMixin, forms.ModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'rack': 'site_id',
-                'members': 'site_id',
-            }
-        )
+        required=False
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                'members': 'rack_id'
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     members = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
+        query_params={
+            'site_id': '$site',
+            'rack_id': '$rack',
+        }
     )
     initial_position = forms.IntegerField(
         initial=1,
@@ -4101,29 +4024,23 @@ class DeviceVCMembershipForm(forms.ModelForm):
 class VCMemberSelectForm(BootstrapMixin, forms.Form):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'rack': 'site_id',
-                'device': 'site_id',
-            }
-        )
+        required=False
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                'device': 'rack_id'
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         display_field='display_name',
         query_params={
-            'virtual_chassis_id': 'null'
+            'site_id': '$site',
+            'rack_id': '$rack',
+            'virtual_chassis_id': 'null',
         }
     )
 
@@ -4172,34 +4089,30 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
-        required=False
+        required=False,
+        query_params={
+            'region': '$region'
+        }
     )
     tenant_group = DynamicModelMultipleChoiceField(
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None',
-        widget=APISelectMultiple(
-            filter_for={
-                'tenant': 'group'
-            }
-        )
+        null_option='None'
     )
     tenant = DynamicModelMultipleChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'group': '$tenant_group'
+        }
     )
     tag = TagFilterField(model)
 
@@ -4210,16 +4123,14 @@ class VirtualChassisFilterForm(BootstrapMixin, CustomFieldFilterForm):
 
 class PowerPanelForm(BootstrapMixin, forms.ModelForm):
     site = DynamicModelChoiceField(
-        queryset=Site.objects.all(),
-        widget=APISelect(
-            filter_for={
-                'rack_group': 'site_id',
-            }
-        )
+        queryset=Site.objects.all()
     )
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -4266,16 +4177,14 @@ class PowerPanelBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'rack_group': 'site_id',
-            }
-        )
+        required=False
     )
     rack_group = DynamicModelChoiceField(
         queryset=RackGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
 
     class Meta:
@@ -4293,28 +4202,24 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'rack_group_id': 'site',
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     rack_group_id = DynamicModelMultipleChoiceField(
         queryset=RackGroup.objects.all(),
         required=False,
         label='Rack group (ID)',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'site': '$site'
+        }
     )
     tag = TagFilterField(model)
 
@@ -4326,20 +4231,20 @@ class PowerPanelFilterForm(BootstrapMixin, CustomFieldFilterForm):
 class PowerFeedForm(BootstrapMixin, CustomFieldModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'power_panel': 'site_id',
-                'rack': 'site_id',
-            }
-        )
+        required=False
     )
     power_panel = DynamicModelChoiceField(
-        queryset=PowerPanel.objects.all()
+        queryset=PowerPanel.objects.all(),
+        query_params={
+            'site_id': '$site'
+        }
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     comments = CommentField()
     tags = DynamicModelMultipleChoiceField(
@@ -4445,12 +4350,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     )
     power_panel = DynamicModelChoiceField(
         queryset=PowerPanel.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'rackgroup': 'site_id',
-            }
-        )
+        required=False
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
@@ -4509,35 +4409,33 @@ class PowerFeedFilterForm(BootstrapMixin, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'power_panel_id': 'site',
-                'rack_id': 'site',
-            }
-        )
+        query_params={
+            'region': '$region'
+        }
     )
     power_panel_id = DynamicModelMultipleChoiceField(
         queryset=PowerPanel.objects.all(),
         required=False,
         label='Power panel',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'site': '$site'
+        }
     )
     rack_id = DynamicModelMultipleChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         label='Rack',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'site': '$site'
+        }
     )
     status = forms.MultipleChoiceField(
         choices=PowerFeedStatusChoices,
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index d86895b2c..cc83568b1 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -257,30 +257,26 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                'vlan_group': 'site_id',
-                'vlan': 'site_id',
-            }
-        )
+        null_option='None'
     )
     vlan_group = DynamicModelChoiceField(
         queryset=VLANGroup.objects.all(),
         required=False,
         label='VLAN group',
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                'vlan': 'group_id'
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     vlan = DynamicModelChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         label='VLAN',
-        display_field='display_name'
+        display_field='display_name',
+        query_params={
+            'site_id': '$site',
+            'group_id': '$vlan_group',
+        }
     )
     role = DynamicModelChoiceField(
         queryset=Role.objects.all(),
@@ -470,18 +466,16 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
     role = DynamicModelMultipleChoiceField(
         queryset=Role.objects.all(),
@@ -506,30 +500,26 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
 class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModelForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'interface': 'device_id'
-            }
-        )
+        required=False
     )
     interface = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'device_id': '$device'
+        }
     )
     virtual_machine = DynamicModelChoiceField(
         queryset=VirtualMachine.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'vminterface': 'virtual_machine_id'
-            }
-        )
+        required=False
     )
     vminterface = DynamicModelChoiceField(
         queryset=VMInterface.objects.all(),
         required=False,
-        label='Interface'
+        label='Interface',
+        query_params={
+            'virtual_machine_id': '$virtual_machine'
+        }
     )
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
@@ -539,13 +529,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
     nat_site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
-        label='Site',
-        widget=APISelect(
-            filter_for={
-                'nat_rack': 'site_id',
-                'nat_device': 'site_id'
-            }
-        )
+        label='Site'
     )
     nat_rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
@@ -553,38 +537,34 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         label='Rack',
         display_field='display_name',
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                'nat_device': 'rack_id'
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     nat_device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
         required=False,
         label='Device',
         display_field='display_name',
-        widget=APISelect(
-            filter_for={
-                'nat_inside': 'device_id'
-            }
-        )
+        query_params={
+            'site_id': '$site',
+            'rack_id': '$nat_rack',
+        }
     )
     nat_vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF',
-        widget=APISelect(
-            filter_for={
-                'nat_inside': 'vrf_id'
-            }
-        )
+        label='VRF'
     )
     nat_inside = DynamicModelChoiceField(
         queryset=IPAddress.objects.all(),
         required=False,
         label='IP Address',
-        display_field='address'
+        display_field='address',
+        query_params={
+            'device_id': '$nat_device',
+            'vrf_if': '$nat_vrf',
+        }
     )
     primary_for_parent = forms.BooleanField(
         required=False,
@@ -956,18 +936,16 @@ class VLANGroupFilterForm(BootstrapMixin, forms.Form):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region',
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
 
 
@@ -979,16 +957,14 @@ class VLANForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                'group': 'site_id'
-            }
-        )
+        null_option='None'
     )
     group = DynamicModelChoiceField(
         queryset=VLANGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     role = DynamicModelChoiceField(
         queryset=Role.objects.all(),
@@ -1072,16 +1048,14 @@ class VLANBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
-        required=False,
-        widget=APISelect(
-            filter_for={
-                'group': 'site_id'
-            }
-        )
+        required=False
     )
     group = DynamicModelChoiceField(
         queryset=VLANGroup.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
@@ -1117,25 +1091,25 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region',
-                'group_id': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
     group_id = DynamicModelMultipleChoiceField(
         queryset=VLANGroup.objects.all(),
         required=False,
         label='VLAN group',
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
     status = forms.MultipleChoiceField(
         choices=VLANStatusChoices,
diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index c06eb3045..051b506ed 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -184,6 +184,17 @@ $(document).ready(function() {
                         var param_name = attr.name.split("data-additional-query-param-")[1];
 
                         $.each($.parseJSON(attr.value), function(index, value) {
+                            // Referencing the value of another form field
+                            if (value.startsWith('$')) {
+                                let ref_field = $('#id_' + value.slice(1));
+                                if (ref_field.val() && ref_field.is(":visible")) {
+                                    value = ref_field.val();
+                                } else if (ref_field.attr("required") && ref_field.attr("data-null-option")) {
+                                    value = "null";
+                                } else {
+                                    return true;  // Skip if ref_field has no value
+                                }
+                            }
                             if (param_name in parameters) {
                                 if (Array.isArray(parameters[param_name])) {
                                     parameters[param_name].push(value);
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 94df2fc95..5a420f016 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -119,16 +119,14 @@ class TenancyForm(forms.Form):
     tenant_group = DynamicModelChoiceField(
         queryset=TenantGroup.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                'tenant': 'group_id',
-            }
-        )
+        null_option='None'
     )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
-        required=False
+        required=False,
+        query_params={
+            'group_id': '$tenant_group'
+        }
     )
 
     def __init__(self, *args, **kwargs):
@@ -148,16 +146,14 @@ class TenancyFilterForm(forms.Form):
         queryset=TenantGroup.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None',
-        widget=APISelectMultiple(
-            filter_for={
-                'tenant': 'group'
-            }
-        )
+        null_option='None'
     )
     tenant = DynamicModelMultipleChoiceField(
         queryset=Tenant.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'group': '$tenant_group'
+        }
     )
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 91c9656cb..f9eb42663 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -193,10 +193,13 @@ class APISelect(SelectWithDisabled):
         :param name: The name of the query param
         :param value: The value of the query param
         """
-        key = 'data-additional-query-param-{}'.format(name)
+        key = f'data-additional-query-param-{name}'
 
         values = json.loads(self.attrs.get(key, '[]'))
-        values.append(value)
+        if type(value) is list:
+            values.extend(value)
+        else:
+            values.append(value)
 
         self.attrs[key] = json.dumps(values)
 
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index 9bf55e497..c3b243978 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -171,18 +171,16 @@ class ClusterFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
     group = DynamicModelMultipleChoiceField(
         queryset=ClusterGroup.objects.all(),
@@ -197,38 +195,30 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
     region = DynamicModelChoiceField(
         queryset=Region.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                "site": "region_id",
-            }
-        )
+        null_option='None'
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
         required=False,
-        widget=APISelect(
-            filter_for={
-                "rack": "site_id",
-                "devices": "site_id",
-            }
-        )
+        query_params={
+            'region_id': '$region'
+        }
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
-        widget=APISelect(
-            filter_for={
-                "devices": "rack_id"
-            }
-        )
+        query_params={
+            'site_id': '$site'
+        }
     )
     devices = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         display_field='display_name',
         query_params={
-            'cluster_id': 'null'
+            'site_id': '$site',
+            'rack_id': '$rack',
+            'cluster_id': 'null',
         }
     )
 
@@ -274,15 +264,13 @@ class VirtualMachineForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     cluster_group = DynamicModelChoiceField(
         queryset=ClusterGroup.objects.all(),
         required=False,
-        null_option='None',
-        widget=APISelect(
-            filter_for={
-                "cluster": "group_id",
-            }
-        )
+        null_option='None'
     )
     cluster = DynamicModelChoiceField(
-        queryset=Cluster.objects.all()
+        queryset=Cluster.objects.all(),
+        query_params={
+            'group_id': '$cluster_group'
+        }
     )
     role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all(),
@@ -491,18 +479,16 @@ class VirtualMachineFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFil
     region = DynamicModelMultipleChoiceField(
         queryset=Region.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-            filter_for={
-                'site': 'region'
-            }
-        )
+        required=False
     )
     site = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         to_field_name='slug',
         required=False,
-        null_option='None'
+        null_option='None',
+        query_params={
+            'region': '$region'
+        }
     )
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.filter(vm_role=True),
@@ -776,17 +762,15 @@ class VMInterfaceFilterForm(forms.Form):
     cluster_id = DynamicModelMultipleChoiceField(
         queryset=Cluster.objects.all(),
         required=False,
-        label='Cluster',
-        widget=APISelectMultiple(
-            filter_for={
-                'virtual_machine_id': 'cluster_id'
-            }
-        )
+        label='Cluster'
     )
     virtual_machine_id = DynamicModelMultipleChoiceField(
         queryset=VirtualMachine.objects.all(),
         required=False,
-        label='Virtual machine'
+        label='Virtual machine',
+        query_params={
+            'cluster_id': '$cluster_id'
+        }
     )
     enabled = forms.NullBooleanField(
         required=False,

From c45a57ff4399989dcd8d2153f06210736275f6e7 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 12:58:32 -0400
Subject: [PATCH 456/505] Update cable termination forms to use
 DynamicModelChoiceField

---
 netbox/dcim/forms.py    | 117 +++++++++++++++++++++++++---------------
 netbox/ipam/forms.py    |   8 ++-
 netbox/tenancy/forms.py |   4 +-
 3 files changed, 79 insertions(+), 50 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index dc79e40f0..fe08822a5 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -10,7 +10,7 @@ from netaddr import EUI
 from netaddr.core import AddrFormatError
 from timezone_field import TimeZoneFormField
 
-from circuits.models import Circuit, Provider
+from circuits.models import Circuit, CircuitTermination, Provider
 from extras.forms import (
     AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldModelCSVForm, CustomFieldFilterForm, CustomFieldModelForm,
     LocalConfigContextFilterForm,
@@ -3398,12 +3398,7 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
         query_params={
             'site_id': '$termination_b_site',
             'rack_id': '$termination_b_rack',
-        },
-        widget=APISelect(
-            filter_for={
-                'termination_b_id': 'device_id',
-            }
-        )
+        }
     )
 
     class Meta:
@@ -3418,76 +3413,106 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
             'length_unit': StaticSelect2,
         }
 
+    def clean_termination_b_id(self):
+        # Return the PK rather than the object
+        return getattr(self.cleaned_data['termination_b_id'], 'pk', None)
+
 
 class ConnectCableToConsolePortForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=ConsolePort.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/console-ports/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
 
 class ConnectCableToConsoleServerPortForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=ConsoleServerPort.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/console-server-ports/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
 
 class ConnectCableToPowerPortForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=PowerPort.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/power-ports/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
 
 class ConnectCableToPowerOutletForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=PowerOutlet.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/power-outlets/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
 
 class ConnectCableToInterfaceForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=Interface.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device',
+            'kind': 'physical',
+        },
         widget=APISelect(
-            api_url='/api/dcim/interfaces/',
             disabled_indicator='cable',
-            additional_query_params={
-                'kind': 'physical',
-            }
+            full=True
         )
     )
 
 
 class ConnectCableToFrontPortForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=FrontPort.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/front-ports/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
 
 class ConnectCableToRearPortForm(ConnectCableToDeviceForm):
-    termination_b_id = forms.IntegerField(
+    termination_b_id = DynamicModelChoiceField(
+        queryset=RearPort.objects.all(),
         label='Name',
+        query_params={
+            'device_id': '$termination_b_device'
+        },
         widget=APISelect(
-            api_url='/api/dcim/rear-ports/',
             disabled_indicator='cable',
+            full=True
         )
     )
 
@@ -3510,19 +3535,17 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         query_params={
             'provider_id': '$termination_b_provider',
             'site_id': '$termination_b_site',
+        }
+    )
+    termination_b_id = DynamicModelChoiceField(
+        queryset=CircuitTermination.objects.all(),
+        label='Side',
+        display_field='term_side',
+        query_params={
+            'circuit_id': '$termination_b_circuit'
         },
         widget=APISelect(
-            filter_for={
-                'termination_b_id': 'circuit_id',
-            }
-        )
-    )
-    termination_b_id = forms.IntegerField(
-        label='Side',
-        widget=APISelect(
-            api_url='/api/circuits/circuit-terminations/',
             disabled_indicator='cable',
-            display_field='term_side',
             full=True
         )
     )
@@ -3534,6 +3557,10 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
             'status', 'label', 'color', 'length', 'length_unit',
         ]
 
+    def clean_termination_b_id(self):
+        # Return the PK rather than the object
+        return getattr(self.cleaned_data['termination_b_id'], 'pk', None)
+
 
 class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
     termination_b_site = DynamicModelChoiceField(
@@ -3558,17 +3585,17 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
         query_params={
             'site_id': '$termination_b_site',
             'rack_group_id': '$termination_b_rackgroup',
+        }
+    )
+    termination_b_id = DynamicModelChoiceField(
+        queryset=PowerFeed.objects.all(),
+        label='Name',
+        query_params={
+            'power_panel_id': '$termination_b_powerpanel'
         },
         widget=APISelect(
-            filter_for={
-                'termination_b_id': 'power_panel_id',
-            }
-        )
-    )
-    termination_b_id = forms.IntegerField(
-        label='Name',
-        widget=APISelect(
-            api_url='/api/dcim/power-feeds/',
+            disabled_indicator='cable',
+            full=True
         )
     )
 
@@ -3579,6 +3606,10 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
             'color', 'length', 'length_unit',
         ]
 
+    def clean_termination_b_id(self):
+        # Return the PK rather than the object
+        return getattr(self.cleaned_data['termination_b_id'], 'pk', None)
+
 
 class CableForm(BootstrapMixin, forms.ModelForm):
     tags = DynamicModelMultipleChoiceField(
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index cc83568b1..2e1917b2e 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1,5 +1,4 @@
 from django import forms
-from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MaxValueValidator, MinValueValidator
 
 from dcim.models import Device, Interface, Rack, Region, Site
@@ -10,10 +9,9 @@ from extras.models import Tag
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    add_blank_choice, APISelect, APISelectMultiple, BootstrapMixin, BulkEditNullBooleanSelect, CSVChoiceField,
-    CSVModelChoiceField, CSVModelForm, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
-    ExpandableIPAddressField, ReturnURLForm, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField,
-    BOOLEAN_WITH_BLANK_CHOICES,
+    add_blank_choice, BootstrapMixin, BulkEditNullBooleanSelect, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
+    DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableIPAddressField, ReturnURLForm,
+    SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from virtualization.models import VirtualMachine, VMInterface
 from .choices import *
diff --git a/netbox/tenancy/forms.py b/netbox/tenancy/forms.py
index 5a420f016..142333bff 100644
--- a/netbox/tenancy/forms.py
+++ b/netbox/tenancy/forms.py
@@ -5,8 +5,8 @@ from extras.forms import (
 )
 from extras.models import Tag
 from utilities.forms import (
-    APISelect, APISelectMultiple, BootstrapMixin, CommentField, CSVModelChoiceField, CSVModelForm,
-    DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField, TagFilterField,
+    BootstrapMixin, CommentField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
+    DynamicModelMultipleChoiceField, SlugField, TagFilterField,
 )
 from .models import Tenant, TenantGroup
 

From 09849391e393d853c86ec077139dd578e524fd98 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 13:03:59 -0400
Subject: [PATCH 457/505] Remove filter_for argument from Select2 widgets

---
 netbox/utilities/forms/widgets.py | 36 ++-----------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index f9eb42663..58aca97c7 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -79,29 +79,12 @@ class SelectWithDisabled(forms.Select):
 
 class StaticSelect2(SelectWithDisabled):
     """
-    A static content using the Select2 widget
-
-    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
-        name of the filter-for field (child field) and the value is the name of the query param filter.
+    A static <select> form widget using the Select2 library.
     """
-
-    def __init__(self, filter_for=None, *args, **kwargs):
-
+    def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.attrs['class'] = 'netbox-select2-static'
-        if filter_for:
-            for key, value in filter_for.items():
-                self.add_filter_for(key, value)
-
-    def add_filter_for(self, name, value):
-        """
-        Add details for an additional query param in the form of a data-filter-for-* attribute.
-
-        :param name: The name of the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-filter-for-{}'.format(name)] = value
 
 
 class StaticSelect2Multiple(StaticSelect2, forms.SelectMultiple):
@@ -142,8 +125,6 @@ class APISelect(SelectWithDisabled):
     :param api_url: API endpoint URL. Required if not set automatically by the parent field.
     :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`.
     :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
-    :param filter_for: (Optional) A dict of chained form fields for which this field is a filter. The key is the
-        name of the filter-for field (child field) and the value is the name of the query param filter.
     :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
         name of the query param and the value if the query param's value.
     """
@@ -152,7 +133,6 @@ class APISelect(SelectWithDisabled):
         api_url=None,
         display_field=None,
         disabled_indicator=None,
-        filter_for=None,
         additional_query_params=None,
         full=False,
         *args,
@@ -170,22 +150,10 @@ class APISelect(SelectWithDisabled):
             self.attrs['display-field'] = display_field
         if disabled_indicator:
             self.attrs['disabled-indicator'] = disabled_indicator
-        if filter_for:
-            for key, value in filter_for.items():
-                self.add_filter_for(key, value)
         if additional_query_params:
             for key, value in additional_query_params.items():
                 self.add_additional_query_param(key, value)
 
-    def add_filter_for(self, name, value):
-        """
-        Add details for an additional query param in the form of a data-filter-for-* attribute.
-
-        :param name: The name of the query param
-        :param value: The value of the query param
-        """
-        self.attrs['data-filter-for-{}'.format(name)] = value
-
     def add_additional_query_param(self, name, value):
         """
         Add details for an additional query param in the form of a data-* JSON-encoded list attribute.

From 779686425a1d695b4f38e75575c430c81f950301 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 13:20:30 -0400
Subject: [PATCH 458/505] Use brief mode when fetching cable termination
 objects

---
 netbox/dcim/forms.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index fe08822a5..1ea9f7d72 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3426,8 +3426,7 @@ class ConnectCableToConsolePortForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3440,8 +3439,7 @@ class ConnectCableToConsoleServerPortForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3454,8 +3452,7 @@ class ConnectCableToPowerPortForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3468,8 +3465,7 @@ class ConnectCableToPowerOutletForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3483,8 +3479,7 @@ class ConnectCableToInterfaceForm(ConnectCableToDeviceForm):
             'kind': 'physical',
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3497,8 +3492,7 @@ class ConnectCableToFrontPortForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3511,8 +3505,7 @@ class ConnectCableToRearPortForm(ConnectCableToDeviceForm):
             'device_id': '$termination_b_device'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3545,8 +3538,7 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
             'circuit_id': '$termination_b_circuit'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 
@@ -3594,8 +3586,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
             'power_panel_id': '$termination_b_powerpanel'
         },
         widget=APISelect(
-            disabled_indicator='cable',
-            full=True
+            disabled_indicator='cable'
         )
     )
 

From e9e77fc6892c368e1e2d9fce918328531b0b67ec Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 13:30:49 -0400
Subject: [PATCH 459/505] Add disabled_indicator to DynamicModelChoiceMixin

---
 netbox/dcim/forms.py             | 54 +++++++++++---------------------
 netbox/utilities/forms/fields.py | 10 +++++-
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 1ea9f7d72..7824f0346 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3422,12 +3422,10 @@ class ConnectCableToConsolePortForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=ConsolePort.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3435,12 +3433,10 @@ class ConnectCableToConsoleServerPortForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=ConsoleServerPort.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3448,12 +3444,10 @@ class ConnectCableToPowerPortForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=PowerPort.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3461,12 +3455,10 @@ class ConnectCableToPowerOutletForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=PowerOutlet.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3474,13 +3466,11 @@ class ConnectCableToInterfaceForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device',
             'kind': 'physical',
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3488,12 +3478,10 @@ class ConnectCableToFrontPortForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=FrontPort.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3501,12 +3489,10 @@ class ConnectCableToRearPortForm(ConnectCableToDeviceForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=RearPort.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'device_id': '$termination_b_device'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
 
@@ -3534,12 +3520,10 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         queryset=CircuitTermination.objects.all(),
         label='Side',
         display_field='term_side',
+        disabled_indicator='cable',
         query_params={
             'circuit_id': '$termination_b_circuit'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
     class Meta:
@@ -3582,12 +3566,10 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, forms.ModelForm):
     termination_b_id = DynamicModelChoiceField(
         queryset=PowerFeed.objects.all(),
         label='Name',
+        disabled_indicator='cable',
         query_params={
             'power_panel_id': '$termination_b_powerpanel'
-        },
-        widget=APISelect(
-            disabled_indicator='cable'
-        )
+        }
     )
 
     class Meta:
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 398a8a0e8..fa5b86d7b 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -249,14 +249,18 @@ class DynamicModelChoiceMixin:
     :param display_field: The name of the attribute of an API response object to display in the selection list
     :param query_params: A dictionary of additional key/value pairs to attach to the API request
     :param null_option: The string used to represent a null selection (if any)
+    :param disabled_indicator: The name of the field which, if populated, will disable selection of the
+        choice (optional)
     """
     filter = django_filters.ModelChoiceFilter
     widget = widgets.APISelect
 
-    def __init__(self, *args, display_field='name', query_params=None, null_option=None, **kwargs):
+    def __init__(self, *args, display_field='name', query_params=None, null_option=None, disabled_indicator=None,
+                 **kwargs):
         self.display_field = display_field
         self.query_params = query_params or {}
         self.null_option = null_option
+        self.disabled_indicator = disabled_indicator
 
         # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference
         # by widget_attrs()
@@ -277,6 +281,10 @@ class DynamicModelChoiceMixin:
         if self.null_option is not None:
             attrs['data-null-option'] = self.null_option
 
+        # Set the disabled indicator, if any
+        if self.disabled_indicator is not None:
+            attrs['disabled-indicator'] = self.disabled_indicator
+
         # Attach any static query parameters
         for key, value in self.query_params.items():
             widget.add_additional_query_param(key, value)

From 9e14e28d89c3d755bd7f7bbd7e10bc57cc4dbacf Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 13:57:34 -0400
Subject: [PATCH 460/505] Remove unused arguments from APISelect widget

---
 netbox/dcim/forms.py              | 10 ++++------
 netbox/utilities/forms/widgets.py | 24 ++----------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 7824f0346..71e5bc10f 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1686,9 +1686,9 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         help_text="The lowest-numbered unit occupied by the device",
         widget=APISelect(
             api_url='/api/dcim/racks/{{rack}}/elevation/',
-            disabled_indicator='device',
-            additional_query_params={
-                'face': '$face'
+            attrs={
+                'disabled-indicator': 'device',
+                'data-additional-query-param-face': "[\"$face\"]",
             }
         )
     )
@@ -2077,9 +2077,7 @@ class DeviceFilterForm(BootstrapMixin, LocalConfigContextFilterForm, TenancyFilt
     role = DynamicModelMultipleChoiceField(
         queryset=DeviceRole.objects.all(),
         to_field_name='slug',
-        required=False,
-        widget=APISelectMultiple(
-        )
+        required=False
     )
     manufacturer = DynamicModelMultipleChoiceField(
         queryset=Manufacturer.objects.all(),
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 58aca97c7..fc4c83545 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -123,22 +123,9 @@ class APISelect(SelectWithDisabled):
     A select widget populated via an API call
 
     :param api_url: API endpoint URL. Required if not set automatically by the parent field.
-    :param display_field: (Optional) Field to display for child in selection list. Defaults to `name`.
-    :param disabled_indicator: (Optional) Mark option as disabled if this field equates true.
-    :param additional_query_params: Optional) A dict of query params to append to the API request. The key is the
-        name of the query param and the value if the query param's value.
+    :param full: Omit brief=true when fetching REST API results
     """
-    def __init__(
-        self,
-        api_url=None,
-        display_field=None,
-        disabled_indicator=None,
-        additional_query_params=None,
-        full=False,
-        *args,
-        **kwargs
-    ):
-
+    def __init__(self, api_url=None, full=False, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.attrs['class'] = 'netbox-select2-api'
@@ -146,13 +133,6 @@ class APISelect(SelectWithDisabled):
             self.attrs['data-url'] = '/{}{}'.format(settings.BASE_PATH, api_url.lstrip('/'))  # Inject BASE_PATH
         if full:
             self.attrs['data-full'] = full
-        if display_field:
-            self.attrs['display-field'] = display_field
-        if disabled_indicator:
-            self.attrs['disabled-indicator'] = disabled_indicator
-        if additional_query_params:
-            for key, value in additional_query_params.items():
-                self.add_additional_query_param(key, value)
 
     def add_additional_query_param(self, name, value):
         """

From c40df97ffa11b43bd44ec966092b113c89c50ccc Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 13:59:11 -0400
Subject: [PATCH 461/505] Rename add_additional_query_param()

---
 netbox/dcim/forms.py              | 14 +++++++-------
 netbox/utilities/forms/fields.py  |  2 +-
 netbox/utilities/forms/widgets.py |  2 +-
 netbox/virtualization/forms.py    | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 71e5bc10f..0b9e2af0a 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1809,7 +1809,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
 
             # If editing an existing device, exclude it from the list of occupied rack units. This ensures that a device
             # can be flipped from one face to another.
-            self.fields['position'].widget.add_additional_query_param('exclude', self.instance.pk)
+            self.fields['position'].widget.add_query_param('exclude', self.instance.pk)
 
             # Limit platform by manufacturer
             self.fields['platform'].queryset = Platform.objects.filter(
@@ -2673,8 +2673,8 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         )
 
         # Add current site to VLANs query params
-        self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', device.site.pk)
-        self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
+        self.fields['untagged_vlan'].widget.add_query_param('site_id', device.site.pk)
+        self.fields['tagged_vlans'].widget.add_query_param('site_id', device.site.pk)
 
 
 class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
@@ -2748,8 +2748,8 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
         )
 
         # Add current site to VLANs query params
-        self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', device.site.pk)
-        self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
+        self.fields['untagged_vlan'].widget.add_query_param('site_id', device.site.pk)
+        self.fields['tagged_vlans'].widget.add_query_param('site_id', device.site.pk)
 
 
 class InterfaceBulkCreateForm(
@@ -2813,8 +2813,8 @@ class InterfaceBulkEditForm(
             )
 
             # Add current site to VLANs query params
-            self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', device.site.pk)
-            self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', device.site.pk)
+            self.fields['untagged_vlan'].widget.add_query_param('site_id', device.site.pk)
+            self.fields['tagged_vlans'].widget.add_query_param('site_id', device.site.pk)
         else:
             self.fields['lag'].choices = ()
             self.fields['lag'].widget.attrs['disabled'] = True
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index fa5b86d7b..654c3b1b3 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -287,7 +287,7 @@ class DynamicModelChoiceMixin:
 
         # Attach any static query parameters
         for key, value in self.query_params.items():
-            widget.add_additional_query_param(key, value)
+            widget.add_query_param(key, value)
 
         return attrs
 
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index fc4c83545..0ae7594ec 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -134,7 +134,7 @@ class APISelect(SelectWithDisabled):
         if full:
             self.attrs['data-full'] = full
 
-    def add_additional_query_param(self, name, value):
+    def add_query_param(self, name, value):
         """
         Add details for an additional query param in the form of a data-* JSON-encoded list attribute.
 
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index c3b243978..f63f40d2b 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -572,8 +572,8 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
         # Add current site to VLANs query params
         site = virtual_machine.site
         if site:
-            self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
-            self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
+            self.fields['untagged_vlan'].widget.add_query_param('site_id', site.pk)
+            self.fields['tagged_vlans'].widget.add_query_param('site_id', site.pk)
 
     def clean(self):
         super().clean()
@@ -655,8 +655,8 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
         # Add current site to VLANs query params
         site = virtual_machine.site
         if site:
-            self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
-            self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
+            self.fields['untagged_vlan'].widget.add_query_param('site_id', site.pk)
+            self.fields['tagged_vlans'].widget.add_query_param('site_id', site.pk)
 
 
 class VMInterfaceCSVForm(CSVModelForm):
@@ -746,8 +746,8 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
             site = getattr(parent_obj.cluster, 'site', None)
             if site is not None:
                 # Add current site to VLANs query params
-                self.fields['untagged_vlan'].widget.add_additional_query_param('site_id', site.pk)
-                self.fields['tagged_vlans'].widget.add_additional_query_param('site_id', site.pk)
+                self.fields['untagged_vlan'].widget.add_query_param('site_id', site.pk)
+                self.fields['tagged_vlans'].widget.add_query_param('site_id', site.pk)
 
 
 class VMInterfaceBulkRenameForm(BulkRenameForm):

From 53724927850d3dc7fdc8cf857c26a9317700abde Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 14:03:58 -0400
Subject: [PATCH 462/505] Clean up Select2 widget Javascript

---
 netbox/dcim/forms.py              |  2 +-
 netbox/project-static/js/forms.js | 27 +++------------------------
 netbox/utilities/forms/widgets.py |  2 +-
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 0b9e2af0a..85a3d20cc 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1688,7 +1688,7 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
             api_url='/api/dcim/racks/{{rack}}/elevation/',
             attrs={
                 'disabled-indicator': 'device',
-                'data-additional-query-param-face': "[\"$face\"]",
+                'data-query-param-face': "[\"$face\"]",
             }
         )
     )
diff --git a/netbox/project-static/js/forms.js b/netbox/project-static/js/forms.js
index 051b506ed..0feb7fc2f 100644
--- a/netbox/project-static/js/forms.js
+++ b/netbox/project-static/js/forms.js
@@ -157,31 +157,10 @@ $(document).ready(function() {
                 // Allow for controlling the brief setting from within APISelect
                 parameters.brief = ( $(element).is('[data-full]') ? undefined : true );
 
-                // filter-for fields from a chain
-                var attr_name = "data-filter-for-" + $(element).attr("name");
-                var form = $(element).closest('form');
-                var filter_for_elements = form.find("select[" + attr_name + "]");
-
-                filter_for_elements.each(function(index, filter_for_element) {
-                    var param_name = $(filter_for_element).attr(attr_name);
-                    var is_required = $(filter_for_element).attr("required");
-                    var is_nullable = $(filter_for_element).attr("data-null-option");
-                    var is_visible = $(filter_for_element).is(":visible");
-                    var value = $(filter_for_element).val();
-
-                    if (param_name && is_visible) {
-                        if (value) {
-                            parameters[param_name] = value;
-                        } else if (is_required && is_nullable) {
-                            parameters[param_name] = "null";
-                        }
-                    }
-                });
-
-                // Additional query params
+                // Attach any extra query parameters
                 $.each(element.attributes, function(index, attr){
-                    if (attr.name.includes("data-additional-query-param-")){
-                        var param_name = attr.name.split("data-additional-query-param-")[1];
+                    if (attr.name.includes("data-query-param-")){
+                        var param_name = attr.name.split("data-query-param-")[1];
 
                         $.each($.parseJSON(attr.value), function(index, value) {
                             // Referencing the value of another form field
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 0ae7594ec..42d09c1f4 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -141,7 +141,7 @@ class APISelect(SelectWithDisabled):
         :param name: The name of the query param
         :param value: The value of the query param
         """
-        key = f'data-additional-query-param-{name}'
+        key = f'data-query-param-{name}'
 
         values = json.loads(self.attrs.get(key, '[]'))
         if type(value) is list:

From b891b407d44d14c99f1c30076105a69bcd761688 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 14:15:34 -0400
Subject: [PATCH 463/505] Add brief_mode to DynamicModelChoiceMixin

---
 netbox/circuits/forms.py          |  6 +++---
 netbox/dcim/forms.py              | 26 ++++++++++++-------------
 netbox/secrets/forms.py           |  4 ++--
 netbox/utilities/forms/fields.py  | 10 ++++++++--
 netbox/utilities/forms/widgets.py |  3 ---
 netbox/virtualization/forms.py    | 32 +++++++++++++++----------------
 6 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 23540a507..5e5a88080 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -8,9 +8,9 @@ from extras.models import Tag
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    APISelectMultiple, add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField, CSVModelChoiceField,
-    CSVModelForm, DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SmallTextarea, SlugField,
-    StaticSelect2, StaticSelect2Multiple, TagFilterField,
+    add_blank_choice, BootstrapMixin, CommentField, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DatePicker,
+    DynamicModelChoiceField, DynamicModelMultipleChoiceField, SmallTextarea, SlugField, StaticSelect2,
+    StaticSelect2Multiple, TagFilterField,
 )
 from .choices import CircuitStatusChoices
 from .models import Circuit, CircuitTermination, CircuitType, Provider
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 85a3d20cc..4c3a68577 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -21,7 +21,7 @@ from ipam.models import IPAddress, VLAN
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant, TenantGroup
 from utilities.forms import (
-    APISelect, APISelectMultiple, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
+    APISelect, add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
     ColorSelect, CommentField, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
     DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, NumericArrayField, SelectWithPK,
     SmallTextarea, SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
@@ -2619,20 +2619,20 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         required=False,
         label='Untagged VLAN',
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         label='Tagged VLANs',
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -2716,19 +2716,19 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
     field_order = (
         'device', 'name_pattern', 'label_pattern', 'type', 'enabled', 'lag', 'mtu', 'mac_address', 'description',
@@ -2781,19 +2781,19 @@ class InterfaceBulkEditForm(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
 
     class Meta:
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index d0ef5ba3a..281559800 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -8,8 +8,8 @@ from extras.forms import (
 )
 from extras.models import Tag
 from utilities.forms import (
-    APISelectMultiple, BootstrapMixin, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
-    DynamicModelMultipleChoiceField, SlugField, StaticSelect2Multiple, TagFilterField,
+    BootstrapMixin, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField, DynamicModelMultipleChoiceField,
+    SlugField, TagFilterField,
 )
 from .constants import *
 from .models import Secret, SecretRole, UserKey
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 654c3b1b3..6146e00d3 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -251,16 +251,18 @@ class DynamicModelChoiceMixin:
     :param null_option: The string used to represent a null selection (if any)
     :param disabled_indicator: The name of the field which, if populated, will disable selection of the
         choice (optional)
+    :param brief_mode: Use the "brief" format (?brief=true) when making API requests (default)
     """
     filter = django_filters.ModelChoiceFilter
     widget = widgets.APISelect
 
-    def __init__(self, *args, display_field='name', query_params=None, null_option=None, disabled_indicator=None,
-                 **kwargs):
+    def __init__(self, display_field='name', query_params=None, null_option=None, disabled_indicator=None,
+                 brief_mode=True, *args, **kwargs):
         self.display_field = display_field
         self.query_params = query_params or {}
         self.null_option = null_option
         self.disabled_indicator = disabled_indicator
+        self.brief_mode = brief_mode
 
         # to_field_name is set by ModelChoiceField.__init__(), but we need to set it early for reference
         # by widget_attrs()
@@ -285,6 +287,10 @@ class DynamicModelChoiceMixin:
         if self.disabled_indicator is not None:
             attrs['disabled-indicator'] = self.disabled_indicator
 
+        # Toggle brief mode
+        if not self.brief_mode:
+            attrs['data-full'] = 'true'
+
         # Attach any static query parameters
         for key, value in self.query_params.items():
             widget.add_query_param(key, value)
diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 42d09c1f4..9bda413bd 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -123,7 +123,6 @@ class APISelect(SelectWithDisabled):
     A select widget populated via an API call
 
     :param api_url: API endpoint URL. Required if not set automatically by the parent field.
-    :param full: Omit brief=true when fetching REST API results
     """
     def __init__(self, api_url=None, full=False, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -131,8 +130,6 @@ class APISelect(SelectWithDisabled):
         self.attrs['class'] = 'netbox-select2-api'
         if api_url:
             self.attrs['data-url'] = '/{}{}'.format(settings.BASE_PATH, api_url.lstrip('/'))  # Inject BASE_PATH
-        if full:
-            self.attrs['data-full'] = full
 
     def add_query_param(self, name, value):
         """
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index f63f40d2b..bd39da05b 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -13,10 +13,10 @@ from ipam.models import IPAddress, VLAN
 from tenancy.forms import TenancyFilterForm, TenancyForm
 from tenancy.models import Tenant
 from utilities.forms import (
-    add_blank_choice, APISelect, APISelectMultiple, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect,
-    BulkRenameForm, CommentField, ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm,
-    DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField,
-    SlugField, SmallTextarea, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
+    add_blank_choice, BootstrapMixin, BulkEditForm, BulkEditNullBooleanSelect, BulkRenameForm, CommentField,
+    ConfirmationForm, CSVChoiceField, CSVModelChoiceField, CSVModelForm, DynamicModelChoiceField,
+    DynamicModelMultipleChoiceField, ExpandableNameField, form_from_model, JSONField, SlugField, SmallTextarea,
+    StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
 from .choices import *
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
@@ -526,19 +526,19 @@ class VMInterfaceForm(BootstrapMixin, forms.ModelForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -626,19 +626,19 @@ class VMInterfaceCreateForm(BootstrapMixin, forms.Form):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -716,19 +716,19 @@ class VMInterfaceBulkEditForm(BootstrapMixin, BulkEditForm):
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelect(full=True)
+        }
     )
     tagged_vlans = DynamicModelMultipleChoiceField(
         queryset=VLAN.objects.all(),
         required=False,
         display_field='display_name',
+        brief_mode=False,
         query_params={
             'site_id': 'null',
-        },
-        widget=APISelectMultiple(full=True)
+        }
     )
 
     class Meta:

From fe1ffdcbb7938623791e1aeb0dd81eca670f7f79 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 14:51:58 -0400
Subject: [PATCH 464/505] Extend ObjectVars to accept display_field,
 query_params, and null_option

---
 netbox/extras/scripts.py | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index c3957d4be..b296e140c 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -170,28 +170,42 @@ class ChoiceVar(ScriptVariable):
 class ObjectVar(ScriptVariable):
     """
     A single object within NetBox.
+
+    :param model: The NetBox model being referenced
+    :param display_field: The attribute of the returned object to display in the selection list (default: 'name')
+    :param query_params: A dictionary of additional query parameters to attach when making REST API requests (optional)
+    :param null_option: The label to use as a "null" selection option (optional)
     """
     form_field = DynamicModelChoiceField
 
-    def __init__(self, queryset, *args, **kwargs):
+    def __init__(self, model=None, queryset=None, display_field='name', query_params=None, null_option=None, *args,
+                 **kwargs):
         super().__init__(*args, **kwargs)
 
-        # Queryset for field choices
-        self.field_attrs['queryset'] = queryset
+        # Set the form field's queryset. Support backward compatibility for the "queryset" argument for now.
+        if model is not None:
+            self.field_attrs['queryset'] = model.objects.all()
+        elif queryset is not None:
+            warnings.warn(
+                f'{self}: Specifying a queryset for ObjectVar is no longer supported. Please use "model" instead.'
+            )
+            self.field_attrs['queryset'] = queryset
+        else:
+            raise TypeError('ObjectVar must specify a model')
+
+        self.field_attrs.update({
+            'display_field': display_field,
+            'query_params': query_params,
+            'null_option': null_option,
+        })
 
 
-class MultiObjectVar(ScriptVariable):
+class MultiObjectVar(ObjectVar):
     """
     Like ObjectVar, but can represent one or more objects.
     """
     form_field = DynamicModelMultipleChoiceField
 
-    def __init__(self, queryset, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Queryset for field choices
-        self.field_attrs['queryset'] = queryset
-
 
 class FileVar(ScriptVariable):
     """

From 0b14b667271f853d7ab6346fe5e7bbf169213bc5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 12 Aug 2020 15:40:06 -0400
Subject: [PATCH 465/505] Update ObjectVar documentation

---
 docs/additional-features/custom-scripts.md | 58 ++++++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/docs/additional-features/custom-scripts.md b/docs/additional-features/custom-scripts.md
index f06856502..2416370e3 100644
--- a/docs/additional-features/custom-scripts.md
+++ b/docs/additional-features/custom-scripts.md
@@ -163,12 +163,46 @@ In the example above, selecting the choice labeled "North" will submit the value
 
 ### ObjectVar
 
-A NetBox object of a particular type, identified by the associated queryset.
+A particular object within NetBox. Each ObjectVar must specify a particular model, and allows the user to select one of the available instances. ObjectVar accepts several arguments, listed below.
 
-* `queryset` - The base [Django queryset](https://docs.djangoproject.com/en/stable/topics/db/queries/) for the model
+* `model` - The model class
+* `display_field` - The name of the REST API object field to display in the selection list (default: `'name'`)
+* `query_params` - A dictionary of query parameters to use when retrieving available options (optional)
+* `null_option` - A label representing a "null" or empty choice (optional)
 
-!!! warning
-    Because the available options for this field are populated using the REST API, any filtering or exclusions performed on the specified queryset will not have any effect. While it is possible to influence the manner in which field options are populated using NetBox's `APISelect` widget, please note that this component is not officially supported and is planned to be replaced in a future release.
+The `display_field` argument is useful when referencing a model which does not have a `name` field. For example, when displaying a list of device types, you would likely use the `model` field:
+
+```python
+device_type = ObjectVar(
+    model=DeviceType,
+    display_field='model'
+)
+```
+
+To limit the selections available within the list, additional query parameters can be passed as the `query_params` dictionary. For example, to show only devices with an "active" status:
+
+```python
+device = ObjectVar(
+    model=Device,
+    query_params={
+        'status': 'active'
+    }
+)
+```
+
+Multiple values can be specified by assigning a list to the dictionary key. It is also possible to reference the value of other fields in the form by prepending a dollar sign (`$`) to the variable's name.
+
+```python
+region = ObjectVar(
+    model=Region
+)
+site = ObjectVar(
+    model=Site,
+    query_params={
+        'region_id': '$region'
+    }
+)
+```
 
 ### MultiObjectVar
 
@@ -207,9 +241,8 @@ These variables are presented as a web form to be completed by the user. Once su
 from django.utils.text import slugify
 
 from dcim.choices import DeviceStatusChoices, SiteStatusChoices
-from dcim.models import Device, DeviceRole, DeviceType, Site
+from dcim.models import Device, DeviceRole, DeviceType, Manufacturer, Site
 from extras.scripts import *
-from utilities.forms import APISelect
 
 
 class NewBranchScript(Script):
@@ -225,12 +258,17 @@ class NewBranchScript(Script):
     switch_count = IntegerVar(
         description="Number of access switches to create"
     )
+    manufacturer = ObjectVar(
+        model=Manufacturer,
+        required=False
+    )
     switch_model = ObjectVar(
         description="Access switch model",
-        queryset=DeviceType.objects.all(),
-        widget=APISelect(
-            display_field='model'
-        )
+        model=DeviceType,
+        display_field='model',
+        query_params={
+            'manufacturer_id': '$manufacturer'
+        }
     )
 
     def run(self, data, commit):

From 53f9f82317445e7c9e1a3e7ce47d9402468ae983 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 09:27:21 -0400
Subject: [PATCH 466/505] Set display_field where needed

---
 netbox/dcim/forms.py           | 23 +++++++++++++++++++----
 netbox/ipam/forms.py           |  8 +++++---
 netbox/secrets/forms.py        |  3 ++-
 netbox/virtualization/forms.py |  1 +
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 4c3a68577..8af8df783 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -704,6 +704,7 @@ class RackReservationForm(BootstrapMixin, TenancyForm, forms.ModelForm):
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
+        display_field='display_name',
         query_params={
             'site_id': '$site',
             'group_id': 'rack',
@@ -1999,10 +2000,17 @@ class DeviceBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
         queryset=Device.objects.all(),
         widget=forms.MultipleHiddenInput()
     )
+    manufacturer = DynamicModelChoiceField(
+        queryset=Manufacturer.objects.all(),
+        required=False
+    )
     device_type = DynamicModelChoiceField(
         queryset=DeviceType.objects.all(),
         required=False,
-        display_field='model'
+        display_field='model',
+        query_params={
+            'manufacturer_id': '$manufacturer'
+        }
     )
     device_role = DynamicModelChoiceField(
         queryset=DeviceRole.objects.all(),
@@ -2177,7 +2185,8 @@ class ComponentCreateForm(ComponentForm):
     Base form for the creation of device components (models subclassed from ComponentModel).
     """
     device = DynamicModelChoiceField(
-        queryset=Device.objects.all()
+        queryset=Device.objects.all(),
+        display_field='display_name'
     )
     description = forms.CharField(
         max_length=100,
@@ -3257,7 +3266,8 @@ class DeviceBayCSVForm(CSVModelForm):
 
 class InventoryItemForm(BootstrapMixin, forms.ModelForm):
     device = DynamicModelChoiceField(
-        queryset=Device.objects.prefetch_related('device_type__manufacturer')
+        queryset=Device.objects.all(),
+        display_field='display_name'
     )
     manufacturer = DynamicModelChoiceField(
         queryset=Manufacturer.objects.all(),
@@ -3383,6 +3393,7 @@ class ConnectCableToDeviceForm(BootstrapMixin, forms.ModelForm):
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
+        display_field='display_name',
         null_option='None',
         query_params={
             'site_id': '$termination_b_site'
@@ -3902,6 +3913,7 @@ class VirtualChassisCreateForm(BootstrapMixin, forms.ModelForm):
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
+        display_field='display_name',
         query_params={
             'site_id': '$site'
         }
@@ -4032,6 +4044,7 @@ class VCMemberSelectForm(BootstrapMixin, forms.Form):
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
+        display_field='display_name',
         query_params={
             'site_id': '$site'
         }
@@ -4244,6 +4257,7 @@ class PowerFeedForm(BootstrapMixin, CustomFieldModelForm):
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         required=False,
+        display_field='display_name',
         query_params={
             'site_id': '$site'
         }
@@ -4356,7 +4370,8 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
-        required=False
+        required=False,
+        display_field='display_name'
     )
     status = forms.ChoiceField(
         choices=add_blank_choice(PowerFeedStatusChoices),
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 2e1917b2e..d3c272606 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -250,7 +250,8 @@ class PrefixForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
@@ -498,7 +499,8 @@ class PrefixFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm)
 class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModelForm):
     device = DynamicModelChoiceField(
         queryset=Device.objects.all(),
-        required=False
+        required=False,
+        display_field='display_name'
     )
     interface = DynamicModelChoiceField(
         queryset=Interface.objects.all(),
@@ -561,7 +563,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         display_field='address',
         query_params={
             'device_id': '$nat_device',
-            'vrf_if': '$nat_vrf',
+            'vrf_id': '$nat_vrf',
         }
     )
     primary_for_parent = forms.BooleanField(
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index 281559800..8f04edc5b 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -63,7 +63,8 @@ class SecretRoleCSVForm(CSVModelForm):
 
 class SecretForm(BootstrapMixin, CustomFieldModelForm):
     device = DynamicModelChoiceField(
-        queryset=Device.objects.all()
+        queryset=Device.objects.all(),
+        display_field='display_name'
     )
     plaintext = forms.CharField(
         max_length=SECRET_PLAINTEXT_MAX_LENGTH,
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index bd39da05b..a64a0a7d8 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -208,6 +208,7 @@ class ClusterAddDevicesForm(BootstrapMixin, forms.Form):
         queryset=Rack.objects.all(),
         required=False,
         null_option='None',
+        display_field='display_name',
         query_params={
             'site_id': '$site'
         }

From 3bff9b647c6ec42028541049170c846698527484 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 09:36:06 -0400
Subject: [PATCH 467/505] Changelog for #4922, #4982

---
 docs/release-notes/version-2.9.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 8ac51f050..e8d655ab6 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,10 +6,12 @@
 
 * [#4639](https://github.com/netbox-community/netbox/issues/4639) - Improve performance of web UI prefixes list
 * [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
+* [#4922](https://github.com/netbox-community/netbox/issues/4922) - Optimize schema migration for replicating VM interfaces
 * [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
 * [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
 * [#4946](https://github.com/netbox-community/netbox/issues/4946) - Extend ObjectPermission to OR multiple constraints
 * [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
+* [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
 
 ### Bug Fixes
 

From ed0e212ce0737a8fc96dab2d8bee298a1f899a8c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 10:30:28 -0400
Subject: [PATCH 468/505] Closes #4994: Add cable attribute to PowerFeed API
 serializer

---
 docs/release-notes/version-2.9.md     | 2 ++
 netbox/dcim/api/nested_serializers.py | 2 +-
 netbox/dcim/api/serializers.py        | 3 ++-
 netbox/dcim/tests/test_api.py         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index e8d655ab6..02808945f 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -12,6 +12,7 @@
 * [#4946](https://github.com/netbox-community/netbox/issues/4946) - Extend ObjectPermission to OR multiple constraints
 * [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
 * [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
+* [#4994](https://github.com/netbox-community/netbox/issues/4994) - Add `cable` attribute to PowerFeed API serializer
 
 ### Bug Fixes
 
@@ -99,6 +100,7 @@ When running a report or custom script, its execution is now queued for backgrou
 * dcim.FrontPortTemplate: Added `description` and `label` fields
 * dcim.Interface: Added `label` field
 * dcim.InterfaceTemplate: Added `description` and `label` fields
+* dcim.PowerFeed: Added `cable` field
 * dcim.PowerPanel: Added `tags` field
 * dcim.PowerPort: Added ``label` field
 * dcim.PowerPortTemplate: Added `description` and `label` fields
diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py
index 141aca013..3bc953991 100644
--- a/netbox/dcim/api/nested_serializers.py
+++ b/netbox/dcim/api/nested_serializers.py
@@ -355,4 +355,4 @@ class NestedPowerFeedSerializer(WritableNestedSerializer):
 
     class Meta:
         model = models.PowerFeed
-        fields = ['id', 'url', 'name']
+        fields = ['id', 'url', 'name', 'cable']
diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py
index d33af5b5c..50c1f99ff 100644
--- a/netbox/dcim/api/serializers.py
+++ b/netbox/dcim/api/serializers.py
@@ -782,10 +782,11 @@ class PowerFeedSerializer(TaggedObjectSerializer, CustomFieldModelSerializer):
         choices=PowerFeedPhaseChoices,
         default=PowerFeedPhaseChoices.PHASE_SINGLE
     )
+    cable = NestedCableSerializer(read_only=True)
 
     class Meta:
         model = PowerFeed
         fields = [
             'id', 'url', 'power_panel', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage',
-            'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
+            'max_utilization', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'cable',
         ]
diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py
index b6788eabe..c3ffecdff 100644
--- a/netbox/dcim/tests/test_api.py
+++ b/netbox/dcim/tests/test_api.py
@@ -1959,7 +1959,7 @@ class PowerPanelTest(APIViewTestCases.APIViewTestCase):
 
 class PowerFeedTest(APIViewTestCases.APIViewTestCase):
     model = PowerFeed
-    brief_fields = ['id', 'name', 'url']
+    brief_fields = ['cable', 'id', 'name', 'url']
 
     @classmethod
     def setUpTestData(cls):

From 71c2e235a81811b64408cb8c6065b596156ae494 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 10:32:57 -0400
Subject: [PATCH 469/505] Use display_name in VRF selection widgets

---
 netbox/ipam/forms.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index d3c272606..ced781972 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -381,7 +381,8 @@ class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditF
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     prefix_length = forms.IntegerField(
         min_value=PREFIX_LENGTH_MIN,
@@ -524,7 +525,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     nat_site = DynamicModelChoiceField(
         queryset=Site.objects.all(),
@@ -554,7 +556,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
     nat_vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     nat_inside = DynamicModelChoiceField(
         queryset=IPAddress.objects.all(),
@@ -667,7 +670,8 @@ class IPAddressBulkAddForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     tags = DynamicModelMultipleChoiceField(
         queryset=Tag.objects.all(),
@@ -794,7 +798,8 @@ class IPAddressBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
-        label='VRF'
+        label='VRF',
+        display_field='display_name'
     )
     mask_length = forms.IntegerField(
         min_value=IPADDRESS_MASK_LENGTH_MIN,

From 0e91d837a004357c1eb9f169b995b0ffd9b67944 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 10:42:19 -0400
Subject: [PATCH 470/505] Allow selecting NAT IP address by assigned virtual
 machine

---
 netbox/ipam/forms.py                      | 19 +++++++++++++++++--
 netbox/templates/ipam/ipaddress_edit.html | 13 +++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index ced781972..5f6a28dad 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -13,7 +13,7 @@ from utilities.forms import (
     DatePicker, DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableIPAddressField, ReturnURLForm,
     SlugField, StaticSelect2, StaticSelect2Multiple, TagFilterField, BOOLEAN_WITH_BLANK_CHOICES,
 )
-from virtualization.models import VirtualMachine, VMInterface
+from virtualization.models import Cluster, VirtualMachine, VMInterface
 from .choices import *
 from .constants import *
 from .models import Aggregate, IPAddress, Prefix, RIR, Role, Service, VLAN, VLANGroup, VRF
@@ -553,6 +553,19 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
             'rack_id': '$nat_rack',
         }
     )
+    nat_cluster = DynamicModelChoiceField(
+        queryset=Cluster.objects.all(),
+        required=False,
+        label='Cluster'
+    )
+    nat_virtual_machine = DynamicModelChoiceField(
+        queryset=VirtualMachine.objects.all(),
+        required=False,
+        label='Virtual Machine',
+        query_params={
+            'cluster_id': '$nat_cluster',
+        }
+    )
     nat_vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
@@ -566,6 +579,7 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         display_field='address',
         query_params={
             'device_id': '$nat_device',
+            'virtual_machine_id': '$nat_virtual_machine',
             'vrf_id': '$nat_vrf',
         }
     )
@@ -582,7 +596,8 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
         model = IPAddress
         fields = [
             'address', 'vrf', 'status', 'role', 'dns_name', 'description', 'primary_for_parent', 'nat_site', 'nat_rack',
-            'nat_inside', 'tenant_group', 'tenant', 'tags',
+            'nat_device', 'nat_cluster', 'nat_virtual_machine', 'nat_vrf', 'nat_inside', 'tenant_group', 'tenant',
+            'tags',
         ]
         widgets = {
             'status': StaticSelect2(),
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index 852743c77..e7894dbad 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -56,16 +56,21 @@
         <div class="panel-heading"><strong>NAT IP (Inside)</strong></div>
         <div class="panel-body">
             <ul class="nav nav-tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#select" aria-controls="home" role="tab" data-toggle="tab">By Device</a></li>
-                <li role="presentation"><a href="#search" aria-controls="search" role="tab" data-toggle="tab">By IP</a></li>
+                <li role="presentation" class="active"><a href="#by_device" aria-controls="home" role="tab" data-toggle="tab">By Device</a></li>
+                <li role="presentation"><a href="#by_vm" aria-controls="search" role="tab" data-toggle="tab">By VM</a></li>
+                <li role="presentation"><a href="#by_vrf" aria-controls="search" role="tab" data-toggle="tab">By IP</a></li>
             </ul>
             <div class="tab-content">
-                <div class="tab-pane active" id="select">
+                <div class="tab-pane active" id="by_device">
                     {% render_field form.nat_site %}
                     {% render_field form.nat_rack %}
                     {% render_field form.nat_device %}
                 </div>
-                <div class="tab-pane" id="search">
+                <div class="tab-pane" id="by_vm">
+                    {% render_field form.nat_cluster %}
+                    {% render_field form.nat_virtual_machine %}
+                </div>
+                <div class="tab-pane" id="by_vrf">
                   {% render_field form.nat_vrf %}
                 </div>
             </div>

From e252de319e0bcd8e21f791a67b4573a63105e5bd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 10:45:01 -0400
Subject: [PATCH 471/505] Add region field to device form

---
 netbox/dcim/forms.py                   | 9 ++++++++-
 netbox/templates/dcim/device_edit.html | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 8af8df783..75c99f52b 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -1670,8 +1670,15 @@ class PlatformCSVForm(CSVModelForm):
 #
 
 class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
+    region = DynamicModelChoiceField(
+        queryset=Region.objects.all(),
+        required=False
+    )
     site = DynamicModelChoiceField(
-        queryset=Site.objects.all()
+        queryset=Site.objects.all(),
+        query_params={
+            'region_id': '$region'
+        }
     )
     rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 1486c1ad5..0f1ac2886 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -21,6 +21,7 @@
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Location</strong></div>
         <div class="panel-body">
+            {% render_field form.region %}
             {% render_field form.site %}
             {% render_field form.rack %}
             {% if obj.device_type.is_child_device and obj.parent_bay %}

From bdc4189812cfa994107f4943df6ccb65afb19bf9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 10:53:34 -0400
Subject: [PATCH 472/505] Fixes #4995: Fix missing buttons to add console/power
 ports under device view

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/templates/dcim/device.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 02808945f..915d9e038 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -29,6 +29,7 @@
 * [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creating a new inventory item
 * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
 * [#4968](https://github.com/netbox-community/netbox/issues/4968) - Fix exception when activating user keys in admin UI
+* [#4995](https://github.com/netbox-community/netbox/issues/4995) - Fix missing buttons to add console/power ports under device view
 
 ### Other Changes
 
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 864dddd0c..e97893c30 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -724,7 +724,7 @@
                                         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                     </button>
                                 {% endif %}
-                                {% if consoleports and perms.dcim.add_consoleport %}
+                                {% if perms.dcim.add_consoleport %}
                                     <div class="pull-right">
                                         <a href="{% url 'dcim:consoleport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
                                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add console port
@@ -834,7 +834,7 @@
                                         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                     </button>
                                 {% endif %}
-                                {% if powerports and perms.dcim.add_powerport %}
+                                {% if perms.dcim.add_powerport %}
                                     <div class="pull-right">
                                         <a href="{% url 'dcim:powerport_add' %}?device={{ device.pk }}&return_url={{ device.get_absolute_url }}" class="btn btn-xs btn-primary">
                                             <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add power port

From a08418bff8ae7b2cce397c298fb7362537ddbfef Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 11:14:33 -0400
Subject: [PATCH 473/505] Closes #4996: Add "connect" buttons to individual
 device component views

---
 docs/release-notes/version-2.9.md            |  1 +
 netbox/templates/dcim/consoleport.html       | 12 ++++++++++++
 netbox/templates/dcim/consoleserverport.html | 12 ++++++++++++
 netbox/templates/dcim/frontport.html         | 15 +++++++++++++++
 netbox/templates/dcim/interface.html         | 13 +++++++++++++
 netbox/templates/dcim/poweroutlet.html       |  5 +++++
 netbox/templates/dcim/powerport.html         | 11 +++++++++++
 netbox/templates/dcim/rearport.html          | 13 +++++++++++++
 8 files changed, 82 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 915d9e038..9b49cc1f3 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -13,6 +13,7 @@
 * [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
 * [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
 * [#4994](https://github.com/netbox-community/netbox/issues/4994) - Add `cable` attribute to PowerFeed API serializer
+* [#4996](https://github.com/netbox-community/netbox/issues/4996) - Add "connect" buttons to individual device component views
 
 ### Bug Fixes
 
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index 63916bcc5..3f4d7b306 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -89,6 +89,18 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <span class="dropdown pull-right">
+                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=instance.pk termination_b_type='console-server-port' %}?return_url={{ instance.get_absolute_url }}">Console Server Port</a></li>
+                                    <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=instance.pk termination_b_type='front-port' %}?return_url={{ instance.get_absolute_url }}">Front Port</a></li>
+                                    <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=instance.pk termination_b_type='rear-port' %}?return_url={{ instance.get_absolute_url }}">Rear Port</a></li>
+                                </ul>
+                            </span>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index cdc43142e..77d17fe8a 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -89,6 +89,18 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <span class="dropdown pull-right">
+                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=instance.pk termination_b_type='console-port' %}?return_url={{ instance.get_absolute_url }}">Console Port</a></li>
+                                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=instance.pk termination_b_type='front-port' %}?return_url={{ instance.get_absolute_url }}">Front Port</a></li>
+                                    <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=instance.pk termination_b_type='rear-port' %}?return_url={{ instance.get_absolute_url }}">Rear Port</a></li>
+                                </ul>
+                            </span>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 8ab51cb30..e3c7bcad6 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -77,6 +77,21 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <span class="dropdown pull-right">
+                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                </button>
+                                    <ul class="dropdown-menu dropdown-menu-right">
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='interface' %}?return_url={{ instance.get_absolute_url }}">Interface</a></li>
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='console-server-port' %}?return_url={{ instance.get_absolute_url }}">Console Server Port</a></li>
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='console-port' %}?return_url={{ instance.get_absolute_url }}">Console Port</a></li>
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='front-port' %}?return_url={{ instance.get_absolute_url }}">Front Port</a></li>
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='rear-port' %}?return_url={{ instance.get_absolute_url }}">Rear Port</a></li>
+                                        <li><a href="{% url 'dcim:frontport_connect' termination_a_id=instance.pk termination_b_type='circuit-termination' %}?return_url={{ instance.get_absolute_url }}">Circuit Termination</a></li>
+                                    </ul>
+                            </span>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index e3d67eb2c..7fcf6ab0a 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -169,6 +169,19 @@
                     {% else %}
                         <div class="panel-body text-muted">
                             Not connected
+                            {% if perms.dcim.add_cable %}
+                                <span class="dropdown pull-right">
+                                    <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                    </button>
+                                    <ul class="dropdown-menu dropdown-menu-right">
+                                        <li><a href="{% url 'dcim:interface_connect' termination_a_id=instance.pk termination_b_type='interface' %}?return_url={{ instance.get_absolute_url }}">Interface</a></li>
+                                        <li><a href="{% url 'dcim:interface_connect' termination_a_id=instance.pk termination_b_type='front-port' %}?return_url={{ instance.get_absolute_url }}">Front Port</a></li>
+                                        <li><a href="{% url 'dcim:interface_connect' termination_a_id=instance.pk termination_b_type='rear-port' %}?return_url={{ instance.get_absolute_url }}">Rear Port</a></li>
+                                        <li><a href="{% url 'dcim:interface_connect' termination_a_id=instance.pk termination_b_type='circuit-termination' %}?return_url={{ instance.get_absolute_url }}">Circuit Termination</a></li>
+                                    </ul>
+                                </span>
+                            {% endif %}
                         </div>
                     {% endif %}
                 </div>
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index cddcffd6f..2ea70972b 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -97,6 +97,11 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <a href="{% url 'dcim:poweroutlet_connect' termination_a_id=instance.pk termination_b_type='power-port' %}?return_url={{ instance.get_absolute_url }}" title="Connect" class="btn btn-primary btn-sm pull-right">
+                                <i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i> Connect
+                            </a>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 8642bd8fb..3f3d28899 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -97,6 +97,17 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <span class="dropdown pull-right">
+                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=instance.pk termination_b_type='power-outlet' %}?return_url={{ instance.get_absolute_url }}">Power Outlet</a></li>
+                                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=instance.pk termination_b_type='power-feed' %}?return_url={{ instance.get_absolute_url }}">Power Feed</a></li>
+                                </ul>
+                            </span>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 982d53eaa..23246602a 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -71,6 +71,19 @@
                 {% else %}
                     <div class="panel-body text-muted">
                         Not connected
+                        {% if perms.dcim.add_cable %}
+                            <span class="dropdown pull-right">
+                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
+                                </button>
+                                <ul class="dropdown-menu dropdown-menu-right">
+                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=instance.pk termination_b_type='interface' %}?return_url={{ instance.get_absolute_url }}">Interface</a></li>
+                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=instance.pk termination_b_type='front-port' %}?return_url={{ instance.get_absolute_url }}">Front Port</a></li>
+                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=instance.pk termination_b_type='rear-port' %}?return_url={{ instance.get_absolute_url }}">Rear Port</a></li>
+                                    <li><a href="{% url 'dcim:rearport_connect' termination_a_id=instance.pk termination_b_type='circuit-termination' %}?return_url={{ instance.get_absolute_url }}">Circuit Termination</a></li>
+                                </ul>
+                            </span>
+                        {% endif %}
                     </div>
                 {% endif %}
             </div>

From fd139a77f572f02fcb31e173772cf7547ec3a50d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 12:45:38 -0400
Subject: [PATCH 474/505] Closes #4997: Introduce OrderedDefaultRouter; move
 root API views to views.py

---
 docs/release-notes/version-2.9.md  |  1 +
 netbox/circuits/api/urls.py        | 15 +++------------
 netbox/circuits/api/views.py       |  9 +++++++++
 netbox/dcim/api/urls.py            | 15 +++------------
 netbox/dcim/api/views.py           |  9 +++++++++
 netbox/extras/api/urls.py          | 15 +++------------
 netbox/extras/api/views.py         |  9 +++++++++
 netbox/ipam/api/urls.py            | 15 +++------------
 netbox/ipam/api/views.py           | 11 ++++++++++-
 netbox/secrets/api/urls.py         | 15 +++------------
 netbox/secrets/api/views.py        |  9 +++++++++
 netbox/tenancy/api/urls.py         | 15 +++------------
 netbox/tenancy/api/views.py        | 10 ++++++++++
 netbox/users/api/urls.py           | 15 +++------------
 netbox/users/api/views.py          |  9 +++++++++
 netbox/utilities/api.py            | 19 +++++++++++++++++++
 netbox/virtualization/api/urls.py  | 15 +++------------
 netbox/virtualization/api/views.py |  9 +++++++++
 18 files changed, 118 insertions(+), 97 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 9b49cc1f3..c3ee1e827 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -14,6 +14,7 @@
 * [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
 * [#4994](https://github.com/netbox-community/netbox/issues/4994) - Add `cable` attribute to PowerFeed API serializer
 * [#4996](https://github.com/netbox-community/netbox/issues/4996) - Add "connect" buttons to individual device component views
+* [#4997](https://github.com/netbox-community/netbox/issues/4997) - The browsable API now lists available endpoints alphabetically
 
 ### Bug Fixes
 
diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py
index 01fbfb62c..0bcb2d280 100644
--- a/netbox/circuits/api/urls.py
+++ b/netbox/circuits/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class CircuitsRootView(routers.APIRootView):
-    """
-    Circuits API root view
-    """
-    def get_view_name(self):
-        return 'Circuits'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = CircuitsRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.CircuitsRootView
 
 # Providers
 router.register('providers', views.ProviderViewSet)
diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py
index fec22f604..746ee02f6 100644
--- a/netbox/circuits/api/views.py
+++ b/netbox/circuits/api/views.py
@@ -2,6 +2,7 @@ from django.db.models import Count, Prefetch
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 
 from circuits import filters
 from circuits.models import Provider, CircuitTermination, CircuitType, Circuit
@@ -12,6 +13,14 @@ from utilities.api import ModelViewSet
 from . import serializers
 
 
+class CircuitsRootView(APIRootView):
+    """
+    Circuits API root view
+    """
+    def get_view_name(self):
+        return 'Circuits'
+
+
 #
 # Providers
 #
diff --git a/netbox/dcim/api/urls.py b/netbox/dcim/api/urls.py
index f989d817c..e8c4fbe1d 100644
--- a/netbox/dcim/api/urls.py
+++ b/netbox/dcim/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class DCIMRootView(routers.APIRootView):
-    """
-    DCIM API root view
-    """
-    def get_view_name(self):
-        return 'DCIM'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = DCIMRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.DCIMRootView
 
 # Sites
 router.register('regions', views.RegionViewSet)
diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py
index d7bb8b09c..f5b37021d 100644
--- a/netbox/dcim/api/views.py
+++ b/netbox/dcim/api/views.py
@@ -11,6 +11,7 @@ from drf_yasg.utils import swagger_auto_schema
 from rest_framework.decorators import action
 from rest_framework.mixins import ListModelMixin
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 from rest_framework.viewsets import GenericViewSet, ViewSet
 
 from circuits.models import Circuit
@@ -36,6 +37,14 @@ from . import serializers
 from .exceptions import MissingFilterException
 
 
+class DCIMRootView(APIRootView):
+    """
+    DCIM API root view
+    """
+    def get_view_name(self):
+        return 'DCIM'
+
+
 # Mixins
 
 class CableTraceMixin(object):
diff --git a/netbox/extras/api/urls.py b/netbox/extras/api/urls.py
index 9927215df..9c50c9a45 100644
--- a/netbox/extras/api/urls.py
+++ b/netbox/extras/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class ExtrasRootView(routers.APIRootView):
-    """
-    Extras API root view
-    """
-    def get_view_name(self):
-        return 'Extras'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = ExtrasRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.ExtrasRootView
 
 # Custom field choices
 router.register('_custom_field_choices', views.CustomFieldChoicesViewSet, basename='custom-field-choice')
diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 1e4886634..289a51c83 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -8,6 +8,7 @@ from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
 from rq import Worker
 
@@ -25,6 +26,14 @@ from utilities.utils import copy_safe_request
 from . import serializers
 
 
+class ExtrasRootView(APIRootView):
+    """
+    Extras API root view
+    """
+    def get_view_name(self):
+        return 'Extras'
+
+
 #
 # Custom field choices
 #
diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py
index ff0ea32a8..e297d6451 100644
--- a/netbox/ipam/api/urls.py
+++ b/netbox/ipam/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class IPAMRootView(routers.APIRootView):
-    """
-    IPAM API root view
-    """
-    def get_view_name(self):
-        return 'IPAM'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = IPAMRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.IPAMRootView
 
 # VRFs
 router.register('vrfs', views.VRFViewSet)
diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py
index 8abf2e551..0d273e4d8 100644
--- a/netbox/ipam/api/views.py
+++ b/netbox/ipam/api/views.py
@@ -1,11 +1,12 @@
 from django.conf import settings
-from django.db.models import Count, Prefetch
+from django.db.models import Count
 from django.shortcuts import get_object_or_404
 from django_pglocks import advisory_lock
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 
 from extras.api.views import CustomFieldModelViewSet
 from ipam import filters
@@ -16,6 +17,14 @@ from utilities.utils import get_subquery
 from . import serializers
 
 
+class IPAMRootView(APIRootView):
+    """
+    IPAM API root view
+    """
+    def get_view_name(self):
+        return 'IPAM'
+
+
 #
 # VRFs
 #
diff --git a/netbox/secrets/api/urls.py b/netbox/secrets/api/urls.py
index 7ae2ae9ac..5ad05b09e 100644
--- a/netbox/secrets/api/urls.py
+++ b/netbox/secrets/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class SecretsRootView(routers.APIRootView):
-    """
-    Secrets API root view
-    """
-    def get_view_name(self):
-        return 'Secrets'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = SecretsRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.SecretsRootView
 
 # Secrets
 router.register('secret-roles', views.SecretRoleViewSet)
diff --git a/netbox/secrets/api/views.py b/netbox/secrets/api/views.py
index 4c88e30ea..7db6f92b6 100644
--- a/netbox/secrets/api/views.py
+++ b/netbox/secrets/api/views.py
@@ -6,6 +6,7 @@ from django.http import HttpResponseBadRequest
 from rest_framework.exceptions import ValidationError
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 from rest_framework.viewsets import ViewSet
 
 from secrets import filters
@@ -20,6 +21,14 @@ ERR_PRIVKEY_MISSING = "Private key was not provided."
 ERR_PRIVKEY_INVALID = "Invalid private key."
 
 
+class SecretsRootView(APIRootView):
+    """
+    Secrets API root view
+    """
+    def get_view_name(self):
+        return 'Secrets'
+
+
 #
 # Secret Roles
 #
diff --git a/netbox/tenancy/api/urls.py b/netbox/tenancy/api/urls.py
index 645cc2edc..ad4424005 100644
--- a/netbox/tenancy/api/urls.py
+++ b/netbox/tenancy/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class TenancyRootView(routers.APIRootView):
-    """
-    Tenancy API root view
-    """
-    def get_view_name(self):
-        return 'Tenancy'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = TenancyRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.TenancyRootView
 
 # Tenants
 router.register('tenant-groups', views.TenantGroupViewSet)
diff --git a/netbox/tenancy/api/views.py b/netbox/tenancy/api/views.py
index 652544b21..065d3a9f3 100644
--- a/netbox/tenancy/api/views.py
+++ b/netbox/tenancy/api/views.py
@@ -1,3 +1,5 @@
+from rest_framework.routers import APIRootView
+
 from circuits.models import Circuit
 from dcim.models import Device, Rack, Site
 from extras.api.views import CustomFieldModelViewSet
@@ -10,6 +12,14 @@ from virtualization.models import VirtualMachine
 from . import serializers
 
 
+class TenancyRootView(APIRootView):
+    """
+    Tenancy API root view
+    """
+    def get_view_name(self):
+        return 'Tenancy'
+
+
 #
 # Tenant Groups
 #
diff --git a/netbox/users/api/urls.py b/netbox/users/api/urls.py
index a81b56bed..c52c6c87f 100644
--- a/netbox/users/api/urls.py
+++ b/netbox/users/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class UsersRootView(routers.APIRootView):
-    """
-    Users API root view
-    """
-    def get_view_name(self):
-        return 'Users'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = UsersRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.UsersRootView
 
 # Users and groups
 router.register('users', views.UserViewSet)
diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index a971592e0..a3536e960 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.models import Group, User
 from django.db.models import Count
+from rest_framework.routers import APIRootView
 
 from users import filters
 from users.models import ObjectPermission
@@ -8,6 +9,14 @@ from utilities.querysets import RestrictedQuerySet
 from . import serializers
 
 
+class UsersRootView(APIRootView):
+    """
+    Users API root view
+    """
+    def get_view_name(self):
+        return 'Users'
+
+
 #
 # Users and groups
 #
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 1a0f912ba..cc9789161 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -13,6 +13,7 @@ from rest_framework.exceptions import APIException, ValidationError
 from rest_framework.permissions import BasePermission
 from rest_framework.relations import PrimaryKeyRelatedField, RelatedField
 from rest_framework.response import Response
+from rest_framework.routers import DefaultRouter
 from rest_framework.viewsets import ModelViewSet as _ModelViewSet
 
 from .utils import dict_to_filter_params, dynamic_import
@@ -399,3 +400,21 @@ class ModelViewSet(_ModelViewSet):
         logger.info(f"Deleting {model._meta.verbose_name} {instance} (PK: {instance.pk})")
 
         return super().perform_destroy(instance)
+
+
+#
+# Routers
+#
+
+class OrderedDefaultRouter(DefaultRouter):
+
+    def get_api_root_view(self, api_urls=None):
+        """
+        Wrap DRF's DefaultRouter to return an alphabetized list of endpoints.
+        """
+        api_root_dict = OrderedDict()
+        list_name = self.routes[0].name
+        for prefix, viewset, basename in sorted(self.registry, key=lambda x: x[0]):
+            api_root_dict[prefix] = list_name.format(basename=basename)
+
+        return self.APIRootView.as_view(api_root_dict=api_root_dict)
diff --git a/netbox/virtualization/api/urls.py b/netbox/virtualization/api/urls.py
index 3f6c56a48..c40202a7d 100644
--- a/netbox/virtualization/api/urls.py
+++ b/netbox/virtualization/api/urls.py
@@ -1,18 +1,9 @@
-from rest_framework import routers
-
+from utilities.api import OrderedDefaultRouter
 from . import views
 
 
-class VirtualizationRootView(routers.APIRootView):
-    """
-    Virtualization API root view
-    """
-    def get_view_name(self):
-        return 'Virtualization'
-
-
-router = routers.DefaultRouter()
-router.APIRootView = VirtualizationRootView
+router = OrderedDefaultRouter()
+router.APIRootView = views.VirtualizationRootView
 
 # Clusters
 router.register('cluster-types', views.ClusterTypeViewSet)
diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py
index 62a551df3..1bf41c2b7 100644
--- a/netbox/virtualization/api/views.py
+++ b/netbox/virtualization/api/views.py
@@ -2,6 +2,7 @@ from django.db.models import Count
 from django.shortcuts import get_object_or_404
 from rest_framework.decorators import action
 from rest_framework.response import Response
+from rest_framework.routers import APIRootView
 
 from dcim.models import Device
 from extras.api.serializers import RenderedGraphSerializer
@@ -14,6 +15,14 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac
 from . import serializers
 
 
+class VirtualizationRootView(APIRootView):
+    """
+    Virtualization API root view
+    """
+    def get_view_name(self):
+        return 'Virtualization'
+
+
 #
 # Clusters
 #

From d4fd0df02c08348887839409c1b691703ed8e660 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 13:04:33 -0400
Subject: [PATCH 475/505] Release v2.9-beta2

---
 docs/release-notes/version-2.9.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index c3ee1e827..5e7d3a906 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,6 +1,8 @@
 # NetBox v2.9
 
-## v2.9-beta2 (FUTURE)
+## v2.9-beta2 (2020-08-13)
+
+**WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.
 
 ### Enhancements
 

From 943c2230bac0c0d6fd4309969385926f4bbec4b4 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 13 Aug 2020 13:12:09 -0400
Subject: [PATCH 476/505] Bump version for upcoming v2.9 release

---
 netbox/netbox/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index a46709053..af9a9d2c8 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.9-beta2'
+VERSION = '2.9.0'
 
 # Hostname
 HOSTNAME = platform.node()

From 808d621eda21f2dd3096a00405fd3ae59d31fc1d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 14 Aug 2020 10:09:54 -0400
Subject: [PATCH 477/505] VC member selection should use display_name

---
 netbox/dcim/forms.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 75c99f52b..c9a7092f5 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3928,6 +3928,7 @@ class VirtualChassisCreateForm(BootstrapMixin, forms.ModelForm):
     members = DynamicModelMultipleChoiceField(
         queryset=Device.objects.all(),
         required=False,
+        display_field='display_name',
         query_params={
             'site_id': '$site',
             'rack_id': '$rack',

From 66c91484f5d9ead4080719ffdf7c1463cc300f48 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 14 Aug 2020 10:20:34 -0400
Subject: [PATCH 478/505] Clean up display_name for various models

---
 netbox/dcim/models/__init__.py | 19 +++++++++----------
 netbox/ipam/models.py          |  6 ++----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 2803bb8de..1caad296f 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -648,10 +648,8 @@ class Rack(ChangeLoggedModel, CustomFieldModel):
     @property
     def display_name(self):
         if self.facility_id:
-            return "{} ({})".format(self.name, self.facility_id)
-        elif self.name:
-            return self.name
-        return ""
+            return f'{self.name} ({self.facility_id})'
+        return self.name
 
     def get_status_class(self):
         return self.STATUS_CLASS_MAP.get(self.status)
@@ -1216,7 +1214,7 @@ class DeviceType(ChangeLoggedModel, CustomFieldModel):
 
     @property
     def display_name(self):
-        return '{} {}'.format(self.manufacturer.name, self.model)
+        return f'{self.manufacturer.name} {self.model}'
 
     @property
     def is_parent_device(self):
@@ -1712,11 +1710,12 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
     def display_name(self):
         if self.name:
             return self.name
-        elif self.virtual_chassis and self.virtual_chassis.master.name:
-            return "{}:{}".format(self.virtual_chassis.master, self.vc_position)
-        elif hasattr(self, 'device_type'):
-            return "{}".format(self.device_type)
-        return ""
+        elif self.virtual_chassis:
+            return f'{self.virtual_chassis.name}:{self.vc_position} ({self.pk})'
+        elif self.device_type:
+            return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})'
+        else:
+            return ''  # Device has not yet been created
 
     @property
     def identifier(self):
diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py
index b6abe3f2d..58dd96089 100644
--- a/netbox/ipam/models.py
+++ b/netbox/ipam/models.py
@@ -107,7 +107,7 @@ class VRF(ChangeLoggedModel, CustomFieldModel):
     @property
     def display_name(self):
         if self.rd:
-            return "{} ({})".format(self.name, self.rd)
+            return f'{self.name} ({self.rd})'
         return self.name
 
 
@@ -985,9 +985,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
 
     @property
     def display_name(self):
-        if self.vid and self.name:
-            return "{} ({})".format(self.vid, self.name)
-        return None
+        return f'{self.name} ({self.vid})'
 
     def get_status_class(self):
         return self.STATUS_CLASS_MAP[self.status]

From b4299241fea39b5cd78dffffc3bfd61db54e8430 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 14 Aug 2020 11:38:15 -0400
Subject: [PATCH 479/505] Cast all query param values to string

---
 netbox/utilities/forms/widgets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/forms/widgets.py b/netbox/utilities/forms/widgets.py
index 9bda413bd..9996f7d11 100644
--- a/netbox/utilities/forms/widgets.py
+++ b/netbox/utilities/forms/widgets.py
@@ -142,9 +142,9 @@ class APISelect(SelectWithDisabled):
 
         values = json.loads(self.attrs.get(key, '[]'))
         if type(value) is list:
-            values.extend(value)
+            values.extend([str(v) for v in value])
         else:
-            values.append(value)
+            values.append(str(value))
 
         self.attrs[key] = json.dumps(values)
 

From 4ee8e473ebc83e264639eeda316bdbb749ff4e51 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 14 Aug 2020 17:03:45 -0400
Subject: [PATCH 480/505] Move ObjectChange creation into signal receivers

---
 netbox/extras/middleware.py   | 133 +++++-----------------------------
 netbox/extras/scripts.py      |   2 -
 netbox/extras/signals.py      |  70 ++++++++++++++++--
 netbox/extras/utils.py        |   4 -
 netbox/utilities/querysets.py |  14 ----
 netbox/utilities/utils.py     |   7 ++
 6 files changed, 89 insertions(+), 141 deletions(-)

diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index c8be8755f..bc77e990d 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -1,64 +1,9 @@
-import random
-import threading
 import uuid
-from copy import deepcopy
-from datetime import timedelta
 
-from django.conf import settings
-from django.contrib import messages
-from django.db.models.signals import pre_delete, post_save
-from django.utils import timezone
-from django_prometheus.models import model_deletes, model_inserts, model_updates
-from redis.exceptions import RedisError
+from django.db.models.signals import m2m_changed, pre_delete, post_save
 
-from extras.utils import is_taggable
-from utilities.api import is_api_request
-from utilities.querysets import DummyQuerySet
-from .choices import ObjectChangeActionChoices
-from .models import ObjectChange
-from .signals import purge_changelog
-from .webhooks import enqueue_webhooks
-
-_thread_locals = threading.local()
-
-
-def handle_changed_object(sender, instance, **kwargs):
-    """
-    Fires when an object is created or updated.
-    """
-    # Queue the object for processing once the request completes
-    action = ObjectChangeActionChoices.ACTION_CREATE if kwargs['created'] else ObjectChangeActionChoices.ACTION_UPDATE
-    _thread_locals.changed_objects.append(
-        (instance, action)
-    )
-
-
-def handle_deleted_object(sender, instance, **kwargs):
-    """
-    Fires when an object is deleted.
-    """
-    # Cache custom fields prior to copying the instance
-    if hasattr(instance, 'cache_custom_fields'):
-        instance.cache_custom_fields()
-
-    # Create a copy of the object being deleted
-    copy = deepcopy(instance)
-
-    # Preserve tags
-    if is_taggable(instance):
-        copy.tags = DummyQuerySet(instance.tags.all())
-
-    # Queue the copy of the object for processing once the request completes
-    _thread_locals.changed_objects.append(
-        (copy, ObjectChangeActionChoices.ACTION_DELETE)
-    )
-
-
-def purge_objectchange_cache(sender, **kwargs):
-    """
-    Delete any queued object changes waiting to be written.
-    """
-    _thread_locals.changed_objects = []
+from utilities.utils import curry
+from .signals import _handle_changed_object, _handle_deleted_object
 
 
 class ObjectChangeMiddleware(object):
@@ -80,73 +25,35 @@ class ObjectChangeMiddleware(object):
 
     def __call__(self, request):
 
-        # Initialize an empty list to cache objects being saved.
-        _thread_locals.changed_objects = []
-
         # Assign a random unique ID to the request. This will be used to associate multiple object changes made during
         # the same request.
         request.id = uuid.uuid4()
 
+        # Curry signals receivers to pass the current request
+        handle_changed_object = curry(_handle_changed_object, request)
+        handle_deleted_object = curry(_handle_deleted_object, request)
+
         # Connect our receivers to the post_save and post_delete signals.
         post_save.connect(handle_changed_object, dispatch_uid='handle_changed_object')
+        m2m_changed.connect(handle_changed_object, dispatch_uid='handle_changed_object')
         pre_delete.connect(handle_deleted_object, dispatch_uid='handle_deleted_object')
 
-        # Provide a hook for purging the change cache
-        purge_changelog.connect(purge_objectchange_cache)
-
         # Process the request
         response = self.get_response(request)
 
-        # If the change cache is empty, there's nothing more we need to do.
-        if not _thread_locals.changed_objects:
-            return response
-
-        # Disconnect our receivers from the post_save and post_delete signals.
+        # Disconnect change logging signals. This is necessary to avoid recording any errant
+        # changes during test cleanup.
         post_save.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
+        m2m_changed.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
         pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object')
 
-        # Create records for any cached objects that were changed.
-        redis_failed = False
-        for instance, action in _thread_locals.changed_objects:
-
-            # Refresh cached custom field values
-            if action in [ObjectChangeActionChoices.ACTION_CREATE, ObjectChangeActionChoices.ACTION_UPDATE]:
-                if hasattr(instance, 'cache_custom_fields'):
-                    instance.cache_custom_fields()
-
-            # Record an ObjectChange if applicable
-            if hasattr(instance, 'to_objectchange'):
-                objectchange = instance.to_objectchange(action)
-                objectchange.user = request.user
-                objectchange.request_id = request.id
-                objectchange.save()
-
-            # Enqueue webhooks
-            try:
-                enqueue_webhooks(instance, request.user, request.id, action)
-            except RedisError as e:
-                if not redis_failed and not is_api_request(request):
-                    messages.error(
-                        request,
-                        "There was an error processing webhooks for this request. Check that the Redis service is "
-                        "running and reachable. The full error details were: {}".format(e)
-                    )
-                    redis_failed = True
-
-            # Increment metric counters
-            if action == ObjectChangeActionChoices.ACTION_CREATE:
-                model_inserts.labels(instance._meta.model_name).inc()
-            elif action == ObjectChangeActionChoices.ACTION_UPDATE:
-                model_updates.labels(instance._meta.model_name).inc()
-            elif action == ObjectChangeActionChoices.ACTION_DELETE:
-                model_deletes.labels(instance._meta.model_name).inc()
-
-        # Housekeeping: 1% chance of clearing out expired ObjectChanges. This applies only to requests which result in
-        # one or more changes being logged.
-        if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
-            cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
-            purged_count, _ = ObjectChange.objects.filter(
-                time__lt=cutoff
-            ).delete()
-
         return response
+
+        # TODO: Put this somewhere
+        # # Housekeeping: 1% chance of clearing out expired ObjectChanges. This applies only to requests which result in
+        # # one or more changes being logged.
+        # if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
+        #     cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
+        #     purged_count, _ = ObjectChange.objects.filter(
+        #         time__lt=cutoff
+        #     ).delete()
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 969cda89e..e45836ce7 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -23,7 +23,6 @@ from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator,
 from utilities.exceptions import AbortTransaction
 from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
 from .forms import ScriptForm
-from .signals import purge_changelog
 
 __all__ = [
     'BaseScript',
@@ -465,7 +464,6 @@ def run_script(data, request, commit=True, *args, **kwargs):
 
         if not commit:
             # Delete all pending changelog entries
-            purge_changelog.send(Script)
             script.log_info(
                 "Database changes have been reverted automatically."
             )
diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py
index 1c20ba6dc..370f21e43 100644
--- a/netbox/extras/signals.py
+++ b/netbox/extras/signals.py
@@ -1,7 +1,68 @@
 from cacheops.signals import cache_invalidated, cache_read
-from django.dispatch import Signal
+from django_prometheus.models import model_deletes, model_inserts, model_updates
 from prometheus_client import Counter
 
+from .choices import ObjectChangeActionChoices
+from .webhooks import enqueue_webhooks
+
+
+#
+# Change logging/webhooks
+#
+
+def _handle_changed_object(request, sender, instance, **kwargs):
+    """
+    Fires when an object is created or updated.
+    """
+    # Queue the object for processing once the request completes
+    if kwargs.get('created'):
+        action = ObjectChangeActionChoices.ACTION_CREATE
+    elif 'created' in kwargs:
+        action = ObjectChangeActionChoices.ACTION_UPDATE
+    elif kwargs.get('action') in ['post_add', 'post_remove'] and kwargs['pk_set']:
+        # m2m_changed with objects added or removed
+        action = ObjectChangeActionChoices.ACTION_UPDATE
+    else:
+        return
+
+    # Cache any custom field values to ensure they are captured during serialization
+    if hasattr(instance, 'cache_custom_fields'):
+        instance.cache_custom_fields()
+
+    # Record an ObjectChange if applicable
+    if hasattr(instance, 'to_objectchange'):
+        objectchange = instance.to_objectchange(action)
+        objectchange.user = request.user
+        objectchange.request_id = request.id
+        objectchange.save()
+
+    # Enqueue webhooks
+    enqueue_webhooks(instance, request.user, request.id, action)
+
+    # Increment metric counters
+    if action == ObjectChangeActionChoices.ACTION_CREATE:
+        model_inserts.labels(instance._meta.model_name).inc()
+    elif action == ObjectChangeActionChoices.ACTION_UPDATE:
+        model_updates.labels(instance._meta.model_name).inc()
+
+
+def _handle_deleted_object(request, sender, instance, **kwargs):
+    """
+    Fires when an object is deleted.
+    """
+    # Record an ObjectChange if applicable
+    if hasattr(instance, 'to_objectchange'):
+        objectchange = instance.to_objectchange(ObjectChangeActionChoices.ACTION_DELETE)
+        objectchange.user = request.user
+        objectchange.request_id = request.id
+        objectchange.save()
+
+    # Enqueue webhooks
+    enqueue_webhooks(instance, request.user, request.id, ObjectChangeActionChoices.ACTION_DELETE)
+
+    # Increment metric counters
+    model_deletes.labels(instance._meta.model_name).inc()
+
 
 #
 # Caching
@@ -25,10 +86,3 @@ def cache_invalidated_collector(sender, obj_dict, **kwargs):
 
 cache_read.connect(cache_read_collector)
 cache_invalidated.connect(cache_invalidated_collector)
-
-
-#
-# Change logging
-#
-
-purge_changelog = Signal()
diff --git a/netbox/extras/utils.py b/netbox/extras/utils.py
index edbd509f1..ace49cce5 100644
--- a/netbox/extras/utils.py
+++ b/netbox/extras/utils.py
@@ -3,7 +3,6 @@ import collections
 from django.db.models import Q
 from django.utils.deconstruct import deconstructible
 from taggit.managers import _TaggableManager
-from utilities.querysets import DummyQuerySet
 
 from extras.constants import EXTRAS_FEATURES
 from extras.registry import registry
@@ -16,9 +15,6 @@ def is_taggable(obj):
     if hasattr(obj, 'tags'):
         if issubclass(obj.tags.__class__, _TaggableManager):
             return True
-        # TaggableManager has been replaced with a DummyQuerySet prior to object deletion
-        if isinstance(obj.tags, DummyQuerySet):
-            return True
     return False
 
 
diff --git a/netbox/utilities/querysets.py b/netbox/utilities/querysets.py
index 40f221b10..738b72dc3 100644
--- a/netbox/utilities/querysets.py
+++ b/netbox/utilities/querysets.py
@@ -3,20 +3,6 @@ from django.db.models import Q, QuerySet
 from utilities.permissions import permission_is_exempt
 
 
-class DummyQuerySet:
-    """
-    A fake QuerySet that can be used to cache relationships to objects that have been deleted.
-    """
-    def __init__(self, queryset):
-        self._cache = [obj for obj in queryset.all()]
-
-    def __iter__(self):
-        return iter(self._cache)
-
-    def all(self):
-        return self._cache
-
-
 class RestrictedQuerySet(QuerySet):
 
     def restrict(self, user, action='view'):
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index e26994edc..2eca4cf92 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -276,6 +276,13 @@ def flatten_dict(d, prefix='', separator='.'):
     return ret
 
 
+# Taken from django.utils.functional (<3.0)
+def curry(_curried_func, *args, **kwargs):
+    def _curried(*moreargs, **morekwargs):
+        return _curried_func(*args, *moreargs, **{**kwargs, **morekwargs})
+    return _curried
+
+
 #
 # Fake request object
 #

From dd707c97af7df048db7bb659fa11bc8002115804 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 11:08:14 -0400
Subject: [PATCH 481/505] Cache custom fields on instance prior to save()

---
 netbox/extras/forms.py               | 15 +++++++++++++--
 netbox/extras/models/customfields.py |  1 -
 netbox/extras/signals.py             |  4 ----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py
index cecbfae72..90ec828c7 100644
--- a/netbox/extras/forms.py
+++ b/netbox/extras/forms.py
@@ -29,6 +29,9 @@ class CustomFieldModelForm(forms.ModelForm):
 
         super().__init__(*args, **kwargs)
 
+        if self.instance._cf is None:
+            self.instance._cf = {}
+
         self._append_customfield_fields()
 
     def _append_customfield_fields(self):
@@ -48,9 +51,12 @@ class CustomFieldModelForm(forms.ModelForm):
             field_name = 'cf_{}'.format(cf.name)
             if self.instance.pk:
                 self.fields[field_name] = cf.to_form_field(set_initial=False)
-                self.fields[field_name].initial = self.custom_field_values.get(cf.name)
+                value = self.custom_field_values.get(cf.name)
+                self.fields[field_name].initial = value
+                self.instance._cf[cf.name] = value
             else:
                 self.fields[field_name] = cf.to_form_field()
+                self.instance._cf[cf.name] = self.fields[field_name].initial
 
             # Annotate the field in the list of CustomField form fields
             self.custom_fields.append(field_name)
@@ -77,13 +83,18 @@ class CustomFieldModelForm(forms.ModelForm):
             cfv.save()
 
     def save(self, commit=True):
+
+        # Cache custom field values on object prior to save to ensure change logging
+        for cf_name in self.custom_fields:
+            self.instance._cf[cf_name[3:]] = self.cleaned_data.get(cf_name)
+
         obj = super().save(commit)
 
         # Handle custom fields the same way we do M2M fields
         if commit:
             self._save_custom_fields()
         else:
-            self.save_custom_fields = self._save_custom_fields
+            obj.save_custom_fields = self._save_custom_fields
 
         return obj
 
diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py
index 62e2ca4df..2671864fb 100644
--- a/netbox/extras/models/customfields.py
+++ b/netbox/extras/models/customfields.py
@@ -1,4 +1,3 @@
-import logging
 from collections import OrderedDict
 from datetime import date
 
diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py
index 370f21e43..c5d1a7cf7 100644
--- a/netbox/extras/signals.py
+++ b/netbox/extras/signals.py
@@ -25,10 +25,6 @@ def _handle_changed_object(request, sender, instance, **kwargs):
     else:
         return
 
-    # Cache any custom field values to ensure they are captured during serialization
-    if hasattr(instance, 'cache_custom_fields'):
-        instance.cache_custom_fields()
-
     # Record an ObjectChange if applicable
     if hasattr(instance, 'to_objectchange'):
         objectchange = instance.to_objectchange(action)

From bc04543b33d699e2c41a8772bbdb74709f9329d6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 12:22:37 -0400
Subject: [PATCH 482/505] Cache custom fields on instance prior to calling
 create()/update()

---
 netbox/extras/api/customfields.py    | 9 +++++----
 netbox/extras/models/customfields.py | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py
index 34e865530..75834bb10 100644
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -175,14 +175,14 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
             )
 
     def create(self, validated_data):
-
-        custom_fields = validated_data.pop('custom_fields', None)
+        from django.db.models.query import QuerySet
 
         with transaction.atomic():
 
             instance = super().create(validated_data)
 
             # Save custom fields
+            custom_fields = validated_data.get('custom_fields')
             if custom_fields is not None:
                 self._save_custom_fields(instance, custom_fields)
                 instance.custom_fields = custom_fields
@@ -191,10 +191,11 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
 
     def update(self, instance, validated_data):
 
-        custom_fields = validated_data.pop('custom_fields', None)
-
         with transaction.atomic():
 
+            custom_fields = validated_data.get('custom_fields')
+            instance._cf = custom_fields
+
             instance = super().update(instance, validated_data)
 
             # Save custom fields
diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py
index 2671864fb..fd09971b6 100644
--- a/netbox/extras/models/customfields.py
+++ b/netbox/extras/models/customfields.py
@@ -17,11 +17,14 @@ from extras.utils import FeatureQuery
 #
 
 class CustomFieldModel(models.Model):
-    _cf = None
 
     class Meta:
         abstract = True
 
+    def __init__(self, *args, custom_fields=None, **kwargs):
+        self._cf = custom_fields
+        super().__init__(*args, **kwargs)
+
     def cache_custom_fields(self):
         """
         Cache all custom field values for this instance

From ff5a3c10556b723b1548f9042acb2d59360526a9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 12:29:40 -0400
Subject: [PATCH 483/505] Cache custom fields on instance during bulk edit

---
 netbox/utilities/views.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index b472be524..a13a47df8 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -949,6 +949,12 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                                 elif form.cleaned_data[name] not in (None, ''):
                                     setattr(obj, name, form.cleaned_data[name])
 
+                            # Cache custom fields on instance prior to save()
+                            if custom_fields:
+                                obj._cf = {
+                                    name: form.cleaned_data[name] for name in custom_fields
+                                }
+
                             obj.full_clean()
                             obj.save()
                             updated_objects.append(obj)

From 81c72739b5445523ecfa68ce7f6695f5c21ec29d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 13:43:48 -0400
Subject: [PATCH 484/505] Attach object modification signals before running a
 custom script

---
 netbox/extras/scripts.py  | 23 +++++++++++++++++++++--
 netbox/utilities/utils.py |  3 ++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index e45836ce7..8ef742939 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -12,16 +12,19 @@ from django import forms
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import transaction
+from django.db.models.signals import m2m_changed, pre_delete, post_save
 from django.utils.functional import classproperty
 from django_rq import job
 
 from extras.api.serializers import ScriptOutputSerializer
 from extras.choices import JobResultStatusChoices, LogLevelChoices
 from extras.models import JobResult
+from extras.signals import _handle_changed_object, _handle_deleted_object
 from ipam.formfields import IPAddressFormField, IPNetworkFormField
 from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator
 from utilities.exceptions import AbortTransaction
 from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
+from utilities.utils import curry
 from .forms import ScriptForm
 
 __all__ = [
@@ -435,8 +438,19 @@ def run_script(data, request, commit=True, *args, **kwargs):
     if 'commit' in inspect.signature(script.run).parameters:
         kwargs['commit'] = commit
     else:
-        warnings.warn(f"The run() method of script {script} should support a 'commit' argument. This will be required "
-                      f"beginning with NetBox v2.10.")
+        warnings.warn(
+            f"The run() method of script {script} should support a 'commit' argument. This will be required beginning "
+            f"with NetBox v2.10."
+        )
+
+    # Curry changelog signal receivers to pass the current request
+    handle_changed_object = curry(_handle_changed_object, request)
+    handle_deleted_object = curry(_handle_deleted_object, request)
+
+    # Connect object modification signals to their respective receivers
+    post_save.connect(handle_changed_object)
+    m2m_changed.connect(handle_changed_object)
+    pre_delete.connect(handle_deleted_object)
 
     try:
         with transaction.atomic():
@@ -470,6 +484,11 @@ def run_script(data, request, commit=True, *args, **kwargs):
 
     logger.info(f"Script completed in {job_result.duration}")
 
+    # Disconnect signals
+    post_save.disconnect(handle_changed_object)
+    m2m_changed.disconnect(handle_changed_object)
+    pre_delete.disconnect(handle_deleted_object)
+
     # Delete any previous terminal state results
     JobResult.objects.filter(
         obj_type=job_result.obj_type,
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 2eca4cf92..679974def 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -312,5 +312,6 @@ def copy_safe_request(request):
         'GET': request.GET,
         'FILES': request.FILES,
         'user': request.user,
-        'path': request.path
+        'path': request.path,
+        'id': getattr(request, 'id', None),  # UUID assigned by middleware
     })

From cf086cd7b246fcc2377385b1a1e0e8bc5a679a16 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 14:15:02 -0400
Subject: [PATCH 485/505] Remove errant import

---
 netbox/extras/api/customfields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netbox/extras/api/customfields.py b/netbox/extras/api/customfields.py
index 75834bb10..5ef983977 100644
--- a/netbox/extras/api/customfields.py
+++ b/netbox/extras/api/customfields.py
@@ -175,7 +175,6 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
             )
 
     def create(self, validated_data):
-        from django.db.models.query import QuerySet
 
         with transaction.atomic():
 

From 0e5d0a43f96f9a5f9479abc82023daa357d1c9e6 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 17 Aug 2020 16:18:47 -0400
Subject: [PATCH 486/505] Fix serialization of tags for REST API updates

---
 netbox/extras/api/serializers.py      |  4 +++
 netbox/extras/tests/test_changelog.py | 38 +++++++++++++++++++++------
 netbox/utilities/utils.py             |  5 ++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 0d4d91a64..aa8f6ba69 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -108,6 +108,10 @@ class TaggedObjectSerializer(serializers.Serializer):
 
     def update(self, instance, validated_data):
         tags = validated_data.pop('tags', [])
+
+        # Cache tags on instance for change logging
+        instance._tags = tags
+
         instance = super().update(instance, validated_data)
 
         return self._save_tags(instance, tags)
diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 0c35e0f1a..f11aa2bee 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -4,7 +4,7 @@ from rest_framework import status
 
 from dcim.models import Site
 from extras.choices import *
-from extras.models import CustomField, CustomFieldValue, ObjectChange
+from extras.models import CustomField, CustomFieldValue, ObjectChange, Tag
 from utilities.testing import APITestCase
 
 
@@ -23,6 +23,14 @@ class ChangeLogTest(APITestCase):
         cf.save()
         cf.obj_type.set([ct])
 
+        # Create some tags
+        tags = (
+            Tag(name='Tag 1', slug='tag-1'),
+            Tag(name='Tag 2', slug='tag-2'),
+            Tag(name='Tag 3', slug='tag-3'),
+        )
+        Tag.objects.bulk_create(tags)
+
     def test_create_object(self):
         data = {
             'name': 'Test Site 1',
@@ -30,6 +38,10 @@ class ChangeLogTest(APITestCase):
             'custom_fields': {
                 'my_field': 'ABC'
             },
+            'tags': [
+                {'name': 'Tag 1'},
+                {'name': 'Tag 2'},
+            ]
         }
         self.assertEqual(ObjectChange.objects.count(), 0)
         url = reverse('dcim-api:site-list')
@@ -39,13 +51,16 @@ class ChangeLogTest(APITestCase):
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
         site = Site.objects.get(pk=response.data['id'])
-        oc = ObjectChange.objects.get(
+        # First OC is the creation; second is the tags update
+        oc_list = ObjectChange.objects.filter(
             changed_object_type=ContentType.objects.get_for_model(Site),
             changed_object_id=site.pk
-        )
-        self.assertEqual(oc.changed_object, site)
-        self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_CREATE)
-        self.assertEqual(oc.object_data['custom_fields'], data['custom_fields'])
+        ).order_by('pk')
+        self.assertEqual(oc_list[0].changed_object, site)
+        self.assertEqual(oc_list[0].action, ObjectChangeActionChoices.ACTION_CREATE)
+        self.assertEqual(oc_list[0].object_data['custom_fields'], data['custom_fields'])
+        self.assertEqual(oc_list[1].action, ObjectChangeActionChoices.ACTION_UPDATE)
+        self.assertEqual(oc_list[1].object_data['tags'], ['Tag 1', 'Tag 2'])
 
     def test_update_object(self):
         site = Site(name='Test Site 1', slug='test-site-1')
@@ -57,6 +72,9 @@ class ChangeLogTest(APITestCase):
             'custom_fields': {
                 'my_field': 'DEF'
             },
+            'tags': [
+                {'name': 'Tag 3'}
+            ]
         }
         self.assertEqual(ObjectChange.objects.count(), 0)
         self.add_permissions('dcim.change_site')
@@ -66,13 +84,15 @@ class ChangeLogTest(APITestCase):
         self.assertHttpStatus(response, status.HTTP_200_OK)
 
         site = Site.objects.get(pk=response.data['id'])
-        oc = ObjectChange.objects.get(
+        # Get only the most recent OC
+        oc = ObjectChange.objects.filter(
             changed_object_type=ContentType.objects.get_for_model(Site),
             changed_object_id=site.pk
-        )
+        ).first()
         self.assertEqual(oc.changed_object, site)
         self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_UPDATE)
         self.assertEqual(oc.object_data['custom_fields'], data['custom_fields'])
+        self.assertEqual(oc.object_data['tags'], ['Tag 3'])
 
     def test_delete_object(self):
         site = Site(
@@ -80,6 +100,7 @@ class ChangeLogTest(APITestCase):
             slug='test-site-1'
         )
         site.save()
+        site.tags.set(*Tag.objects.all()[:2])
         CustomFieldValue.objects.create(
             field=CustomField.objects.get(name='my_field'),
             obj=site,
@@ -98,3 +119,4 @@ class ChangeLogTest(APITestCase):
         self.assertEqual(oc.object_repr, site.name)
         self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_DELETE)
         self.assertEqual(oc.object_data['custom_fields'], {'my_field': 'ABC'})
+        self.assertEqual(oc.object_data['tags'], ['Tag 1', 'Tag 2'])
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 679974def..81baadb7a 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -97,9 +97,10 @@ def serialize_object(obj, extra=None, exclude=None):
             field: str(value) for field, value in obj.cf.items()
         }
 
-    # Include any tags
+    # Include any tags. Check for tags cached on the instance; fall back to using the manager.
     if is_taggable(obj):
-        data['tags'] = [tag.name for tag in obj.tags.all()]
+        tags = getattr(obj, '_tags', obj.tags.all())
+        data['tags'] = [tag.name for tag in tags]
 
     # Append any extra data
     if extra is not None:

From afebf525d14d7c7a75f0f5b18e4996597ae20a57 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 09:03:17 -0400
Subject: [PATCH 487/505] Move housekeeping to _handle_changed_object()

---
 netbox/extras/middleware.py |  9 ---------
 netbox/extras/signals.py    | 11 +++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index bc77e990d..71200faf3 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -48,12 +48,3 @@ class ObjectChangeMiddleware(object):
         pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object')
 
         return response
-
-        # TODO: Put this somewhere
-        # # Housekeeping: 1% chance of clearing out expired ObjectChanges. This applies only to requests which result in
-        # # one or more changes being logged.
-        # if settings.CHANGELOG_RETENTION and random.randint(1, 100) == 1:
-        #     cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
-        #     purged_count, _ = ObjectChange.objects.filter(
-        #         time__lt=cutoff
-        #     ).delete()
diff --git a/netbox/extras/signals.py b/netbox/extras/signals.py
index c5d1a7cf7..e10c41d34 100644
--- a/netbox/extras/signals.py
+++ b/netbox/extras/signals.py
@@ -1,8 +1,14 @@
+import random
+from datetime import timedelta
+
 from cacheops.signals import cache_invalidated, cache_read
+from django.conf import settings
+from django.utils import timezone
 from django_prometheus.models import model_deletes, model_inserts, model_updates
 from prometheus_client import Counter
 
 from .choices import ObjectChangeActionChoices
+from .models import ObjectChange
 from .webhooks import enqueue_webhooks
 
 
@@ -41,6 +47,11 @@ def _handle_changed_object(request, sender, instance, **kwargs):
     elif action == ObjectChangeActionChoices.ACTION_UPDATE:
         model_updates.labels(instance._meta.model_name).inc()
 
+    # Housekeeping: 0.1% chance of clearing out expired ObjectChanges
+    if settings.CHANGELOG_RETENTION and random.randint(1, 1000) == 1:
+        cutoff = timezone.now() - timedelta(days=settings.CHANGELOG_RETENTION)
+        ObjectChange.objects.filter(time__lt=cutoff).delete()
+
 
 def _handle_deleted_object(request, sender, instance, **kwargs):
     """

From 881cab051be264debc63c31508ceb8e1c26eb6ba Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 10:05:58 -0400
Subject: [PATCH 488/505] Add changelog tests for UI views

---
 netbox/extras/tests/test_changelog.py | 120 +++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index f11aa2bee..bcc897ee2 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -2,13 +2,131 @@ from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 from rest_framework import status
 
+from dcim.choices import SiteStatusChoices
 from dcim.models import Site
 from extras.choices import *
 from extras.models import CustomField, CustomFieldValue, ObjectChange, Tag
 from utilities.testing import APITestCase
+from utilities.testing.utils import post_data
+from utilities.testing.views import ModelViewTestCase
 
 
-class ChangeLogTest(APITestCase):
+class ChangeLogViewTest(ModelViewTestCase):
+    model = Site
+
+    @classmethod
+    def setUpTestData(cls):
+
+        # Create a custom field on the Site model
+        ct = ContentType.objects.get_for_model(Site)
+        cf = CustomField(
+            type=CustomFieldTypeChoices.TYPE_TEXT,
+            name='my_field',
+            required=False
+        )
+        cf.save()
+        cf.obj_type.set([ct])
+
+        # Create some tags
+        tags = (
+            Tag(name='Tag 1', slug='tag-1'),
+            Tag(name='Tag 2', slug='tag-2'),
+            Tag(name='Tag 3', slug='tag-3'),
+        )
+        Tag.objects.bulk_create(tags)
+
+    def test_create_object(self):
+        tags = Tag.objects.filter(name__in=['Tag 1', 'Tag 2'])
+        form_data = {
+            'name': 'Test Site 1',
+            'slug': 'test-site-1',
+            'status': SiteStatusChoices.STATUS_ACTIVE,
+            'cf_my_field': 'ABC',
+            'tags': [tag.pk for tag in tags],
+        }
+
+        request = {
+            'path': self._get_url('add'),
+            'data': post_data(form_data),
+        }
+        self.add_permissions('dcim.add_site')
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 302)
+
+        site = Site.objects.get(name='Test Site 1')
+        # First OC is the creation; second is the tags update
+        oc_list = ObjectChange.objects.filter(
+            changed_object_type=ContentType.objects.get_for_model(Site),
+            changed_object_id=site.pk
+        ).order_by('pk')
+        self.assertEqual(oc_list[0].changed_object, site)
+        self.assertEqual(oc_list[0].action, ObjectChangeActionChoices.ACTION_CREATE)
+        self.assertEqual(oc_list[0].object_data['custom_fields']['my_field'], form_data['cf_my_field'])
+        self.assertEqual(oc_list[1].action, ObjectChangeActionChoices.ACTION_UPDATE)
+        self.assertEqual(oc_list[1].object_data['tags'], ['Tag 1', 'Tag 2'])
+
+    def test_update_object(self):
+        site = Site(name='Test Site 1', slug='test-site-1')
+        site.save()
+
+        tag3 = Tag.objects.get(name='Tag 3')
+        form_data = {
+            'name': 'Test Site X',
+            'slug': 'test-site-x',
+            'status': SiteStatusChoices.STATUS_PLANNED,
+            'cf_my_field': 'DEF',
+            'tags': [tag3.pk],
+        }
+
+        request = {
+            'path': self._get_url('edit', instance=site),
+            'data': post_data(form_data),
+        }
+        self.add_permissions('dcim.change_site')
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 302)
+
+        site.refresh_from_db()
+        # Get only the most recent OC
+        oc = ObjectChange.objects.filter(
+            changed_object_type=ContentType.objects.get_for_model(Site),
+            changed_object_id=site.pk
+        ).first()
+        self.assertEqual(oc.changed_object, site)
+        self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_UPDATE)
+        self.assertEqual(oc.object_data['custom_fields']['my_field'], form_data['cf_my_field'])
+        self.assertEqual(oc.object_data['tags'], ['Tag 3'])
+
+    def test_delete_object(self):
+        site = Site(
+            name='Test Site 1',
+            slug='test-site-1'
+        )
+        site.save()
+        site.tags.set(*Tag.objects.filter(name__in=['Tag 1', 'Tag 2']))
+        CustomFieldValue.objects.create(
+            field=CustomField.objects.get(name='my_field'),
+            obj=site,
+            value='ABC'
+        )
+
+        request = {
+            'path': self._get_url('delete', instance=site),
+            'data': post_data({'confirm': True}),
+        }
+        self.add_permissions('dcim.delete_site')
+        response = self.client.post(**request)
+        self.assertHttpStatus(response, 302)
+
+        oc = ObjectChange.objects.first()
+        self.assertEqual(oc.changed_object, None)
+        self.assertEqual(oc.object_repr, site.name)
+        self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_DELETE)
+        self.assertEqual(oc.object_data['custom_fields']['my_field'], 'ABC')
+        self.assertEqual(oc.object_data['tags'], ['Tag 1', 'Tag 2'])
+
+
+class ChangeLogAPITest(APITestCase):
 
     def setUp(self):
         super().setUp()

From c482dcd8cb1888f21709da001a557a76f34a322c Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 10:41:28 -0400
Subject: [PATCH 489/505] Dump full response content on unexpected status code

---
 netbox/utilities/testing/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 95946a24a..78bd50935 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -115,7 +115,7 @@ class TestCase(_TestCase):
         """
         err_message = "Expected HTTP status {}; received {}: {}"
         self.assertEqual(response.status_code, expected_status, err_message.format(
-            expected_status, response.status_code, getattr(response, 'data', 'No data')
+            expected_status, response.status_code, getattr(response, 'data', response.content)
         ))
 
     def assertInstanceEqual(self, instance, data, api=False):

From 0bfb64dc094171723d49af4662949d47f029c8ad Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 11:33:23 -0400
Subject: [PATCH 490/505] Simplify tag creation

---
 netbox/extras/tests/test_changelog.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index bcc897ee2..d13c23f41 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -27,13 +27,7 @@ class ChangeLogViewTest(ModelViewTestCase):
         cf.save()
         cf.obj_type.set([ct])
 
-        # Create some tags
-        tags = (
-            Tag(name='Tag 1', slug='tag-1'),
-            Tag(name='Tag 2', slug='tag-2'),
-            Tag(name='Tag 3', slug='tag-3'),
-        )
-        Tag.objects.bulk_create(tags)
+        cls.create_tags('Tag 1', 'Tag 2', 'Tag 3')
 
     def test_create_object(self):
         tags = Tag.objects.filter(name__in=['Tag 1', 'Tag 2'])

From 56291247555d646a133c8dcbffd31a6dcb66f43a Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 12:37:07 -0400
Subject: [PATCH 491/505] Tweak passing of tags

---
 netbox/extras/tests/test_changelog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index d13c23f41..d08b04a6d 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -36,7 +36,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             'slug': 'test-site-1',
             'status': SiteStatusChoices.STATUS_ACTIVE,
             'cf_my_field': 'ABC',
-            'tags': [tag.pk for tag in tags],
+            'tags': list(tags),
         }
 
         request = {
@@ -69,7 +69,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             'slug': 'test-site-x',
             'status': SiteStatusChoices.STATUS_PLANNED,
             'cf_my_field': 'DEF',
-            'tags': [tag3.pk],
+            'tags': [tag3],
         }
 
         request = {

From 986ef2b8e6de35aab8e5708797a173abaf27a67e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 13:05:41 -0400
Subject: [PATCH 492/505] Move changelog signals setup to a context manager

---
 netbox/extras/context_managers.py | 32 ++++++++++++++
 netbox/extras/middleware.py       | 26 ++---------
 netbox/extras/scripts.py          | 72 +++++++++++++------------------
 3 files changed, 65 insertions(+), 65 deletions(-)
 create mode 100644 netbox/extras/context_managers.py

diff --git a/netbox/extras/context_managers.py b/netbox/extras/context_managers.py
new file mode 100644
index 000000000..4a33f28ef
--- /dev/null
+++ b/netbox/extras/context_managers.py
@@ -0,0 +1,32 @@
+from contextlib import contextmanager
+
+from django.db.models.signals import m2m_changed, pre_delete, post_save
+
+from extras.signals import _handle_changed_object, _handle_deleted_object
+from utilities.utils import curry
+
+
+@contextmanager
+def change_logging(request):
+    """
+    Enable change logging by connecting the appropriate signals to their receivers before code is run, and
+    disconnecting them afterward.
+
+    :param request: WSGIRequest object with a unique `id` set
+    """
+    # Curry signals receivers to pass the current request
+    handle_changed_object = curry(_handle_changed_object, request)
+    handle_deleted_object = curry(_handle_deleted_object, request)
+
+    # Connect our receivers to the post_save and post_delete signals.
+    post_save.connect(handle_changed_object, dispatch_uid='handle_changed_object')
+    m2m_changed.connect(handle_changed_object, dispatch_uid='handle_changed_object')
+    pre_delete.connect(handle_deleted_object, dispatch_uid='handle_deleted_object')
+
+    yield
+
+    # Disconnect change logging signals. This is necessary to avoid recording any errant
+    # changes during test cleanup.
+    post_save.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
+    m2m_changed.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
+    pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object')
diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py
index 71200faf3..f7be829cd 100644
--- a/netbox/extras/middleware.py
+++ b/netbox/extras/middleware.py
@@ -1,9 +1,6 @@
 import uuid
 
-from django.db.models.signals import m2m_changed, pre_delete, post_save
-
-from utilities.utils import curry
-from .signals import _handle_changed_object, _handle_deleted_object
+from .context_managers import change_logging
 
 
 class ObjectChangeMiddleware(object):
@@ -24,27 +21,12 @@ class ObjectChangeMiddleware(object):
         self.get_response = get_response
 
     def __call__(self, request):
-
         # Assign a random unique ID to the request. This will be used to associate multiple object changes made during
         # the same request.
         request.id = uuid.uuid4()
 
-        # Curry signals receivers to pass the current request
-        handle_changed_object = curry(_handle_changed_object, request)
-        handle_deleted_object = curry(_handle_deleted_object, request)
-
-        # Connect our receivers to the post_save and post_delete signals.
-        post_save.connect(handle_changed_object, dispatch_uid='handle_changed_object')
-        m2m_changed.connect(handle_changed_object, dispatch_uid='handle_changed_object')
-        pre_delete.connect(handle_deleted_object, dispatch_uid='handle_deleted_object')
-
-        # Process the request
-        response = self.get_response(request)
-
-        # Disconnect change logging signals. This is necessary to avoid recording any errant
-        # changes during test cleanup.
-        post_save.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
-        m2m_changed.disconnect(handle_changed_object, dispatch_uid='handle_changed_object')
-        pre_delete.disconnect(handle_deleted_object, dispatch_uid='handle_deleted_object')
+        # Process the request with change logging enabled
+        with change_logging(request):
+            response = self.get_response(request)
 
         return response
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 8ef742939..1d7229089 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -12,19 +12,17 @@ from django import forms
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import transaction
-from django.db.models.signals import m2m_changed, pre_delete, post_save
 from django.utils.functional import classproperty
 from django_rq import job
 
 from extras.api.serializers import ScriptOutputSerializer
 from extras.choices import JobResultStatusChoices, LogLevelChoices
 from extras.models import JobResult
-from extras.signals import _handle_changed_object, _handle_deleted_object
 from ipam.formfields import IPAddressFormField, IPNetworkFormField
 from ipam.validators import MaxPrefixLengthValidator, MinPrefixLengthValidator, prefix_validator
 from utilities.exceptions import AbortTransaction
 from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField
-from utilities.utils import curry
+from .context_managers import change_logging
 from .forms import ScriptForm
 
 __all__ = [
@@ -443,51 +441,39 @@ def run_script(data, request, commit=True, *args, **kwargs):
             f"with NetBox v2.10."
         )
 
-    # Curry changelog signal receivers to pass the current request
-    handle_changed_object = curry(_handle_changed_object, request)
-    handle_deleted_object = curry(_handle_deleted_object, request)
+    with change_logging(request):
 
-    # Connect object modification signals to their respective receivers
-    post_save.connect(handle_changed_object)
-    m2m_changed.connect(handle_changed_object)
-    pre_delete.connect(handle_deleted_object)
+        try:
+            with transaction.atomic():
+                script.output = script.run(**kwargs)
 
-    try:
-        with transaction.atomic():
-            script.output = script.run(**kwargs)
+                if not commit:
+                    raise AbortTransaction()
+
+        except AbortTransaction:
+            pass
+
+        except Exception as e:
+            stacktrace = traceback.format_exc()
+            script.log_failure(
+                "An exception occurred: `{}: {}`\n```\n{}\n```".format(type(e).__name__, e, stacktrace)
+            )
+            logger.error(f"Exception raised during script execution: {e}")
+            commit = False
+            job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
+
+        finally:
+            if job_result.status != JobResultStatusChoices.STATUS_ERRORED:
+                job_result.data = ScriptOutputSerializer(script).data
+                job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
 
             if not commit:
-                raise AbortTransaction()
+                # Delete all pending changelog entries
+                script.log_info(
+                    "Database changes have been reverted automatically."
+                )
 
-    except AbortTransaction:
-        pass
-
-    except Exception as e:
-        stacktrace = traceback.format_exc()
-        script.log_failure(
-            "An exception occurred: `{}: {}`\n```\n{}\n```".format(type(e).__name__, e, stacktrace)
-        )
-        logger.error(f"Exception raised during script execution: {e}")
-        commit = False
-        job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
-
-    finally:
-        if job_result.status != JobResultStatusChoices.STATUS_ERRORED:
-            job_result.data = ScriptOutputSerializer(script).data
-            job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
-
-        if not commit:
-            # Delete all pending changelog entries
-            script.log_info(
-                "Database changes have been reverted automatically."
-            )
-
-    logger.info(f"Script completed in {job_result.duration}")
-
-    # Disconnect signals
-    post_save.disconnect(handle_changed_object)
-    m2m_changed.disconnect(handle_changed_object)
-    pre_delete.disconnect(handle_deleted_object)
+        logger.info(f"Script completed in {job_result.duration}")
 
     # Delete any previous terminal state results
     JobResult.objects.filter(

From 36d86e6220b0ff9c3451ae10033d37c11ff74607 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 13:13:13 -0400
Subject: [PATCH 493/505] Avoid using post_data() for form data

---
 netbox/extras/tests/test_changelog.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index d08b04a6d..40b42f3cf 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -7,7 +7,6 @@ from dcim.models import Site
 from extras.choices import *
 from extras.models import CustomField, CustomFieldValue, ObjectChange, Tag
 from utilities.testing import APITestCase
-from utilities.testing.utils import post_data
 from utilities.testing.views import ModelViewTestCase
 
 
@@ -36,12 +35,12 @@ class ChangeLogViewTest(ModelViewTestCase):
             'slug': 'test-site-1',
             'status': SiteStatusChoices.STATUS_ACTIVE,
             'cf_my_field': 'ABC',
-            'tags': list(tags),
+            'tags': [tag.pk for tag in tags],
         }
 
         request = {
             'path': self._get_url('add'),
-            'data': post_data(form_data),
+            'data': form_data,
         }
         self.add_permissions('dcim.add_site')
         response = self.client.post(**request)
@@ -69,12 +68,12 @@ class ChangeLogViewTest(ModelViewTestCase):
             'slug': 'test-site-x',
             'status': SiteStatusChoices.STATUS_PLANNED,
             'cf_my_field': 'DEF',
-            'tags': [tag3],
+            'tags': [tag3.pk],
         }
 
         request = {
             'path': self._get_url('edit', instance=site),
-            'data': post_data(form_data),
+            'data': form_data,
         }
         self.add_permissions('dcim.change_site')
         response = self.client.post(**request)
@@ -106,7 +105,7 @@ class ChangeLogViewTest(ModelViewTestCase):
 
         request = {
             'path': self._get_url('delete', instance=site),
-            'data': post_data({'confirm': True}),
+            'data': {'confirm': True},
         }
         self.add_permissions('dcim.delete_site')
         response = self.client.post(**request)

From bc5f800a8b6e7907822331b6503a4e3e7e72b819 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 13:30:16 -0400
Subject: [PATCH 494/505] Refactor tests (again)

---
 netbox/extras/tests/test_changelog.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 40b42f3cf..54528d57e 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -7,6 +7,7 @@ from dcim.models import Site
 from extras.choices import *
 from extras.models import CustomField, CustomFieldValue, ObjectChange, Tag
 from utilities.testing import APITestCase
+from utilities.testing.utils import post_data
 from utilities.testing.views import ModelViewTestCase
 
 
@@ -26,10 +27,8 @@ class ChangeLogViewTest(ModelViewTestCase):
         cf.save()
         cf.obj_type.set([ct])
 
-        cls.create_tags('Tag 1', 'Tag 2', 'Tag 3')
-
     def test_create_object(self):
-        tags = Tag.objects.filter(name__in=['Tag 1', 'Tag 2'])
+        tags = self.create_tags('Tag 1', 'Tag 2')
         form_data = {
             'name': 'Test Site 1',
             'slug': 'test-site-1',
@@ -40,7 +39,7 @@ class ChangeLogViewTest(ModelViewTestCase):
 
         request = {
             'path': self._get_url('add'),
-            'data': form_data,
+            'data': post_data(form_data),
         }
         self.add_permissions('dcim.add_site')
         response = self.client.post(**request)
@@ -61,19 +60,20 @@ class ChangeLogViewTest(ModelViewTestCase):
     def test_update_object(self):
         site = Site(name='Test Site 1', slug='test-site-1')
         site.save()
+        tags = self.create_tags('Tag 1', 'Tag 2', 'Tag 3')
+        site.tags.set('Tag 1', 'Tag 2')
 
-        tag3 = Tag.objects.get(name='Tag 3')
         form_data = {
             'name': 'Test Site X',
             'slug': 'test-site-x',
             'status': SiteStatusChoices.STATUS_PLANNED,
             'cf_my_field': 'DEF',
-            'tags': [tag3.pk],
+            'tags': [tags[2].pk],
         }
 
         request = {
             'path': self._get_url('edit', instance=site),
-            'data': form_data,
+            'data': post_data(form_data),
         }
         self.add_permissions('dcim.change_site')
         response = self.client.post(**request)
@@ -96,7 +96,8 @@ class ChangeLogViewTest(ModelViewTestCase):
             slug='test-site-1'
         )
         site.save()
-        site.tags.set(*Tag.objects.filter(name__in=['Tag 1', 'Tag 2']))
+        self.create_tags('Tag 1', 'Tag 2')
+        site.tags.set('Tag 1', 'Tag 2')
         CustomFieldValue.objects.create(
             field=CustomField.objects.get(name='my_field'),
             obj=site,
@@ -105,7 +106,7 @@ class ChangeLogViewTest(ModelViewTestCase):
 
         request = {
             'path': self._get_url('delete', instance=site),
-            'data': {'confirm': True},
+            'data': post_data({'confirm': True}),
         }
         self.add_permissions('dcim.delete_site')
         response = self.client.post(**request)

From 82900fb65d3aea1434cf97c98b801f6bf5b53682 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 14:01:59 -0400
Subject: [PATCH 495/505] Changelog for #4990

---
 docs/release-notes/version-2.9.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 5e7d3a906..fa8004199 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,5 +1,13 @@
 # NetBox v2.9
 
+## v2.9-beta3 (FUTURE)
+
+### Bug Fixes
+
+* [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
+
+---
+
 ## v2.9-beta2 (2020-08-13)
 
 **WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.

From c9c79dabeffd7b9f849e4d318dc1d172f3b9781d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 14:41:47 -0400
Subject: [PATCH 496/505] Fixes #5004: Permit assignment of an interface to a
 LAG on any peer virtual chassis member

---
 docs/release-notes/version-2.9.md        |  1 +
 netbox/dcim/forms.py                     | 20 ++++++++++----------
 netbox/dcim/models/device_components.py  | 18 +++++++++++-------
 netbox/templates/dcim/inc/interface.html |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index fa8004199..b53aaed4a 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
+* [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
 
 ---
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index c9a7092f5..6dd5cb6bf 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2682,11 +2682,11 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
         else:
             device = self.instance.device
 
-        # Limit LAG choices to interfaces belonging to this device (or VC master)
-        self.fields['lag'].queryset = Interface.objects.filter(
-            device__in=[device, device.get_vc_master()],
-            type=InterfaceTypeChoices.TYPE_LAG
-        )
+        # Limit LAG choices to interfaces belonging to this device or a peer VC member
+        device_query = Q(device=device)
+        if device.virtual_chassis:
+            device_query |= Q(device__virtual_chassis=device.virtual_chassis)
+        self.fields['lag'].queryset = Interface.objects.filter(device_query, type=InterfaceTypeChoices.TYPE_LAG)
 
         # Add current site to VLANs query params
         self.fields['untagged_vlan'].widget.add_query_param('site_id', device.site.pk)
@@ -2754,14 +2754,14 @@ class InterfaceCreateForm(ComponentCreateForm, InterfaceCommonForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # Limit LAG choices to interfaces which belong to the parent device (or VC master)
+        # Limit LAG choices to interfaces belonging to this device or a peer VC member
         device = Device.objects.get(
             pk=self.initial.get('device') or self.data.get('device')
         )
-        self.fields['lag'].queryset = Interface.objects.filter(
-            device__in=[device, device.get_vc_master()],
-            type=InterfaceTypeChoices.TYPE_LAG
-        )
+        device_query = Q(device=device)
+        if device.virtual_chassis:
+            device_query |= Q(device__virtual_chassis=device.virtual_chassis)
+        self.fields['lag'].queryset = Interface.objects.filter(device_query, type=InterfaceTypeChoices.TYPE_LAG)
 
         # Add current site to VLANs query params
         self.fields['untagged_vlan'].widget.add_query_param('site_id', device.site.pk)
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 4779b867a..e93984cd5 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -688,13 +688,17 @@ class Interface(CableTermination, ComponentModel, BaseInterface):
                         "Disconnect the interface or choose a suitable type."
             })
 
-        # An interface's LAG must belong to the same device (or VC master)
-        if self.lag and self.lag.device not in [self.device, self.device.get_vc_master()]:
-            raise ValidationError({
-                'lag': "The selected LAG interface ({}) belongs to a different device ({}).".format(
-                    self.lag.name, self.lag.device.name
-                )
-            })
+        # An interface's LAG must belong to the same device or virtual chassis
+        if self.lag and self.lag.device != self.device:
+            if self.device.virtual_chassis is None:
+                raise ValidationError({
+                    'lag': f"The selected LAG interface ({self.lag}) belongs to a different device ({self.lag.device})."
+                })
+            elif self.lag.device.virtual_chassis != self.device.virtual_chassis:
+                raise ValidationError({
+                    'lag': f"The selected LAG interface ({self.lag}) belongs to {self.lag.device}, which is not part "
+                           f"of virtual chassis {self.device.virtual_chassis}."
+                })
 
         # A virtual interface cannot have a parent LAG
         if self.type in NONCONNECTABLE_IFACE_TYPES and self.lag is not None:
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 3d7dd4c3d..ce66d9da2 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -65,7 +65,7 @@
             LAG interface<br />
             <small class="text-muted">
                 {% for member in iface.member_interfaces.all %}
-                    <a href="#interface_{{ member.name }}">{{ member }}</a>{% if not forloop.last %}, {% endif %}
+                    <a href="{{ member.get_absolute_url }}">{{ member }}</a>{% if not forloop.last %}, {% endif %}
                 {% empty %}
                     No members
                 {% endfor %}

From 0d9fc309d5b8a5e227e5382bf324d3f373be1e68 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 14:43:21 -0400
Subject: [PATCH 497/505] Update test script ObjectVars

---
 netbox/extras/tests/test_scripts.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/netbox/extras/tests/test_scripts.py b/netbox/extras/tests/test_scripts.py
index 482b86b9a..4518548d3 100644
--- a/netbox/extras/tests/test_scripts.py
+++ b/netbox/extras/tests/test_scripts.py
@@ -152,10 +152,7 @@ class ScriptVariablesTest(TestCase):
     def test_objectvar(self):
 
         class TestScript(Script):
-
-            var1 = ObjectVar(
-                queryset=DeviceRole.objects.all()
-            )
+            var1 = ObjectVar(model=DeviceRole)
 
         # Populate some objects
         for i in range(1, 6):
@@ -173,10 +170,7 @@ class ScriptVariablesTest(TestCase):
     def test_multiobjectvar(self):
 
         class TestScript(Script):
-
-            var1 = MultiObjectVar(
-                queryset=DeviceRole.objects.all()
-            )
+            var1 = MultiObjectVar(model=DeviceRole)
 
         # Populate some objects
         for i in range(1, 6):

From 3ebef04a11f2b9b0662eea4dc8039629820d6d21 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 18 Aug 2020 17:02:47 -0400
Subject: [PATCH 498/505] Closes #5016: assertHttpStatus() should report form
 validation errors

---
 netbox/templates/utilities/render_field.html | 34 ++++++--------------
 netbox/utilities/testing/utils.py            |  9 ++++++
 netbox/utilities/testing/views.py            | 18 ++++++++---
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/netbox/templates/utilities/render_field.html b/netbox/templates/utilities/render_field.html
index e69296873..b383ae4d3 100644
--- a/netbox/templates/utilities/render_field.html
+++ b/netbox/templates/utilities/render_field.html
@@ -16,14 +16,6 @@
                     <input type="checkbox" name="_nullify" value="{{ field.name }}" /> Set null
                 </label>
             {% endif %}
-            {% if field.errors %}
-                <ul>
-                    {% for error in field.errors %}
-                        <li class="text-danger">{{ error }}</li>
-                    {% endfor %}
-                </ul>
-            {% endif %}
-        </div>
     {% elif field|widget_type == 'textarea' and not field.label %}
         <div class="col-md-12">
             {{ field }}
@@ -35,14 +27,6 @@
             {% if field.help_text %}
                 <span class="help-block">{{ field.help_text|safe }}</span>
             {% endif %}
-            {% if field.errors %}
-                <ul>
-                    {% for error in field.errors %}
-                        <li class="text-danger">{{ error }}</li>
-                    {% endfor %}
-                </ul>
-            {% endif %}
-        </div>
     {% else %}
         <label class="col-md-3 control-label{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
         <div class="col-md-9">
@@ -55,13 +39,15 @@
             {% if field.help_text %}
                 <span class="help-block">{{ field.help_text|safe }}</span>
             {% endif %}
-            {% if field.errors %}
-                <ul>
-                    {% for error in field.errors %}
-                        <li class="text-danger">{{ error }}</li>
-                    {% endfor %}
-                </ul>
-            {% endif %}
-        </div>
     {% endif %}
+    {% if field.errors %}
+        <ul>
+            {% for error in field.errors %}
+                {# Embed an HTML comment indicating the error for extraction by tests #}
+                <!-- FORM-ERROR {{ field.name }}: {{ error }} -->
+                <li class="text-danger">{{ error }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+    </div>
 </div>
diff --git a/netbox/utilities/testing/utils.py b/netbox/utilities/testing/utils.py
index d763012f0..9c30002b8 100644
--- a/netbox/utilities/testing/utils.py
+++ b/netbox/utilities/testing/utils.py
@@ -1,4 +1,5 @@
 import logging
+import re
 from contextlib import contextmanager
 
 from django.contrib.auth.models import Permission, User
@@ -43,6 +44,14 @@ def create_test_user(username='testuser', permissions=None):
     return user
 
 
+def extract_form_failures(content):
+    """
+    Given raw HTML content from an HTTP response, return a list of form errors.
+    """
+    FORM_ERROR_REGEX = r'<!-- FORM-ERROR (.*) -->'
+    return re.findall(FORM_ERROR_REGEX, str(content))
+
+
 @contextmanager
 def disable_warnings(logger_name):
     """
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index 78bd50935..afbcbc057 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -13,7 +13,7 @@ from taggit.managers import TaggableManager
 from extras.models import Tag
 from users.models import ObjectPermission
 from utilities.permissions import resolve_permission_ct
-from .utils import disable_warnings, post_data
+from .utils import disable_warnings, extract_form_failures, post_data
 
 
 __all__ = (
@@ -113,10 +113,18 @@ class TestCase(_TestCase):
         """
         TestCase method. Provide more detail in the event of an unexpected HTTP response.
         """
-        err_message = "Expected HTTP status {}; received {}: {}"
-        self.assertEqual(response.status_code, expected_status, err_message.format(
-            expected_status, response.status_code, getattr(response, 'data', response.content)
-        ))
+        err_message = None
+        # Construct an error message only if we know the test is going to fail
+        if response.status_code != expected_status:
+            if hasattr(response, 'data'):
+                # REST API response; pass the response data through directly
+                err = response.data
+            else:
+                # Attempt to extract form validation errors from the response HTML
+                form_errors = extract_form_failures(response.content)
+                err = form_errors or response.content or 'No data'
+            err_message = f"Expected HTTP status {expected_status}; received {response.status_code}: {err}"
+        self.assertEqual(response.status_code, expected_status, err_message)
 
     def assertInstanceEqual(self, instance, data, api=False):
         """

From db5bb8e5bbe3c52a64eec4d98293f600e4ab3493 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 19 Aug 2020 16:02:10 -0400
Subject: [PATCH 499/505] Fix changelog tests

---
 netbox/extras/tests/test_changelog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 54528d57e..8c9d09564 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -41,7 +41,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             'path': self._get_url('add'),
             'data': post_data(form_data),
         }
-        self.add_permissions('dcim.add_site')
+        self.add_permissions('dcim.add_site', 'extras.view_tag')
         response = self.client.post(**request)
         self.assertHttpStatus(response, 302)
 
@@ -75,7 +75,7 @@ class ChangeLogViewTest(ModelViewTestCase):
             'path': self._get_url('edit', instance=site),
             'data': post_data(form_data),
         }
-        self.add_permissions('dcim.change_site')
+        self.add_permissions('dcim.change_site', 'extras.view_tag')
         response = self.client.post(**request)
         self.assertHttpStatus(response, 302)
 

From e1cf27a3ac3586f92eeedb2df7b807d771a8f181 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Wed, 19 Aug 2020 16:37:23 -0400
Subject: [PATCH 500/505] Refactor DCIM models into separate submodules

---
 netbox/dcim/models/__init__.py          | 2325 +----------------------
 netbox/dcim/models/device_components.py |    1 +
 netbox/dcim/models/devices.py           | 1247 ++++++++++++
 netbox/dcim/models/power.py             |  237 +++
 netbox/dcim/models/racks.py             |  655 +++++++
 netbox/dcim/models/sites.py             |  246 +++
 6 files changed, 2392 insertions(+), 2319 deletions(-)
 create mode 100644 netbox/dcim/models/devices.py
 create mode 100644 netbox/dcim/models/power.py
 create mode 100644 netbox/dcim/models/racks.py
 create mode 100644 netbox/dcim/models/sites.py

diff --git a/netbox/dcim/models/__init__.py b/netbox/dcim/models/__init__.py
index 1caad296f..e50fa2eda 100644
--- a/netbox/dcim/models/__init__.py
+++ b/netbox/dcim/models/__init__.py
@@ -1,42 +1,9 @@
-from collections import OrderedDict
-from itertools import count, groupby
-
-import yaml
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.postgres.fields import ArrayField
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models
-from django.db.models import Count, F, ProtectedError, Sum
-from django.urls import reverse
-from django.utils.safestring import mark_safe
-from mptt.models import MPTTModel, TreeForeignKey
-from taggit.managers import TaggableManager
-from timezone_field import TimeZoneField
-
-from dcim.choices import *
-from dcim.constants import *
-from dcim.fields import ASNField
-from dcim.elevations import RackElevationSVG
-from extras.models import ChangeLoggedModel, ConfigContextModel, CustomFieldModel, ObjectChange, TaggedItem
-from extras.utils import extras_features
-from utilities.choices import ColorChoices
-from utilities.fields import ColorField, NaturalOrderingField
-from utilities.querysets import RestrictedQuerySet
-from utilities.mptt import TreeManager
-from utilities.utils import serialize_object, to_meters
-from utilities.validators import ExclusionValidator
-from .device_component_templates import (
-    ConsolePortTemplate, ConsoleServerPortTemplate, DeviceBayTemplate, FrontPortTemplate, InterfaceTemplate,
-    PowerOutletTemplate, PowerPortTemplate, RearPortTemplate,
-)
-from .device_components import (
-    BaseInterface, CableTermination, ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem,
-    PowerOutlet, PowerPort, RearPort,
-)
+from .device_component_templates import *
+from .device_components import *
+from .devices import *
+from .power import *
+from .racks import *
+from .sites import *
 
 __all__ = (
     'BaseInterface',
@@ -74,2283 +41,3 @@ __all__ = (
     'Site',
     'VirtualChassis',
 )
-
-
-#
-# Regions
-#
-
-@extras_features('export_templates', 'webhooks')
-class Region(MPTTModel, ChangeLoggedModel):
-    """
-    Sites can be grouped within geographic Regions.
-    """
-    parent = TreeForeignKey(
-        to='self',
-        on_delete=models.CASCADE,
-        related_name='children',
-        blank=True,
-        null=True,
-        db_index=True
-    )
-    name = models.CharField(
-        max_length=50,
-        unique=True
-    )
-    slug = models.SlugField(
-        unique=True
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True
-    )
-
-    objects = TreeManager()
-
-    csv_headers = ['name', 'slug', 'parent', 'description']
-
-    class MPTTMeta:
-        order_insertion_by = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return "{}?region={}".format(reverse('dcim:site_list'), self.slug)
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.parent.name if self.parent else None,
-            self.description,
-        )
-
-    def get_site_count(self):
-        return Site.objects.filter(
-            Q(region=self) |
-            Q(region__in=self.get_descendants())
-        ).count()
-
-    def to_objectchange(self, action):
-        # Remove MPTT-internal fields
-        return ObjectChange(
-            changed_object=self,
-            object_repr=str(self),
-            action=action,
-            object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
-        )
-
-
-#
-# Sites
-#
-
-@extras_features('custom_fields', 'custom_links', 'graphs', 'export_templates', 'webhooks')
-class Site(ChangeLoggedModel, CustomFieldModel):
-    """
-    A Site represents a geographic location within a network; typically a building or campus. The optional facility
-    field can be used to include an external designation, such as a data center name (e.g. Equinix SV6).
-    """
-    name = models.CharField(
-        max_length=50,
-        unique=True
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
-    slug = models.SlugField(
-        unique=True
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=SiteStatusChoices,
-        default=SiteStatusChoices.STATUS_ACTIVE
-    )
-    region = models.ForeignKey(
-        to='dcim.Region',
-        on_delete=models.SET_NULL,
-        related_name='sites',
-        blank=True,
-        null=True
-    )
-    tenant = models.ForeignKey(
-        to='tenancy.Tenant',
-        on_delete=models.PROTECT,
-        related_name='sites',
-        blank=True,
-        null=True
-    )
-    facility = models.CharField(
-        max_length=50,
-        blank=True,
-        help_text='Local facility ID or description'
-    )
-    asn = ASNField(
-        blank=True,
-        null=True,
-        verbose_name='ASN',
-        help_text='32-bit autonomous system number'
-    )
-    time_zone = TimeZoneField(
-        blank=True
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True
-    )
-    physical_address = models.CharField(
-        max_length=200,
-        blank=True
-    )
-    shipping_address = models.CharField(
-        max_length=200,
-        blank=True
-    )
-    latitude = models.DecimalField(
-        max_digits=8,
-        decimal_places=6,
-        blank=True,
-        null=True,
-        help_text='GPS coordinate (latitude)'
-    )
-    longitude = models.DecimalField(
-        max_digits=9,
-        decimal_places=6,
-        blank=True,
-        null=True,
-        help_text='GPS coordinate (longitude)'
-    )
-    contact_name = models.CharField(
-        max_length=50,
-        blank=True
-    )
-    contact_phone = models.CharField(
-        max_length=20,
-        blank=True
-    )
-    contact_email = models.EmailField(
-        blank=True,
-        verbose_name='Contact E-mail'
-    )
-    comments = models.TextField(
-        blank=True
-    )
-    custom_field_values = GenericRelation(
-        to='extras.CustomFieldValue',
-        content_type_field='obj_type',
-        object_id_field='obj_id'
-    )
-    images = GenericRelation(
-        to='extras.ImageAttachment'
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
-        'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email', 'comments',
-    ]
-    clone_fields = [
-        'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
-        'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email',
-    ]
-
-    STATUS_CLASS_MAP = {
-        SiteStatusChoices.STATUS_PLANNED: 'info',
-        SiteStatusChoices.STATUS_STAGING: 'primary',
-        SiteStatusChoices.STATUS_ACTIVE: 'success',
-        SiteStatusChoices.STATUS_DECOMMISSIONING: 'warning',
-        SiteStatusChoices.STATUS_RETIRED: 'danger',
-    }
-
-    class Meta:
-        ordering = ('_name',)
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse('dcim:site', args=[self.slug])
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.get_status_display(),
-            self.region.name if self.region else None,
-            self.tenant.name if self.tenant else None,
-            self.facility,
-            self.asn,
-            self.time_zone,
-            self.description,
-            self.physical_address,
-            self.shipping_address,
-            self.latitude,
-            self.longitude,
-            self.contact_name,
-            self.contact_phone,
-            self.contact_email,
-            self.comments,
-        )
-
-    def get_status_class(self):
-        return self.STATUS_CLASS_MAP.get(self.status)
-
-
-#
-# Racks
-#
-
-@extras_features('export_templates')
-class RackGroup(MPTTModel, ChangeLoggedModel):
-    """
-    Racks can be grouped as subsets within a Site. The scope of a group will depend on how Sites are defined. For
-    example, if a Site spans a corporate campus, a RackGroup might be defined to represent each building within that
-    campus. If a Site instead represents a single building, a RackGroup might represent a single room or floor.
-    """
-    name = models.CharField(
-        max_length=50
-    )
-    slug = models.SlugField()
-    site = models.ForeignKey(
-        to='dcim.Site',
-        on_delete=models.CASCADE,
-        related_name='rack_groups'
-    )
-    parent = TreeForeignKey(
-        to='self',
-        on_delete=models.CASCADE,
-        related_name='children',
-        blank=True,
-        null=True,
-        db_index=True
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True
-    )
-
-    objects = TreeManager()
-
-    csv_headers = ['site', 'parent', 'name', 'slug', 'description']
-
-    class Meta:
-        ordering = ['site', 'name']
-        unique_together = [
-            ['site', 'name'],
-            ['site', 'slug'],
-        ]
-
-    class MPTTMeta:
-        order_insertion_by = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return "{}?group_id={}".format(reverse('dcim:rack_list'), self.pk)
-
-    def to_csv(self):
-        return (
-            self.site,
-            self.parent.name if self.parent else '',
-            self.name,
-            self.slug,
-            self.description,
-        )
-
-    def to_objectchange(self, action):
-        # Remove MPTT-internal fields
-        return ObjectChange(
-            changed_object=self,
-            object_repr=str(self),
-            action=action,
-            object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
-        )
-
-    def clean(self):
-
-        # Parent RackGroup (if any) must belong to the same Site
-        if self.parent and self.parent.site != self.site:
-            raise ValidationError(f"Parent rack group ({self.parent}) must belong to the same site ({self.site})")
-
-
-class RackRole(ChangeLoggedModel):
-    """
-    Racks can be organized by functional role, similar to Devices.
-    """
-    name = models.CharField(
-        max_length=50,
-        unique=True
-    )
-    slug = models.SlugField(
-        unique=True
-    )
-    color = ColorField(
-        default=ColorChoices.COLOR_GREY
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True,
-    )
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['name', 'slug', 'color', 'description']
-
-    class Meta:
-        ordering = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return "{}?role={}".format(reverse('dcim:rack_list'), self.slug)
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.color,
-            self.description,
-        )
-
-
-@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
-class Rack(ChangeLoggedModel, CustomFieldModel):
-    """
-    Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face.
-    Each Rack is assigned to a Site and (optionally) a RackGroup.
-    """
-    name = models.CharField(
-        max_length=50
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True
-    )
-    facility_id = models.CharField(
-        max_length=50,
-        blank=True,
-        null=True,
-        verbose_name='Facility ID',
-        help_text='Locally-assigned identifier'
-    )
-    site = models.ForeignKey(
-        to='dcim.Site',
-        on_delete=models.PROTECT,
-        related_name='racks'
-    )
-    group = models.ForeignKey(
-        to='dcim.RackGroup',
-        on_delete=models.SET_NULL,
-        related_name='racks',
-        blank=True,
-        null=True,
-        help_text='Assigned group'
-    )
-    tenant = models.ForeignKey(
-        to='tenancy.Tenant',
-        on_delete=models.PROTECT,
-        related_name='racks',
-        blank=True,
-        null=True
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=RackStatusChoices,
-        default=RackStatusChoices.STATUS_ACTIVE
-    )
-    role = models.ForeignKey(
-        to='dcim.RackRole',
-        on_delete=models.PROTECT,
-        related_name='racks',
-        blank=True,
-        null=True,
-        help_text='Functional role'
-    )
-    serial = models.CharField(
-        max_length=50,
-        blank=True,
-        verbose_name='Serial number'
-    )
-    asset_tag = models.CharField(
-        max_length=50,
-        blank=True,
-        null=True,
-        unique=True,
-        verbose_name='Asset tag',
-        help_text='A unique tag used to identify this rack'
-    )
-    type = models.CharField(
-        choices=RackTypeChoices,
-        max_length=50,
-        blank=True,
-        verbose_name='Type'
-    )
-    width = models.PositiveSmallIntegerField(
-        choices=RackWidthChoices,
-        default=RackWidthChoices.WIDTH_19IN,
-        verbose_name='Width',
-        help_text='Rail-to-rail width'
-    )
-    u_height = models.PositiveSmallIntegerField(
-        default=RACK_U_HEIGHT_DEFAULT,
-        verbose_name='Height (U)',
-        validators=[MinValueValidator(1), MaxValueValidator(100)],
-        help_text='Height in rack units'
-    )
-    desc_units = models.BooleanField(
-        default=False,
-        verbose_name='Descending units',
-        help_text='Units are numbered top-to-bottom'
-    )
-    outer_width = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True,
-        help_text='Outer dimension of rack (width)'
-    )
-    outer_depth = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True,
-        help_text='Outer dimension of rack (depth)'
-    )
-    outer_unit = models.CharField(
-        max_length=50,
-        choices=RackDimensionUnitChoices,
-        blank=True,
-    )
-    comments = models.TextField(
-        blank=True
-    )
-    custom_field_values = GenericRelation(
-        to='extras.CustomFieldValue',
-        content_type_field='obj_type',
-        object_id_field='obj_id'
-    )
-    images = GenericRelation(
-        to='extras.ImageAttachment'
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'site', 'group', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width',
-        'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'comments',
-    ]
-    clone_fields = [
-        'site', 'group', 'tenant', 'status', 'role', 'type', 'width', 'u_height', 'desc_units', 'outer_width',
-        'outer_depth', 'outer_unit',
-    ]
-
-    STATUS_CLASS_MAP = {
-        RackStatusChoices.STATUS_RESERVED: 'warning',
-        RackStatusChoices.STATUS_AVAILABLE: 'success',
-        RackStatusChoices.STATUS_PLANNED: 'info',
-        RackStatusChoices.STATUS_ACTIVE: 'primary',
-        RackStatusChoices.STATUS_DEPRECATED: 'danger',
-    }
-
-    class Meta:
-        ordering = ('site', 'group', '_name', 'pk')  # (site, group, name) may be non-unique
-        unique_together = (
-            # Name and facility_id must be unique *only* within a RackGroup
-            ('group', 'name'),
-            ('group', 'facility_id'),
-        )
-
-    def __str__(self):
-        return self.display_name or super().__str__()
-
-    def get_absolute_url(self):
-        return reverse('dcim:rack', args=[self.pk])
-
-    def clean(self):
-
-        # Validate outer dimensions and unit
-        if (self.outer_width is not None or self.outer_depth is not None) and not self.outer_unit:
-            raise ValidationError("Must specify a unit when setting an outer width/depth")
-        elif self.outer_width is None and self.outer_depth is None:
-            self.outer_unit = ''
-
-        if self.pk:
-            # Validate that Rack is tall enough to house the installed Devices
-            top_device = Device.objects.filter(
-                rack=self
-            ).exclude(
-                position__isnull=True
-            ).order_by('-position').first()
-            if top_device:
-                min_height = top_device.position + top_device.device_type.u_height - 1
-                if self.u_height < min_height:
-                    raise ValidationError({
-                        'u_height': "Rack must be at least {}U tall to house currently installed devices.".format(
-                            min_height
-                        )
-                    })
-            # Validate that Rack was assigned a group of its same site, if applicable
-            if self.group:
-                if self.group.site != self.site:
-                    raise ValidationError({
-                        'group': "Rack group must be from the same site, {}.".format(self.site)
-                    })
-
-    def save(self, *args, **kwargs):
-
-        # Record the original site assignment for this rack.
-        _site_id = None
-        if self.pk:
-            _site_id = Rack.objects.get(pk=self.pk).site_id
-
-        super().save(*args, **kwargs)
-
-        # Update racked devices if the assigned Site has been changed.
-        if _site_id is not None and self.site_id != _site_id:
-            devices = Device.objects.filter(rack=self)
-            for device in devices:
-                device.site = self.site
-                device.save()
-
-    def to_csv(self):
-        return (
-            self.site.name,
-            self.group.name if self.group else None,
-            self.name,
-            self.facility_id,
-            self.tenant.name if self.tenant else None,
-            self.get_status_display(),
-            self.role.name if self.role else None,
-            self.get_type_display() if self.type else None,
-            self.serial,
-            self.asset_tag,
-            self.width,
-            self.u_height,
-            self.desc_units,
-            self.outer_width,
-            self.outer_depth,
-            self.outer_unit,
-            self.comments,
-        )
-
-    @property
-    def units(self):
-        if self.desc_units:
-            return range(1, self.u_height + 1)
-        else:
-            return reversed(range(1, self.u_height + 1))
-
-    @property
-    def display_name(self):
-        if self.facility_id:
-            return f'{self.name} ({self.facility_id})'
-        return self.name
-
-    def get_status_class(self):
-        return self.STATUS_CLASS_MAP.get(self.status)
-
-    def get_rack_units(self, user=None, face=DeviceFaceChoices.FACE_FRONT, exclude=None, expand_devices=True):
-        """
-        Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'}
-        Each key 'device' is either a Device or None. By default, multi-U devices are repeated for each U they occupy.
-
-        :param face: Rack face (front or rear)
-        :param user: User instance to be used for evaluating device view permissions. If None, all devices
-            will be included.
-        :param exclude: PK of a Device to exclude (optional); helpful when relocating a Device within a Rack
-        :param expand_devices: When True, all units that a device occupies will be listed with each containing a
-            reference to the device. When False, only the bottom most unit for a device is included and that unit
-            contains a height attribute for the device
-        """
-
-        elevation = OrderedDict()
-        for u in self.units:
-            elevation[u] = {
-                'id': u,
-                'name': f'U{u}',
-                'face': face,
-                'device': None,
-                'occupied': False
-            }
-
-        # Add devices to rack units list
-        if self.pk:
-
-            # Retrieve all devices installed within the rack
-            queryset = Device.objects.prefetch_related(
-                'device_type',
-                'device_type__manufacturer',
-                'device_role'
-            ).annotate(
-                devicebay_count=Count('devicebays')
-            ).exclude(
-                pk=exclude
-            ).filter(
-                rack=self,
-                position__gt=0,
-                device_type__u_height__gt=0
-            ).filter(
-                Q(face=face) | Q(device_type__is_full_depth=True)
-            )
-
-            # Determine which devices the user has permission to view
-            permitted_device_ids = []
-            if user is not None:
-                permitted_device_ids = self.devices.restrict(user, 'view').values_list('pk', flat=True)
-
-            for device in queryset:
-                if expand_devices:
-                    for u in range(device.position, device.position + device.device_type.u_height):
-                        if user is None or device.pk in permitted_device_ids:
-                            elevation[u]['device'] = device
-                        elevation[u]['occupied'] = True
-                else:
-                    if user is None or device.pk in permitted_device_ids:
-                        elevation[device.position]['device'] = device
-                    elevation[device.position]['occupied'] = True
-                    elevation[device.position]['height'] = device.device_type.u_height
-                    for u in range(device.position + 1, device.position + device.device_type.u_height):
-                        elevation.pop(u, None)
-
-        return [u for u in elevation.values()]
-
-    def get_available_units(self, u_height=1, rack_face=None, exclude=None):
-        """
-        Return a list of units within the rack available to accommodate a device of a given U height (default 1).
-        Optionally exclude one or more devices when calculating empty units (needed when moving a device from one
-        position to another within a rack).
-
-        :param u_height: Minimum number of contiguous free units required
-        :param rack_face: The face of the rack (front or rear) required; 'None' if device is full depth
-        :param exclude: List of devices IDs to exclude (useful when moving a device within a rack)
-        """
-        # Gather all devices which consume U space within the rack
-        devices = self.devices.prefetch_related('device_type').filter(position__gte=1)
-        if exclude is not None:
-            devices = devices.exclude(pk__in=exclude)
-
-        # Initialize the rack unit skeleton
-        units = list(range(1, self.u_height + 1))
-
-        # Remove units consumed by installed devices
-        for d in devices:
-            if rack_face is None or d.face == rack_face or d.device_type.is_full_depth:
-                for u in range(d.position, d.position + d.device_type.u_height):
-                    try:
-                        units.remove(u)
-                    except ValueError:
-                        # Found overlapping devices in the rack!
-                        pass
-
-        # Remove units without enough space above them to accommodate a device of the specified height
-        available_units = []
-        for u in units:
-            if set(range(u, u + u_height)).issubset(units):
-                available_units.append(u)
-
-        return list(reversed(available_units))
-
-    def get_reserved_units(self):
-        """
-        Return a dictionary mapping all reserved units within the rack to their reservation.
-        """
-        reserved_units = {}
-        for r in self.reservations.all():
-            for u in r.units:
-                reserved_units[u] = r
-        return reserved_units
-
-    def get_elevation_svg(
-            self,
-            face=DeviceFaceChoices.FACE_FRONT,
-            user=None,
-            unit_width=settings.RACK_ELEVATION_DEFAULT_UNIT_WIDTH,
-            unit_height=settings.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT,
-            legend_width=RACK_ELEVATION_LEGEND_WIDTH_DEFAULT,
-            include_images=True,
-            base_url=None
-    ):
-        """
-        Return an SVG of the rack elevation
-
-        :param face: Enum of [front, rear] representing the desired side of the rack elevation to render
-        :param user: User instance to be used for evaluating device view permissions. If None, all devices
-            will be included.
-        :param unit_width: Width in pixels for the rendered drawing
-        :param unit_height: Height of each rack unit for the rendered drawing. Note this is not the total
-            height of the elevation
-        :param legend_width: Width of the unit legend, in pixels
-        :param include_images: Embed front/rear device images where available
-        :param base_url: Base URL for links and images. If none, URLs will be relative.
-        """
-        elevation = RackElevationSVG(self, user=user, include_images=include_images, base_url=base_url)
-
-        return elevation.render(face, unit_width, unit_height, legend_width)
-
-    def get_0u_devices(self):
-        return self.devices.filter(position=0)
-
-    def get_utilization(self):
-        """
-        Determine the utilization rate of the rack and return it as a percentage. Occupied and reserved units both count
-        as utilized.
-        """
-        # Determine unoccupied units
-        available_units = self.get_available_units()
-
-        # Remove reserved units
-        for u in self.get_reserved_units():
-            if u in available_units:
-                available_units.remove(u)
-
-        occupied_unit_count = self.u_height - len(available_units)
-        percentage = int(float(occupied_unit_count) / self.u_height * 100)
-
-        return percentage
-
-    def get_power_utilization(self):
-        """
-        Determine the utilization rate of power in the rack and return it as a percentage.
-        """
-        power_stats = PowerFeed.objects.filter(
-            rack=self
-        ).annotate(
-            allocated_draw_total=Sum('connected_endpoint__poweroutlets__connected_endpoint__allocated_draw'),
-        ).values(
-            'allocated_draw_total',
-            'available_power'
-        )
-
-        if power_stats:
-            allocated_draw_total = sum(x['allocated_draw_total'] or 0 for x in power_stats)
-            available_power_total = sum(x['available_power'] for x in power_stats)
-            return int(allocated_draw_total / available_power_total * 100) or 0
-        return 0
-
-
-@extras_features('custom_links', 'export_templates', 'webhooks')
-class RackReservation(ChangeLoggedModel):
-    """
-    One or more reserved units within a Rack.
-    """
-    rack = models.ForeignKey(
-        to='dcim.Rack',
-        on_delete=models.CASCADE,
-        related_name='reservations'
-    )
-    units = ArrayField(
-        base_field=models.PositiveSmallIntegerField()
-    )
-    tenant = models.ForeignKey(
-        to='tenancy.Tenant',
-        on_delete=models.PROTECT,
-        related_name='rackreservations',
-        blank=True,
-        null=True
-    )
-    user = models.ForeignKey(
-        to=User,
-        on_delete=models.PROTECT
-    )
-    description = models.CharField(
-        max_length=200
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['site', 'rack_group', 'rack', 'units', 'tenant', 'user', 'description']
-
-    class Meta:
-        ordering = ['created']
-
-    def __str__(self):
-        return "Reservation for rack {}".format(self.rack)
-
-    def get_absolute_url(self):
-        return reverse('dcim:rackreservation', args=[self.pk])
-
-    def clean(self):
-
-        if hasattr(self, 'rack') and self.units:
-
-            # Validate that all specified units exist in the Rack.
-            invalid_units = [u for u in self.units if u not in self.rack.units]
-            if invalid_units:
-                raise ValidationError({
-                    'units': "Invalid unit(s) for {}U rack: {}".format(
-                        self.rack.u_height,
-                        ', '.join([str(u) for u in invalid_units]),
-                    ),
-                })
-
-            # Check that none of the units has already been reserved for this Rack.
-            reserved_units = []
-            for resv in self.rack.reservations.exclude(pk=self.pk):
-                reserved_units += resv.units
-            conflicting_units = [u for u in self.units if u in reserved_units]
-            if conflicting_units:
-                raise ValidationError({
-                    'units': 'The following units have already been reserved: {}'.format(
-                        ', '.join([str(u) for u in conflicting_units]),
-                    )
-                })
-
-    def to_csv(self):
-        return (
-            self.rack.site.name,
-            self.rack.group if self.rack.group else None,
-            self.rack.name,
-            ','.join([str(u) for u in self.units]),
-            self.tenant.name if self.tenant else None,
-            self.user.username,
-            self.description
-        )
-
-    @property
-    def unit_list(self):
-        """
-        Express the assigned units as a string of summarized ranges. For example:
-            [0, 1, 2, 10, 14, 15, 16] => "0-2, 10, 14-16"
-        """
-        group = (list(x) for _, x in groupby(sorted(self.units), lambda x, c=count(): next(c) - x))
-        return ', '.join('-'.join(map(str, (g[0], g[-1])[:len(g)])) for g in group)
-
-
-#
-# Device Types
-#
-
-@extras_features('export_templates', 'webhooks')
-class Manufacturer(ChangeLoggedModel):
-    """
-    A Manufacturer represents a company which produces hardware devices; for example, Juniper or Dell.
-    """
-    name = models.CharField(
-        max_length=50,
-        unique=True
-    )
-    slug = models.SlugField(
-        unique=True
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True
-    )
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['name', 'slug', 'description']
-
-    class Meta:
-        ordering = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return "{}?manufacturer={}".format(reverse('dcim:devicetype_list'), self.slug)
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.description
-        )
-
-
-@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
-class DeviceType(ChangeLoggedModel, CustomFieldModel):
-    """
-    A DeviceType represents a particular make (Manufacturer) and model of device. It specifies rack height and depth, as
-    well as high-level functional role(s).
-
-    Each DeviceType can have an arbitrary number of component templates assigned to it, which define console, power, and
-    interface objects. For example, a Juniper EX4300-48T DeviceType would have:
-
-      * 1 ConsolePortTemplate
-      * 2 PowerPortTemplates
-      * 48 InterfaceTemplates
-
-    When a new Device of this type is created, the appropriate console, power, and interface objects (as defined by the
-    DeviceType) are automatically created as well.
-    """
-    manufacturer = models.ForeignKey(
-        to='dcim.Manufacturer',
-        on_delete=models.PROTECT,
-        related_name='device_types'
-    )
-    model = models.CharField(
-        max_length=50
-    )
-    slug = models.SlugField()
-    part_number = models.CharField(
-        max_length=50,
-        blank=True,
-        help_text='Discrete part number (optional)'
-    )
-    u_height = models.PositiveSmallIntegerField(
-        default=1,
-        verbose_name='Height (U)'
-    )
-    is_full_depth = models.BooleanField(
-        default=True,
-        verbose_name='Is full depth',
-        help_text='Device consumes both front and rear rack faces'
-    )
-    subdevice_role = models.CharField(
-        max_length=50,
-        choices=SubdeviceRoleChoices,
-        blank=True,
-        verbose_name='Parent/child status',
-        help_text='Parent devices house child devices in device bays. Leave blank '
-                  'if this device type is neither a parent nor a child.'
-    )
-    front_image = models.ImageField(
-        upload_to='devicetype-images',
-        blank=True
-    )
-    rear_image = models.ImageField(
-        upload_to='devicetype-images',
-        blank=True
-    )
-    comments = models.TextField(
-        blank=True
-    )
-    custom_field_values = GenericRelation(
-        to='extras.CustomFieldValue',
-        content_type_field='obj_type',
-        object_id_field='obj_id'
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    clone_fields = [
-        'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role',
-    ]
-
-    class Meta:
-        ordering = ['manufacturer', 'model']
-        unique_together = [
-            ['manufacturer', 'model'],
-            ['manufacturer', 'slug'],
-        ]
-
-    def __str__(self):
-        return self.model
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # Save a copy of u_height for validation in clean()
-        self._original_u_height = self.u_height
-
-        # Save references to the original front/rear images
-        self._original_front_image = self.front_image
-        self._original_rear_image = self.rear_image
-
-    def get_absolute_url(self):
-        return reverse('dcim:devicetype', args=[self.pk])
-
-    def to_yaml(self):
-        data = OrderedDict((
-            ('manufacturer', self.manufacturer.name),
-            ('model', self.model),
-            ('slug', self.slug),
-            ('part_number', self.part_number),
-            ('u_height', self.u_height),
-            ('is_full_depth', self.is_full_depth),
-            ('subdevice_role', self.subdevice_role),
-            ('comments', self.comments),
-        ))
-
-        # Component templates
-        if self.consoleporttemplates.exists():
-            data['console-ports'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                }
-                for c in self.consoleporttemplates.all()
-            ]
-        if self.consoleserverporttemplates.exists():
-            data['console-server-ports'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                }
-                for c in self.consoleserverporttemplates.all()
-            ]
-        if self.powerporttemplates.exists():
-            data['power-ports'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                    'maximum_draw': c.maximum_draw,
-                    'allocated_draw': c.allocated_draw,
-                }
-                for c in self.powerporttemplates.all()
-            ]
-        if self.poweroutlettemplates.exists():
-            data['power-outlets'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                    'power_port': c.power_port.name if c.power_port else None,
-                    'feed_leg': c.feed_leg,
-                }
-                for c in self.poweroutlettemplates.all()
-            ]
-        if self.interfacetemplates.exists():
-            data['interfaces'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                    'mgmt_only': c.mgmt_only,
-                }
-                for c in self.interfacetemplates.all()
-            ]
-        if self.frontporttemplates.exists():
-            data['front-ports'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                    'rear_port': c.rear_port.name,
-                    'rear_port_position': c.rear_port_position,
-                }
-                for c in self.frontporttemplates.all()
-            ]
-        if self.rearporttemplates.exists():
-            data['rear-ports'] = [
-                {
-                    'name': c.name,
-                    'type': c.type,
-                    'positions': c.positions,
-                }
-                for c in self.rearporttemplates.all()
-            ]
-        if self.devicebaytemplates.exists():
-            data['device-bays'] = [
-                {
-                    'name': c.name,
-                }
-                for c in self.devicebaytemplates.all()
-            ]
-
-        return yaml.dump(dict(data), sort_keys=False)
-
-    def clean(self):
-
-        # If editing an existing DeviceType to have a larger u_height, first validate that *all* instances of it have
-        # room to expand within their racks. This validation will impose a very high performance penalty when there are
-        # many instances to check, but increasing the u_height of a DeviceType should be a very rare occurrence.
-        if self.pk and self.u_height > self._original_u_height:
-            for d in Device.objects.filter(device_type=self, position__isnull=False):
-                face_required = None if self.is_full_depth else d.face
-                u_available = d.rack.get_available_units(
-                    u_height=self.u_height,
-                    rack_face=face_required,
-                    exclude=[d.pk]
-                )
-                if d.position not in u_available:
-                    raise ValidationError({
-                        'u_height': "Device {} in rack {} does not have sufficient space to accommodate a height of "
-                                    "{}U".format(d, d.rack, self.u_height)
-                    })
-
-        # If modifying the height of an existing DeviceType to 0U, check for any instances assigned to a rack position.
-        elif self.pk and self._original_u_height > 0 and self.u_height == 0:
-            racked_instance_count = Device.objects.filter(
-                device_type=self,
-                position__isnull=False
-            ).count()
-            if racked_instance_count:
-                url = f"{reverse('dcim:device_list')}?manufactuer_id={self.manufacturer_id}&device_type_id={self.pk}"
-                raise ValidationError({
-                    'u_height': mark_safe(
-                        f'Unable to set 0U height: Found <a href="{url}">{racked_instance_count} instances</a> already '
-                        f'mounted within racks.'
-                    )
-                })
-
-        if (
-                self.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT
-        ) and self.devicebaytemplates.count():
-            raise ValidationError({
-                'subdevice_role': "Must delete all device bay templates associated with this device before "
-                                  "declassifying it as a parent device."
-            })
-
-        if self.u_height and self.subdevice_role == SubdeviceRoleChoices.ROLE_CHILD:
-            raise ValidationError({
-                'u_height': "Child device types must be 0U."
-            })
-
-    def save(self, *args, **kwargs):
-        ret = super().save(*args, **kwargs)
-
-        # Delete any previously uploaded image files that are no longer in use
-        if self.front_image != self._original_front_image:
-            self._original_front_image.delete(save=False)
-        if self.rear_image != self._original_rear_image:
-            self._original_rear_image.delete(save=False)
-
-        return ret
-
-    def delete(self, *args, **kwargs):
-        super().delete(*args, **kwargs)
-
-        # Delete any uploaded image files
-        if self.front_image:
-            self.front_image.delete(save=False)
-        if self.rear_image:
-            self.rear_image.delete(save=False)
-
-    @property
-    def display_name(self):
-        return f'{self.manufacturer.name} {self.model}'
-
-    @property
-    def is_parent_device(self):
-        return self.subdevice_role == SubdeviceRoleChoices.ROLE_PARENT
-
-    @property
-    def is_child_device(self):
-        return self.subdevice_role == SubdeviceRoleChoices.ROLE_CHILD
-
-
-#
-# Devices
-#
-
-class DeviceRole(ChangeLoggedModel):
-    """
-    Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a
-    color to be used when displaying rack elevations. The vm_role field determines whether the role is applicable to
-    virtual machines as well.
-    """
-    name = models.CharField(
-        max_length=50,
-        unique=True
-    )
-    slug = models.SlugField(
-        unique=True
-    )
-    color = ColorField(
-        default=ColorChoices.COLOR_GREY
-    )
-    vm_role = models.BooleanField(
-        default=True,
-        verbose_name='VM Role',
-        help_text='Virtual machines may be assigned to this role'
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True,
-    )
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['name', 'slug', 'color', 'vm_role', 'description']
-
-    class Meta:
-        ordering = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.color,
-            self.vm_role,
-            self.description,
-        )
-
-
-class Platform(ChangeLoggedModel):
-    """
-    Platform refers to the software or firmware running on a Device. For example, "Cisco IOS-XR" or "Juniper Junos".
-    NetBox uses Platforms to determine how to interact with devices when pulling inventory data or other information by
-    specifying a NAPALM driver.
-    """
-    name = models.CharField(
-        max_length=100,
-        unique=True
-    )
-    slug = models.SlugField(
-        unique=True,
-        max_length=100
-    )
-    manufacturer = models.ForeignKey(
-        to='dcim.Manufacturer',
-        on_delete=models.PROTECT,
-        related_name='platforms',
-        blank=True,
-        null=True,
-        help_text='Optionally limit this platform to devices of a certain manufacturer'
-    )
-    napalm_driver = models.CharField(
-        max_length=50,
-        blank=True,
-        verbose_name='NAPALM driver',
-        help_text='The name of the NAPALM driver to use when interacting with devices'
-    )
-    napalm_args = models.JSONField(
-        blank=True,
-        null=True,
-        verbose_name='NAPALM arguments',
-        help_text='Additional arguments to pass when initiating the NAPALM driver (JSON format)'
-    )
-    description = models.CharField(
-        max_length=200,
-        blank=True
-    )
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'description']
-
-    class Meta:
-        ordering = ['name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return "{}?platform={}".format(reverse('dcim:device_list'), self.slug)
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.slug,
-            self.manufacturer.name if self.manufacturer else None,
-            self.napalm_driver,
-            self.napalm_args,
-            self.description,
-        )
-
-
-@extras_features('custom_fields', 'custom_links', 'graphs', 'export_templates', 'webhooks')
-class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
-    """
-    A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType,
-    DeviceRole, and (optionally) a Platform. Device names are not required, however if one is set it must be unique.
-
-    Each Device must be assigned to a site, and optionally to a rack within that site. Associating a device with a
-    particular rack face or unit is optional (for example, vertically mounted PDUs do not consume rack units).
-
-    When a new Device is created, console/power/interface/device bay components are created along with it as dictated
-    by the component templates assigned to its DeviceType. Components can also be added, modified, or deleted after the
-    creation of a Device.
-    """
-    device_type = models.ForeignKey(
-        to='dcim.DeviceType',
-        on_delete=models.PROTECT,
-        related_name='instances'
-    )
-    device_role = models.ForeignKey(
-        to='dcim.DeviceRole',
-        on_delete=models.PROTECT,
-        related_name='devices'
-    )
-    tenant = models.ForeignKey(
-        to='tenancy.Tenant',
-        on_delete=models.PROTECT,
-        related_name='devices',
-        blank=True,
-        null=True
-    )
-    platform = models.ForeignKey(
-        to='dcim.Platform',
-        on_delete=models.SET_NULL,
-        related_name='devices',
-        blank=True,
-        null=True
-    )
-    name = models.CharField(
-        max_length=64,
-        blank=True,
-        null=True
-    )
-    _name = NaturalOrderingField(
-        target_field='name',
-        max_length=100,
-        blank=True,
-        null=True
-    )
-    serial = models.CharField(
-        max_length=50,
-        blank=True,
-        verbose_name='Serial number'
-    )
-    asset_tag = models.CharField(
-        max_length=50,
-        blank=True,
-        null=True,
-        unique=True,
-        verbose_name='Asset tag',
-        help_text='A unique tag used to identify this device'
-    )
-    site = models.ForeignKey(
-        to='dcim.Site',
-        on_delete=models.PROTECT,
-        related_name='devices'
-    )
-    rack = models.ForeignKey(
-        to='dcim.Rack',
-        on_delete=models.PROTECT,
-        related_name='devices',
-        blank=True,
-        null=True
-    )
-    position = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True,
-        validators=[MinValueValidator(1)],
-        verbose_name='Position (U)',
-        help_text='The lowest-numbered unit occupied by the device'
-    )
-    face = models.CharField(
-        max_length=50,
-        blank=True,
-        choices=DeviceFaceChoices,
-        verbose_name='Rack face'
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=DeviceStatusChoices,
-        default=DeviceStatusChoices.STATUS_ACTIVE
-    )
-    primary_ip4 = models.OneToOneField(
-        to='ipam.IPAddress',
-        on_delete=models.SET_NULL,
-        related_name='primary_ip4_for',
-        blank=True,
-        null=True,
-        verbose_name='Primary IPv4'
-    )
-    primary_ip6 = models.OneToOneField(
-        to='ipam.IPAddress',
-        on_delete=models.SET_NULL,
-        related_name='primary_ip6_for',
-        blank=True,
-        null=True,
-        verbose_name='Primary IPv6'
-    )
-    cluster = models.ForeignKey(
-        to='virtualization.Cluster',
-        on_delete=models.SET_NULL,
-        related_name='devices',
-        blank=True,
-        null=True
-    )
-    virtual_chassis = models.ForeignKey(
-        to='VirtualChassis',
-        on_delete=models.SET_NULL,
-        related_name='members',
-        blank=True,
-        null=True
-    )
-    vc_position = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True,
-        validators=[MaxValueValidator(255)]
-    )
-    vc_priority = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True,
-        validators=[MaxValueValidator(255)]
-    )
-    comments = models.TextField(
-        blank=True
-    )
-    custom_field_values = GenericRelation(
-        to='extras.CustomFieldValue',
-        content_type_field='obj_type',
-        object_id_field='obj_id'
-    )
-    images = GenericRelation(
-        to='extras.ImageAttachment'
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'name', 'device_role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status',
-        'site', 'rack_group', 'rack_name', 'position', 'face', 'comments',
-    ]
-    clone_fields = [
-        'device_type', 'device_role', 'tenant', 'platform', 'site', 'rack', 'status', 'cluster',
-    ]
-
-    STATUS_CLASS_MAP = {
-        DeviceStatusChoices.STATUS_OFFLINE: 'warning',
-        DeviceStatusChoices.STATUS_ACTIVE: 'success',
-        DeviceStatusChoices.STATUS_PLANNED: 'info',
-        DeviceStatusChoices.STATUS_STAGED: 'primary',
-        DeviceStatusChoices.STATUS_FAILED: 'danger',
-        DeviceStatusChoices.STATUS_INVENTORY: 'default',
-        DeviceStatusChoices.STATUS_DECOMMISSIONING: 'warning',
-    }
-
-    class Meta:
-        ordering = ('_name', 'pk')  # Name may be null
-        unique_together = (
-            ('site', 'tenant', 'name'),  # See validate_unique below
-            ('rack', 'position', 'face'),
-            ('virtual_chassis', 'vc_position'),
-        )
-
-    def __str__(self):
-        return self.display_name or super().__str__()
-
-    def get_absolute_url(self):
-        return reverse('dcim:device', args=[self.pk])
-
-    def validate_unique(self, exclude=None):
-
-        # 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 Device.objects.exclude(pk=self.pk).filter(
-                    name=self.name,
-                    site=self.site,
-                    tenant__isnull=True
-            ):
-                raise ValidationError({
-                    'name': 'A device with this name already exists.'
-                })
-
-        super().validate_unique(exclude)
-
-    def clean(self):
-
-        super().clean()
-
-        # Validate site/rack combination
-        if self.rack and self.site != self.rack.site:
-            raise ValidationError({
-                'rack': "Rack {} does not belong to site {}.".format(self.rack, self.site),
-            })
-
-        if self.rack is None:
-            if self.face:
-                raise ValidationError({
-                    'face': "Cannot select a rack face without assigning a rack.",
-                })
-            if self.position:
-                raise ValidationError({
-                    'face': "Cannot select a rack position without assigning a rack.",
-                })
-
-        # Validate position/face combination
-        if self.position and not self.face:
-            raise ValidationError({
-                'face': "Must specify rack face when defining rack position.",
-            })
-
-        # Prevent 0U devices from being assigned to a specific position
-        if self.position and self.device_type.u_height == 0:
-            raise ValidationError({
-                'position': "A U0 device type ({}) cannot be assigned to a rack position.".format(self.device_type)
-            })
-
-        if self.rack:
-
-            try:
-                # Child devices cannot be assigned to a rack face/unit
-                if self.device_type.is_child_device and self.face:
-                    raise ValidationError({
-                        'face': "Child device types cannot be assigned to a rack face. This is an attribute of the "
-                                "parent device."
-                    })
-                if self.device_type.is_child_device and self.position:
-                    raise ValidationError({
-                        'position': "Child device types cannot be assigned to a rack position. This is an attribute of "
-                                    "the parent device."
-                    })
-
-                # Validate rack space
-                rack_face = self.face if not self.device_type.is_full_depth else None
-                exclude_list = [self.pk] if self.pk else []
-                try:
-                    available_units = self.rack.get_available_units(
-                        u_height=self.device_type.u_height, rack_face=rack_face, exclude=exclude_list
-                    )
-                    if self.position and self.position not in available_units:
-                        raise ValidationError({
-                            'position': "U{} is already occupied or does not have sufficient space to accommodate a(n) "
-                                        "{} ({}U).".format(self.position, self.device_type, self.device_type.u_height)
-                        })
-                except Rack.DoesNotExist:
-                    pass
-
-            except DeviceType.DoesNotExist:
-                pass
-
-        # Validate primary IP addresses
-        vc_interfaces = self.vc_interfaces.all()
-        if self.primary_ip4:
-            if self.primary_ip4.family != 4:
-                raise ValidationError({
-                    'primary_ip4': f"{self.primary_ip4} is not an IPv4 address."
-                })
-            if self.primary_ip4.assigned_object in vc_interfaces:
-                pass
-            elif self.primary_ip4.nat_inside is not None and self.primary_ip4.nat_inside.assigned_object in vc_interfaces:
-                pass
-            else:
-                raise ValidationError({
-                    'primary_ip4': f"The specified IP address ({self.primary_ip4}) is not assigned to this device."
-                })
-        if self.primary_ip6:
-            if self.primary_ip6.family != 6:
-                raise ValidationError({
-                    'primary_ip6': f"{self.primary_ip6} is not an IPv6 address."
-                })
-            if self.primary_ip6.assigned_object in vc_interfaces:
-                pass
-            elif self.primary_ip6.nat_inside is not None and self.primary_ip6.nat_inside.assigned_object in vc_interfaces:
-                pass
-            else:
-                raise ValidationError({
-                    'primary_ip6': f"The specified IP address ({self.primary_ip6}) is not assigned to this device."
-                })
-
-        # Validate manufacturer/platform
-        if hasattr(self, 'device_type') and self.platform:
-            if self.platform.manufacturer and self.platform.manufacturer != self.device_type.manufacturer:
-                raise ValidationError({
-                    'platform': "The assigned platform is limited to {} device types, but this device's type belongs "
-                                "to {}.".format(self.platform.manufacturer, self.device_type.manufacturer)
-                })
-
-        # A Device can only be assigned to a Cluster in the same Site (or no Site)
-        if self.cluster and self.cluster.site is not None and self.cluster.site != self.site:
-            raise ValidationError({
-                'cluster': "The assigned cluster belongs to a different site ({})".format(self.cluster.site)
-            })
-
-        # Validate virtual chassis assignment
-        if self.virtual_chassis and self.vc_position is None:
-            raise ValidationError({
-                'vc_position': "A device assigned to a virtual chassis must have its position defined."
-            })
-
-    def save(self, *args, **kwargs):
-
-        is_new = not bool(self.pk)
-
-        super().save(*args, **kwargs)
-
-        # If this is a new Device, instantiate all of the related components per the DeviceType definition
-        if is_new:
-            ConsolePort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleporttemplates.all()]
-            )
-            ConsoleServerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.consoleserverporttemplates.all()]
-            )
-            PowerPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.powerporttemplates.all()]
-            )
-            PowerOutlet.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.poweroutlettemplates.all()]
-            )
-            Interface.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.interfacetemplates.all()]
-            )
-            RearPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.rearporttemplates.all()]
-            )
-            FrontPort.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.frontporttemplates.all()]
-            )
-            DeviceBay.objects.bulk_create(
-                [x.instantiate(self) for x in self.device_type.devicebaytemplates.all()]
-            )
-
-        # Update Site and Rack assignment for any child Devices
-        devices = Device.objects.filter(parent_bay__device=self)
-        for device in devices:
-            device.site = self.site
-            device.rack = self.rack
-            device.save()
-
-    def to_csv(self):
-        return (
-            self.name or '',
-            self.device_role.name,
-            self.tenant.name if self.tenant else None,
-            self.device_type.manufacturer.name,
-            self.device_type.model,
-            self.platform.name if self.platform else None,
-            self.serial,
-            self.asset_tag,
-            self.get_status_display(),
-            self.site.name,
-            self.rack.group.name if self.rack and self.rack.group else None,
-            self.rack.name if self.rack else None,
-            self.position,
-            self.get_face_display(),
-            self.comments,
-        )
-
-    @property
-    def display_name(self):
-        if self.name:
-            return self.name
-        elif self.virtual_chassis:
-            return f'{self.virtual_chassis.name}:{self.vc_position} ({self.pk})'
-        elif self.device_type:
-            return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})'
-        else:
-            return ''  # Device has not yet been created
-
-    @property
-    def identifier(self):
-        """
-        Return the device name if set; otherwise return the Device's primary key as {pk}
-        """
-        if self.name is not None:
-            return self.name
-        return '{{{}}}'.format(self.pk)
-
-    @property
-    def primary_ip(self):
-        if settings.PREFER_IPV4 and self.primary_ip4:
-            return self.primary_ip4
-        elif self.primary_ip6:
-            return self.primary_ip6
-        elif self.primary_ip4:
-            return self.primary_ip4
-        else:
-            return None
-
-    def get_vc_master(self):
-        """
-        If this Device is a VirtualChassis member, return the VC master. Otherwise, return None.
-        """
-        return self.virtual_chassis.master if self.virtual_chassis else None
-
-    @property
-    def vc_interfaces(self):
-        """
-        Return a QuerySet matching all Interfaces assigned to this Device or, if this Device is a VC master, to another
-        Device belonging to the same VirtualChassis.
-        """
-        filter = Q(device=self)
-        if self.virtual_chassis and self.virtual_chassis.master == self:
-            filter |= Q(device__virtual_chassis=self.virtual_chassis, mgmt_only=False)
-        return Interface.objects.filter(filter)
-
-    def get_cables(self, pk_list=False):
-        """
-        Return a QuerySet or PK list matching all Cables connected to a component of this Device.
-        """
-        cable_pks = []
-        for component_model in [
-            ConsolePort, ConsoleServerPort, PowerPort, PowerOutlet, Interface, FrontPort, RearPort
-        ]:
-            cable_pks += component_model.objects.filter(
-                device=self, cable__isnull=False
-            ).values_list('cable', flat=True)
-        if pk_list:
-            return cable_pks
-        return Cable.objects.filter(pk__in=cable_pks)
-
-    def get_children(self):
-        """
-        Return the set of child Devices installed in DeviceBays within this Device.
-        """
-        return Device.objects.filter(parent_bay__device=self.pk)
-
-    def get_status_class(self):
-        return self.STATUS_CLASS_MAP.get(self.status)
-
-
-#
-# Virtual chassis
-#
-
-@extras_features('custom_links', 'export_templates', 'webhooks')
-class VirtualChassis(ChangeLoggedModel):
-    """
-    A collection of Devices which operate with a shared control plane (e.g. a switch stack).
-    """
-    master = models.OneToOneField(
-        to='Device',
-        on_delete=models.PROTECT,
-        related_name='vc_master_for',
-        blank=True,
-        null=True
-    )
-    name = models.CharField(
-        max_length=64
-    )
-    domain = models.CharField(
-        max_length=30,
-        blank=True
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['name', 'domain', 'master']
-
-    class Meta:
-        ordering = ['name']
-        verbose_name_plural = 'virtual chassis'
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse('dcim:virtualchassis', kwargs={'pk': self.pk})
-
-    def clean(self):
-
-        # Verify that the selected master device has been assigned to this VirtualChassis. (Skip when creating a new
-        # VirtualChassis.)
-        if self.pk and self.master and self.master not in self.members.all():
-            raise ValidationError({
-                'master': f"The selected master ({self.master}) is not assigned to this virtual chassis."
-            })
-
-    def delete(self, *args, **kwargs):
-
-        # Check for LAG interfaces split across member chassis
-        interfaces = Interface.objects.filter(
-            device__in=self.members.all(),
-            lag__isnull=False
-        ).exclude(
-            lag__device=F('device')
-        )
-        if interfaces:
-            raise ProtectedError(
-                f"Unable to delete virtual chassis {self}. There are member interfaces which form a cross-chassis LAG",
-                interfaces
-            )
-
-        return super().delete(*args, **kwargs)
-
-    def to_csv(self):
-        return (
-            self.name,
-            self.domain,
-            self.master.name if self.master else None,
-        )
-
-
-#
-# Power
-#
-
-@extras_features('custom_links', 'export_templates', 'webhooks')
-class PowerPanel(ChangeLoggedModel):
-    """
-    A distribution point for electrical power; e.g. a data center RPP.
-    """
-    site = models.ForeignKey(
-        to='Site',
-        on_delete=models.PROTECT
-    )
-    rack_group = models.ForeignKey(
-        to='RackGroup',
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True
-    )
-    name = models.CharField(
-        max_length=50
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = ['site', 'rack_group', 'name']
-
-    class Meta:
-        ordering = ['site', 'name']
-        unique_together = ['site', 'name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse('dcim:powerpanel', args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.site.name,
-            self.rack_group.name if self.rack_group else None,
-            self.name,
-        )
-
-    def clean(self):
-
-        # RackGroup must belong to assigned Site
-        if self.rack_group and self.rack_group.site != self.site:
-            raise ValidationError("Rack group {} ({}) is in a different site than {}".format(
-                self.rack_group, self.rack_group.site, self.site
-            ))
-
-
-@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
-class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
-    """
-    An electrical circuit delivered from a PowerPanel.
-    """
-    power_panel = models.ForeignKey(
-        to='PowerPanel',
-        on_delete=models.PROTECT,
-        related_name='powerfeeds'
-    )
-    rack = models.ForeignKey(
-        to='Rack',
-        on_delete=models.PROTECT,
-        blank=True,
-        null=True
-    )
-    connected_endpoint = models.OneToOneField(
-        to='dcim.PowerPort',
-        on_delete=models.SET_NULL,
-        related_name='+',
-        blank=True,
-        null=True
-    )
-    connection_status = models.BooleanField(
-        choices=CONNECTION_STATUS_CHOICES,
-        blank=True,
-        null=True
-    )
-    name = models.CharField(
-        max_length=50
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=PowerFeedStatusChoices,
-        default=PowerFeedStatusChoices.STATUS_ACTIVE
-    )
-    type = models.CharField(
-        max_length=50,
-        choices=PowerFeedTypeChoices,
-        default=PowerFeedTypeChoices.TYPE_PRIMARY
-    )
-    supply = models.CharField(
-        max_length=50,
-        choices=PowerFeedSupplyChoices,
-        default=PowerFeedSupplyChoices.SUPPLY_AC
-    )
-    phase = models.CharField(
-        max_length=50,
-        choices=PowerFeedPhaseChoices,
-        default=PowerFeedPhaseChoices.PHASE_SINGLE
-    )
-    voltage = models.SmallIntegerField(
-        default=POWERFEED_VOLTAGE_DEFAULT,
-        validators=[ExclusionValidator([0])]
-    )
-    amperage = models.PositiveSmallIntegerField(
-        validators=[MinValueValidator(1)],
-        default=POWERFEED_AMPERAGE_DEFAULT
-    )
-    max_utilization = models.PositiveSmallIntegerField(
-        validators=[MinValueValidator(1), MaxValueValidator(100)],
-        default=POWERFEED_MAX_UTILIZATION_DEFAULT,
-        help_text="Maximum permissible draw (percentage)"
-    )
-    available_power = models.PositiveIntegerField(
-        default=0,
-        editable=False
-    )
-    comments = models.TextField(
-        blank=True
-    )
-    custom_field_values = GenericRelation(
-        to='extras.CustomFieldValue',
-        content_type_field='obj_type',
-        object_id_field='obj_id'
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'site', 'power_panel', 'rack_group', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
-        'amperage', 'max_utilization', 'comments',
-    ]
-    clone_fields = [
-        'power_panel', 'rack', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization',
-        'available_power',
-    ]
-
-    STATUS_CLASS_MAP = {
-        PowerFeedStatusChoices.STATUS_OFFLINE: 'warning',
-        PowerFeedStatusChoices.STATUS_ACTIVE: 'success',
-        PowerFeedStatusChoices.STATUS_PLANNED: 'info',
-        PowerFeedStatusChoices.STATUS_FAILED: 'danger',
-    }
-
-    TYPE_CLASS_MAP = {
-        PowerFeedTypeChoices.TYPE_PRIMARY: 'success',
-        PowerFeedTypeChoices.TYPE_REDUNDANT: 'info',
-    }
-
-    class Meta:
-        ordering = ['power_panel', 'name']
-        unique_together = ['power_panel', 'name']
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse('dcim:powerfeed', args=[self.pk])
-
-    def to_csv(self):
-        return (
-            self.power_panel.site.name,
-            self.power_panel.name,
-            self.rack.group.name if self.rack and self.rack.group else None,
-            self.rack.name if self.rack else None,
-            self.name,
-            self.get_status_display(),
-            self.get_type_display(),
-            self.get_supply_display(),
-            self.get_phase_display(),
-            self.voltage,
-            self.amperage,
-            self.max_utilization,
-            self.comments,
-        )
-
-    def clean(self):
-
-        # Rack must belong to same Site as PowerPanel
-        if self.rack and self.rack.site != self.power_panel.site:
-            raise ValidationError("Rack {} ({}) and power panel {} ({}) are in different sites".format(
-                self.rack, self.rack.site, self.power_panel, self.power_panel.site
-            ))
-
-        # AC voltage cannot be negative
-        if self.voltage < 0 and self.supply == PowerFeedSupplyChoices.SUPPLY_AC:
-            raise ValidationError({
-                "voltage": "Voltage cannot be negative for AC supply"
-            })
-
-    def save(self, *args, **kwargs):
-
-        # Cache the available_power property on the instance
-        kva = abs(self.voltage) * self.amperage * (self.max_utilization / 100)
-        if self.phase == PowerFeedPhaseChoices.PHASE_3PHASE:
-            self.available_power = round(kva * 1.732)
-        else:
-            self.available_power = round(kva)
-
-        super().save(*args, **kwargs)
-
-    @property
-    def parent(self):
-        return self.power_panel
-
-    def get_type_class(self):
-        return self.TYPE_CLASS_MAP.get(self.type)
-
-    def get_status_class(self):
-        return self.STATUS_CLASS_MAP.get(self.status)
-
-
-#
-# Cables
-#
-
-@extras_features('custom_links', 'export_templates', 'webhooks')
-class Cable(ChangeLoggedModel):
-    """
-    A physical connection between two endpoints.
-    """
-    termination_a_type = models.ForeignKey(
-        to=ContentType,
-        limit_choices_to=CABLE_TERMINATION_MODELS,
-        on_delete=models.PROTECT,
-        related_name='+'
-    )
-    termination_a_id = models.PositiveIntegerField()
-    termination_a = GenericForeignKey(
-        ct_field='termination_a_type',
-        fk_field='termination_a_id'
-    )
-    termination_b_type = models.ForeignKey(
-        to=ContentType,
-        limit_choices_to=CABLE_TERMINATION_MODELS,
-        on_delete=models.PROTECT,
-        related_name='+'
-    )
-    termination_b_id = models.PositiveIntegerField()
-    termination_b = GenericForeignKey(
-        ct_field='termination_b_type',
-        fk_field='termination_b_id'
-    )
-    type = models.CharField(
-        max_length=50,
-        choices=CableTypeChoices,
-        blank=True
-    )
-    status = models.CharField(
-        max_length=50,
-        choices=CableStatusChoices,
-        default=CableStatusChoices.STATUS_CONNECTED
-    )
-    label = models.CharField(
-        max_length=100,
-        blank=True
-    )
-    color = ColorField(
-        blank=True
-    )
-    length = models.PositiveSmallIntegerField(
-        blank=True,
-        null=True
-    )
-    length_unit = models.CharField(
-        max_length=50,
-        choices=CableLengthUnitChoices,
-        blank=True,
-    )
-    # Stores the normalized length (in meters) for database ordering
-    _abs_length = models.DecimalField(
-        max_digits=10,
-        decimal_places=4,
-        blank=True,
-        null=True
-    )
-    # Cache the associated device (where applicable) for the A and B terminations. This enables filtering of Cables by
-    # their associated Devices.
-    _termination_a_device = models.ForeignKey(
-        to=Device,
-        on_delete=models.CASCADE,
-        related_name='+',
-        blank=True,
-        null=True
-    )
-    _termination_b_device = models.ForeignKey(
-        to=Device,
-        on_delete=models.CASCADE,
-        related_name='+',
-        blank=True,
-        null=True
-    )
-    tags = TaggableManager(through=TaggedItem)
-
-    objects = RestrictedQuerySet.as_manager()
-
-    csv_headers = [
-        'termination_a_type', 'termination_a_id', 'termination_b_type', 'termination_b_id', 'type', 'status', 'label',
-        'color', 'length', 'length_unit',
-    ]
-
-    STATUS_CLASS_MAP = {
-        CableStatusChoices.STATUS_CONNECTED: 'success',
-        CableStatusChoices.STATUS_PLANNED: 'info',
-        CableStatusChoices.STATUS_DECOMMISSIONING: 'warning',
-    }
-
-    class Meta:
-        ordering = ['pk']
-        unique_together = (
-            ('termination_a_type', 'termination_a_id'),
-            ('termination_b_type', 'termination_b_id'),
-        )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        # A copy of the PK to be used by __str__ in case the object is deleted
-        self._pk = self.pk
-
-    @classmethod
-    def from_db(cls, db, field_names, values):
-        """
-        Cache the original A and B terminations of existing Cable instances for later reference inside clean().
-        """
-        instance = super().from_db(db, field_names, values)
-
-        instance._orig_termination_a_type_id = instance.termination_a_type_id
-        instance._orig_termination_a_id = instance.termination_a_id
-        instance._orig_termination_b_type_id = instance.termination_b_type_id
-        instance._orig_termination_b_id = instance.termination_b_id
-
-        return instance
-
-    def __str__(self):
-        return self.label or '#{}'.format(self._pk)
-
-    def get_absolute_url(self):
-        return reverse('dcim:cable', args=[self.pk])
-
-    def clean(self):
-        from circuits.models import CircuitTermination
-
-        # Validate that termination A exists
-        if not hasattr(self, 'termination_a_type'):
-            raise ValidationError('Termination A type has not been specified')
-        try:
-            self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
-        except ObjectDoesNotExist:
-            raise ValidationError({
-                'termination_a': 'Invalid ID for type {}'.format(self.termination_a_type)
-            })
-
-        # Validate that termination B exists
-        if not hasattr(self, 'termination_b_type'):
-            raise ValidationError('Termination B type has not been specified')
-        try:
-            self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
-        except ObjectDoesNotExist:
-            raise ValidationError({
-                'termination_b': 'Invalid ID for type {}'.format(self.termination_b_type)
-            })
-
-        # If editing an existing Cable instance, check that neither termination has been modified.
-        if self.pk:
-            err_msg = 'Cable termination points may not be modified. Delete and recreate the cable instead.'
-            if (
-                self.termination_a_type_id != self._orig_termination_a_type_id or
-                self.termination_a_id != self._orig_termination_a_id
-            ):
-                raise ValidationError({
-                    'termination_a': err_msg
-                })
-            if (
-                self.termination_b_type_id != self._orig_termination_b_type_id or
-                self.termination_b_id != self._orig_termination_b_id
-            ):
-                raise ValidationError({
-                    'termination_b': err_msg
-                })
-
-        type_a = self.termination_a_type.model
-        type_b = self.termination_b_type.model
-
-        # Validate interface types
-        if type_a == 'interface' and self.termination_a.type in NONCONNECTABLE_IFACE_TYPES:
-            raise ValidationError({
-                'termination_a_id': 'Cables cannot be terminated to {} interfaces'.format(
-                    self.termination_a.get_type_display()
-                )
-            })
-        if type_b == 'interface' and self.termination_b.type in NONCONNECTABLE_IFACE_TYPES:
-            raise ValidationError({
-                'termination_b_id': 'Cables cannot be terminated to {} interfaces'.format(
-                    self.termination_b.get_type_display()
-                )
-            })
-
-        # Check that termination types are compatible
-        if type_b not in COMPATIBLE_TERMINATION_TYPES.get(type_a):
-            raise ValidationError(
-                f"Incompatible termination types: {self.termination_a_type} and {self.termination_b_type}"
-            )
-
-        # Check that a RearPort with multiple positions isn't connected to an endpoint
-        # or a RearPort with a different number of positions.
-        for term_a, term_b in [
-            (self.termination_a, self.termination_b),
-            (self.termination_b, self.termination_a)
-        ]:
-            if isinstance(term_a, RearPort) and term_a.positions > 1:
-                if not isinstance(term_b, (FrontPort, RearPort, CircuitTermination)):
-                    raise ValidationError(
-                        "Rear ports with multiple positions may only be connected to other pass-through ports"
-                    )
-                if isinstance(term_b, RearPort) and term_b.positions > 1 and term_a.positions != term_b.positions:
-                    raise ValidationError(
-                        f"{term_a} of {term_a.device} has {term_a.positions} position(s) but "
-                        f"{term_b} of {term_b.device} has {term_b.positions}. "
-                        f"Both terminations must have the same number of positions."
-                    )
-
-        # A termination point cannot be connected to itself
-        if self.termination_a == self.termination_b:
-            raise ValidationError(f"Cannot connect {self.termination_a_type} to itself")
-
-        # A front port cannot be connected to its corresponding rear port
-        if (
-            type_a in ['frontport', 'rearport'] and
-            type_b in ['frontport', 'rearport'] and
-            (
-                getattr(self.termination_a, 'rear_port', None) == self.termination_b or
-                getattr(self.termination_b, 'rear_port', None) == self.termination_a
-            )
-        ):
-            raise ValidationError("A front port cannot be connected to it corresponding rear port")
-
-        # Check for an existing Cable connected to either termination object
-        if self.termination_a.cable not in (None, self):
-            raise ValidationError("{} already has a cable attached (#{})".format(
-                self.termination_a, self.termination_a.cable_id
-            ))
-        if self.termination_b.cable not in (None, self):
-            raise ValidationError("{} already has a cable attached (#{})".format(
-                self.termination_b, self.termination_b.cable_id
-            ))
-
-        # Validate length and length_unit
-        if self.length is not None and not self.length_unit:
-            raise ValidationError("Must specify a unit when setting a cable length")
-        elif self.length is None:
-            self.length_unit = ''
-
-    def save(self, *args, **kwargs):
-
-        # Store the given length (if any) in meters for use in database ordering
-        if self.length and self.length_unit:
-            self._abs_length = to_meters(self.length, self.length_unit)
-        else:
-            self._abs_length = None
-
-        # Store the parent Device for the A and B terminations (if applicable) to enable filtering
-        if hasattr(self.termination_a, 'device'):
-            self._termination_a_device = self.termination_a.device
-        if hasattr(self.termination_b, 'device'):
-            self._termination_b_device = self.termination_b.device
-
-        super().save(*args, **kwargs)
-
-        # Update the private pk used in __str__ in case this is a new object (i.e. just got its pk)
-        self._pk = self.pk
-
-    def to_csv(self):
-        return (
-            '{}.{}'.format(self.termination_a_type.app_label, self.termination_a_type.model),
-            self.termination_a_id,
-            '{}.{}'.format(self.termination_b_type.app_label, self.termination_b_type.model),
-            self.termination_b_id,
-            self.get_type_display(),
-            self.get_status_display(),
-            self.label,
-            self.color,
-            self.length,
-            self.length_unit,
-        )
-
-    def get_status_class(self):
-        return self.STATUS_CLASS_MAP.get(self.status)
-
-    def get_compatible_types(self):
-        """
-        Return all termination types compatible with termination A.
-        """
-        if self.termination_a is None:
-            return
-        return COMPATIBLE_TERMINATION_TYPES[self.termination_a._meta.model_name]
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index e93984cd5..92b0605e9 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -22,6 +22,7 @@ from utilities.utils import serialize_object
 
 
 __all__ = (
+    'BaseInterface',
     'CableTermination',
     'ConsolePort',
     'ConsoleServerPort',
diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py
new file mode 100644
index 000000000..4189e0446
--- /dev/null
+++ b/netbox/dcim/models/devices.py
@@ -0,0 +1,1247 @@
+from collections import OrderedDict
+
+import yaml
+from django.conf import settings
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+from django.db.models import F, ProtectedError
+from django.urls import reverse
+from django.utils.safestring import mark_safe
+from taggit.managers import TaggableManager
+
+from dcim.choices import *
+from dcim.constants import *
+from extras.models import ChangeLoggedModel, ConfigContextModel, CustomFieldModel, TaggedItem
+from extras.utils import extras_features
+from utilities.choices import ColorChoices
+from utilities.fields import ColorField, NaturalOrderingField
+from utilities.querysets import RestrictedQuerySet
+from utilities.utils import to_meters
+from .device_components import *
+
+
+__all__ = (
+    'Cable',
+    'Device',
+    'DeviceRole',
+    'DeviceType',
+    'Manufacturer',
+    'Platform',
+    'VirtualChassis',
+)
+
+
+#
+# Device Types
+#
+
+@extras_features('export_templates', 'webhooks')
+class Manufacturer(ChangeLoggedModel):
+    """
+    A Manufacturer represents a company which produces hardware devices; for example, Juniper or Dell.
+    """
+    name = models.CharField(
+        max_length=50,
+        unique=True
+    )
+    slug = models.SlugField(
+        unique=True
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['name', 'slug', 'description']
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return "{}?manufacturer={}".format(reverse('dcim:devicetype_list'), self.slug)
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.description
+        )
+
+
+@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
+class DeviceType(ChangeLoggedModel, CustomFieldModel):
+    """
+    A DeviceType represents a particular make (Manufacturer) and model of device. It specifies rack height and depth, as
+    well as high-level functional role(s).
+
+    Each DeviceType can have an arbitrary number of component templates assigned to it, which define console, power, and
+    interface objects. For example, a Juniper EX4300-48T DeviceType would have:
+
+      * 1 ConsolePortTemplate
+      * 2 PowerPortTemplates
+      * 48 InterfaceTemplates
+
+    When a new Device of this type is created, the appropriate console, power, and interface objects (as defined by the
+    DeviceType) are automatically created as well.
+    """
+    manufacturer = models.ForeignKey(
+        to='dcim.Manufacturer',
+        on_delete=models.PROTECT,
+        related_name='device_types'
+    )
+    model = models.CharField(
+        max_length=50
+    )
+    slug = models.SlugField()
+    part_number = models.CharField(
+        max_length=50,
+        blank=True,
+        help_text='Discrete part number (optional)'
+    )
+    u_height = models.PositiveSmallIntegerField(
+        default=1,
+        verbose_name='Height (U)'
+    )
+    is_full_depth = models.BooleanField(
+        default=True,
+        verbose_name='Is full depth',
+        help_text='Device consumes both front and rear rack faces'
+    )
+    subdevice_role = models.CharField(
+        max_length=50,
+        choices=SubdeviceRoleChoices,
+        blank=True,
+        verbose_name='Parent/child status',
+        help_text='Parent devices house child devices in device bays. Leave blank '
+                  'if this device type is neither a parent nor a child.'
+    )
+    front_image = models.ImageField(
+        upload_to='devicetype-images',
+        blank=True
+    )
+    rear_image = models.ImageField(
+        upload_to='devicetype-images',
+        blank=True
+    )
+    comments = models.TextField(
+        blank=True
+    )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    clone_fields = [
+        'manufacturer', 'u_height', 'is_full_depth', 'subdevice_role',
+    ]
+
+    class Meta:
+        ordering = ['manufacturer', 'model']
+        unique_together = [
+            ['manufacturer', 'model'],
+            ['manufacturer', 'slug'],
+        ]
+
+    def __str__(self):
+        return self.model
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Save a copy of u_height for validation in clean()
+        self._original_u_height = self.u_height
+
+        # Save references to the original front/rear images
+        self._original_front_image = self.front_image
+        self._original_rear_image = self.rear_image
+
+    def get_absolute_url(self):
+        return reverse('dcim:devicetype', args=[self.pk])
+
+    def to_yaml(self):
+        data = OrderedDict((
+            ('manufacturer', self.manufacturer.name),
+            ('model', self.model),
+            ('slug', self.slug),
+            ('part_number', self.part_number),
+            ('u_height', self.u_height),
+            ('is_full_depth', self.is_full_depth),
+            ('subdevice_role', self.subdevice_role),
+            ('comments', self.comments),
+        ))
+
+        # Component templates
+        if self.consoleporttemplates.exists():
+            data['console-ports'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                }
+                for c in self.consoleporttemplates.all()
+            ]
+        if self.consoleserverporttemplates.exists():
+            data['console-server-ports'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                }
+                for c in self.consoleserverporttemplates.all()
+            ]
+        if self.powerporttemplates.exists():
+            data['power-ports'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                    'maximum_draw': c.maximum_draw,
+                    'allocated_draw': c.allocated_draw,
+                }
+                for c in self.powerporttemplates.all()
+            ]
+        if self.poweroutlettemplates.exists():
+            data['power-outlets'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                    'power_port': c.power_port.name if c.power_port else None,
+                    'feed_leg': c.feed_leg,
+                }
+                for c in self.poweroutlettemplates.all()
+            ]
+        if self.interfacetemplates.exists():
+            data['interfaces'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                    'mgmt_only': c.mgmt_only,
+                }
+                for c in self.interfacetemplates.all()
+            ]
+        if self.frontporttemplates.exists():
+            data['front-ports'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                    'rear_port': c.rear_port.name,
+                    'rear_port_position': c.rear_port_position,
+                }
+                for c in self.frontporttemplates.all()
+            ]
+        if self.rearporttemplates.exists():
+            data['rear-ports'] = [
+                {
+                    'name': c.name,
+                    'type': c.type,
+                    'positions': c.positions,
+                }
+                for c in self.rearporttemplates.all()
+            ]
+        if self.devicebaytemplates.exists():
+            data['device-bays'] = [
+                {
+                    'name': c.name,
+                }
+                for c in self.devicebaytemplates.all()
+            ]
+
+        return yaml.dump(dict(data), sort_keys=False)
+
+    def clean(self):
+
+        # If editing an existing DeviceType to have a larger u_height, first validate that *all* instances of it have
+        # room to expand within their racks. This validation will impose a very high performance penalty when there are
+        # many instances to check, but increasing the u_height of a DeviceType should be a very rare occurrence.
+        if self.pk and self.u_height > self._original_u_height:
+            for d in Device.objects.filter(device_type=self, position__isnull=False):
+                face_required = None if self.is_full_depth else d.face
+                u_available = d.rack.get_available_units(
+                    u_height=self.u_height,
+                    rack_face=face_required,
+                    exclude=[d.pk]
+                )
+                if d.position not in u_available:
+                    raise ValidationError({
+                        'u_height': "Device {} in rack {} does not have sufficient space to accommodate a height of "
+                                    "{}U".format(d, d.rack, self.u_height)
+                    })
+
+        # If modifying the height of an existing DeviceType to 0U, check for any instances assigned to a rack position.
+        elif self.pk and self._original_u_height > 0 and self.u_height == 0:
+            racked_instance_count = Device.objects.filter(
+                device_type=self,
+                position__isnull=False
+            ).count()
+            if racked_instance_count:
+                url = f"{reverse('dcim:device_list')}?manufactuer_id={self.manufacturer_id}&device_type_id={self.pk}"
+                raise ValidationError({
+                    'u_height': mark_safe(
+                        f'Unable to set 0U height: Found <a href="{url}">{racked_instance_count} instances</a> already '
+                        f'mounted within racks.'
+                    )
+                })
+
+        if (
+                self.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT
+        ) and self.devicebaytemplates.count():
+            raise ValidationError({
+                'subdevice_role': "Must delete all device bay templates associated with this device before "
+                                  "declassifying it as a parent device."
+            })
+
+        if self.u_height and self.subdevice_role == SubdeviceRoleChoices.ROLE_CHILD:
+            raise ValidationError({
+                'u_height': "Child device types must be 0U."
+            })
+
+    def save(self, *args, **kwargs):
+        ret = super().save(*args, **kwargs)
+
+        # Delete any previously uploaded image files that are no longer in use
+        if self.front_image != self._original_front_image:
+            self._original_front_image.delete(save=False)
+        if self.rear_image != self._original_rear_image:
+            self._original_rear_image.delete(save=False)
+
+        return ret
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+
+        # Delete any uploaded image files
+        if self.front_image:
+            self.front_image.delete(save=False)
+        if self.rear_image:
+            self.rear_image.delete(save=False)
+
+    @property
+    def display_name(self):
+        return f'{self.manufacturer.name} {self.model}'
+
+    @property
+    def is_parent_device(self):
+        return self.subdevice_role == SubdeviceRoleChoices.ROLE_PARENT
+
+    @property
+    def is_child_device(self):
+        return self.subdevice_role == SubdeviceRoleChoices.ROLE_CHILD
+
+
+#
+# Devices
+#
+
+class DeviceRole(ChangeLoggedModel):
+    """
+    Devices are organized by functional role; for example, "Core Switch" or "File Server". Each DeviceRole is assigned a
+    color to be used when displaying rack elevations. The vm_role field determines whether the role is applicable to
+    virtual machines as well.
+    """
+    name = models.CharField(
+        max_length=50,
+        unique=True
+    )
+    slug = models.SlugField(
+        unique=True
+    )
+    color = ColorField(
+        default=ColorChoices.COLOR_GREY
+    )
+    vm_role = models.BooleanField(
+        default=True,
+        verbose_name='VM Role',
+        help_text='Virtual machines may be assigned to this role'
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True,
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['name', 'slug', 'color', 'vm_role', 'description']
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.color,
+            self.vm_role,
+            self.description,
+        )
+
+
+class Platform(ChangeLoggedModel):
+    """
+    Platform refers to the software or firmware running on a Device. For example, "Cisco IOS-XR" or "Juniper Junos".
+    NetBox uses Platforms to determine how to interact with devices when pulling inventory data or other information by
+    specifying a NAPALM driver.
+    """
+    name = models.CharField(
+        max_length=100,
+        unique=True
+    )
+    slug = models.SlugField(
+        unique=True,
+        max_length=100
+    )
+    manufacturer = models.ForeignKey(
+        to='dcim.Manufacturer',
+        on_delete=models.PROTECT,
+        related_name='platforms',
+        blank=True,
+        null=True,
+        help_text='Optionally limit this platform to devices of a certain manufacturer'
+    )
+    napalm_driver = models.CharField(
+        max_length=50,
+        blank=True,
+        verbose_name='NAPALM driver',
+        help_text='The name of the NAPALM driver to use when interacting with devices'
+    )
+    napalm_args = models.JSONField(
+        blank=True,
+        null=True,
+        verbose_name='NAPALM arguments',
+        help_text='Additional arguments to pass when initiating the NAPALM driver (JSON format)'
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['name', 'slug', 'manufacturer', 'napalm_driver', 'napalm_args', 'description']
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return "{}?platform={}".format(reverse('dcim:device_list'), self.slug)
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.manufacturer.name if self.manufacturer else None,
+            self.napalm_driver,
+            self.napalm_args,
+            self.description,
+        )
+
+
+@extras_features('custom_fields', 'custom_links', 'graphs', 'export_templates', 'webhooks')
+class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel):
+    """
+    A Device represents a piece of physical hardware mounted within a Rack. Each Device is assigned a DeviceType,
+    DeviceRole, and (optionally) a Platform. Device names are not required, however if one is set it must be unique.
+
+    Each Device must be assigned to a site, and optionally to a rack within that site. Associating a device with a
+    particular rack face or unit is optional (for example, vertically mounted PDUs do not consume rack units).
+
+    When a new Device is created, console/power/interface/device bay components are created along with it as dictated
+    by the component templates assigned to its DeviceType. Components can also be added, modified, or deleted after the
+    creation of a Device.
+    """
+    device_type = models.ForeignKey(
+        to='dcim.DeviceType',
+        on_delete=models.PROTECT,
+        related_name='instances'
+    )
+    device_role = models.ForeignKey(
+        to='dcim.DeviceRole',
+        on_delete=models.PROTECT,
+        related_name='devices'
+    )
+    tenant = models.ForeignKey(
+        to='tenancy.Tenant',
+        on_delete=models.PROTECT,
+        related_name='devices',
+        blank=True,
+        null=True
+    )
+    platform = models.ForeignKey(
+        to='dcim.Platform',
+        on_delete=models.SET_NULL,
+        related_name='devices',
+        blank=True,
+        null=True
+    )
+    name = models.CharField(
+        max_length=64,
+        blank=True,
+        null=True
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        max_length=100,
+        blank=True,
+        null=True
+    )
+    serial = models.CharField(
+        max_length=50,
+        blank=True,
+        verbose_name='Serial number'
+    )
+    asset_tag = models.CharField(
+        max_length=50,
+        blank=True,
+        null=True,
+        unique=True,
+        verbose_name='Asset tag',
+        help_text='A unique tag used to identify this device'
+    )
+    site = models.ForeignKey(
+        to='dcim.Site',
+        on_delete=models.PROTECT,
+        related_name='devices'
+    )
+    rack = models.ForeignKey(
+        to='dcim.Rack',
+        on_delete=models.PROTECT,
+        related_name='devices',
+        blank=True,
+        null=True
+    )
+    position = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True,
+        validators=[MinValueValidator(1)],
+        verbose_name='Position (U)',
+        help_text='The lowest-numbered unit occupied by the device'
+    )
+    face = models.CharField(
+        max_length=50,
+        blank=True,
+        choices=DeviceFaceChoices,
+        verbose_name='Rack face'
+    )
+    status = models.CharField(
+        max_length=50,
+        choices=DeviceStatusChoices,
+        default=DeviceStatusChoices.STATUS_ACTIVE
+    )
+    primary_ip4 = models.OneToOneField(
+        to='ipam.IPAddress',
+        on_delete=models.SET_NULL,
+        related_name='primary_ip4_for',
+        blank=True,
+        null=True,
+        verbose_name='Primary IPv4'
+    )
+    primary_ip6 = models.OneToOneField(
+        to='ipam.IPAddress',
+        on_delete=models.SET_NULL,
+        related_name='primary_ip6_for',
+        blank=True,
+        null=True,
+        verbose_name='Primary IPv6'
+    )
+    cluster = models.ForeignKey(
+        to='virtualization.Cluster',
+        on_delete=models.SET_NULL,
+        related_name='devices',
+        blank=True,
+        null=True
+    )
+    virtual_chassis = models.ForeignKey(
+        to='VirtualChassis',
+        on_delete=models.SET_NULL,
+        related_name='members',
+        blank=True,
+        null=True
+    )
+    vc_position = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True,
+        validators=[MaxValueValidator(255)]
+    )
+    vc_priority = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True,
+        validators=[MaxValueValidator(255)]
+    )
+    comments = models.TextField(
+        blank=True
+    )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
+    images = GenericRelation(
+        to='extras.ImageAttachment'
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'name', 'device_role', 'tenant', 'manufacturer', 'device_type', 'platform', 'serial', 'asset_tag', 'status',
+        'site', 'rack_group', 'rack_name', 'position', 'face', 'comments',
+    ]
+    clone_fields = [
+        'device_type', 'device_role', 'tenant', 'platform', 'site', 'rack', 'status', 'cluster',
+    ]
+
+    STATUS_CLASS_MAP = {
+        DeviceStatusChoices.STATUS_OFFLINE: 'warning',
+        DeviceStatusChoices.STATUS_ACTIVE: 'success',
+        DeviceStatusChoices.STATUS_PLANNED: 'info',
+        DeviceStatusChoices.STATUS_STAGED: 'primary',
+        DeviceStatusChoices.STATUS_FAILED: 'danger',
+        DeviceStatusChoices.STATUS_INVENTORY: 'default',
+        DeviceStatusChoices.STATUS_DECOMMISSIONING: 'warning',
+    }
+
+    class Meta:
+        ordering = ('_name', 'pk')  # Name may be null
+        unique_together = (
+            ('site', 'tenant', 'name'),  # See validate_unique below
+            ('rack', 'position', 'face'),
+            ('virtual_chassis', 'vc_position'),
+        )
+
+    def __str__(self):
+        return self.display_name or super().__str__()
+
+    def get_absolute_url(self):
+        return reverse('dcim:device', args=[self.pk])
+
+    def validate_unique(self, exclude=None):
+
+        # 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 Device.objects.exclude(pk=self.pk).filter(
+                    name=self.name,
+                    site=self.site,
+                    tenant__isnull=True
+            ):
+                raise ValidationError({
+                    'name': 'A device with this name already exists.'
+                })
+
+        super().validate_unique(exclude)
+
+    def clean(self):
+
+        super().clean()
+
+        # Validate site/rack combination
+        if self.rack and self.site != self.rack.site:
+            raise ValidationError({
+                'rack': "Rack {} does not belong to site {}.".format(self.rack, self.site),
+            })
+
+        if self.rack is None:
+            if self.face:
+                raise ValidationError({
+                    'face': "Cannot select a rack face without assigning a rack.",
+                })
+            if self.position:
+                raise ValidationError({
+                    'face': "Cannot select a rack position without assigning a rack.",
+                })
+
+        # Validate position/face combination
+        if self.position and not self.face:
+            raise ValidationError({
+                'face': "Must specify rack face when defining rack position.",
+            })
+
+        # Prevent 0U devices from being assigned to a specific position
+        if self.position and self.device_type.u_height == 0:
+            raise ValidationError({
+                'position': "A U0 device type ({}) cannot be assigned to a rack position.".format(self.device_type)
+            })
+
+        if self.rack:
+
+            try:
+                # Child devices cannot be assigned to a rack face/unit
+                if self.device_type.is_child_device and self.face:
+                    raise ValidationError({
+                        'face': "Child device types cannot be assigned to a rack face. This is an attribute of the "
+                                "parent device."
+                    })
+                if self.device_type.is_child_device and self.position:
+                    raise ValidationError({
+                        'position': "Child device types cannot be assigned to a rack position. This is an attribute of "
+                                    "the parent device."
+                    })
+
+                # Validate rack space
+                rack_face = self.face if not self.device_type.is_full_depth else None
+                exclude_list = [self.pk] if self.pk else []
+                available_units = self.rack.get_available_units(
+                    u_height=self.device_type.u_height, rack_face=rack_face, exclude=exclude_list
+                )
+                if self.position and self.position not in available_units:
+                    raise ValidationError({
+                        'position': "U{} is already occupied or does not have sufficient space to accommodate a(n) "
+                                    "{} ({}U).".format(self.position, self.device_type, self.device_type.u_height)
+                    })
+
+            except DeviceType.DoesNotExist:
+                pass
+
+        # Validate primary IP addresses
+        vc_interfaces = self.vc_interfaces.all()
+        if self.primary_ip4:
+            if self.primary_ip4.family != 4:
+                raise ValidationError({
+                    'primary_ip4': f"{self.primary_ip4} is not an IPv4 address."
+                })
+            if self.primary_ip4.assigned_object in vc_interfaces:
+                pass
+            elif self.primary_ip4.nat_inside is not None and self.primary_ip4.nat_inside.assigned_object in vc_interfaces:
+                pass
+            else:
+                raise ValidationError({
+                    'primary_ip4': f"The specified IP address ({self.primary_ip4}) is not assigned to this device."
+                })
+        if self.primary_ip6:
+            if self.primary_ip6.family != 6:
+                raise ValidationError({
+                    'primary_ip6': f"{self.primary_ip6} is not an IPv6 address."
+                })
+            if self.primary_ip6.assigned_object in vc_interfaces:
+                pass
+            elif self.primary_ip6.nat_inside is not None and self.primary_ip6.nat_inside.assigned_object in vc_interfaces:
+                pass
+            else:
+                raise ValidationError({
+                    'primary_ip6': f"The specified IP address ({self.primary_ip6}) is not assigned to this device."
+                })
+
+        # Validate manufacturer/platform
+        if hasattr(self, 'device_type') and self.platform:
+            if self.platform.manufacturer and self.platform.manufacturer != self.device_type.manufacturer:
+                raise ValidationError({
+                    'platform': "The assigned platform is limited to {} device types, but this device's type belongs "
+                                "to {}.".format(self.platform.manufacturer, self.device_type.manufacturer)
+                })
+
+        # A Device can only be assigned to a Cluster in the same Site (or no Site)
+        if self.cluster and self.cluster.site is not None and self.cluster.site != self.site:
+            raise ValidationError({
+                'cluster': "The assigned cluster belongs to a different site ({})".format(self.cluster.site)
+            })
+
+        # Validate virtual chassis assignment
+        if self.virtual_chassis and self.vc_position is None:
+            raise ValidationError({
+                'vc_position': "A device assigned to a virtual chassis must have its position defined."
+            })
+
+    def save(self, *args, **kwargs):
+
+        is_new = not bool(self.pk)
+
+        super().save(*args, **kwargs)
+
+        # If this is a new Device, instantiate all of the related components per the DeviceType definition
+        if is_new:
+            ConsolePort.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.consoleporttemplates.all()]
+            )
+            ConsoleServerPort.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.consoleserverporttemplates.all()]
+            )
+            PowerPort.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.powerporttemplates.all()]
+            )
+            PowerOutlet.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.poweroutlettemplates.all()]
+            )
+            Interface.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.interfacetemplates.all()]
+            )
+            RearPort.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.rearporttemplates.all()]
+            )
+            FrontPort.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.frontporttemplates.all()]
+            )
+            DeviceBay.objects.bulk_create(
+                [x.instantiate(self) for x in self.device_type.devicebaytemplates.all()]
+            )
+
+        # Update Site and Rack assignment for any child Devices
+        devices = Device.objects.filter(parent_bay__device=self)
+        for device in devices:
+            device.site = self.site
+            device.rack = self.rack
+            device.save()
+
+    def to_csv(self):
+        return (
+            self.name or '',
+            self.device_role.name,
+            self.tenant.name if self.tenant else None,
+            self.device_type.manufacturer.name,
+            self.device_type.model,
+            self.platform.name if self.platform else None,
+            self.serial,
+            self.asset_tag,
+            self.get_status_display(),
+            self.site.name,
+            self.rack.group.name if self.rack and self.rack.group else None,
+            self.rack.name if self.rack else None,
+            self.position,
+            self.get_face_display(),
+            self.comments,
+        )
+
+    @property
+    def display_name(self):
+        if self.name:
+            return self.name
+        elif self.virtual_chassis:
+            return f'{self.virtual_chassis.name}:{self.vc_position} ({self.pk})'
+        elif self.device_type:
+            return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})'
+        else:
+            return ''  # Device has not yet been created
+
+    @property
+    def identifier(self):
+        """
+        Return the device name if set; otherwise return the Device's primary key as {pk}
+        """
+        if self.name is not None:
+            return self.name
+        return '{{{}}}'.format(self.pk)
+
+    @property
+    def primary_ip(self):
+        if settings.PREFER_IPV4 and self.primary_ip4:
+            return self.primary_ip4
+        elif self.primary_ip6:
+            return self.primary_ip6
+        elif self.primary_ip4:
+            return self.primary_ip4
+        else:
+            return None
+
+    def get_vc_master(self):
+        """
+        If this Device is a VirtualChassis member, return the VC master. Otherwise, return None.
+        """
+        return self.virtual_chassis.master if self.virtual_chassis else None
+
+    @property
+    def vc_interfaces(self):
+        """
+        Return a QuerySet matching all Interfaces assigned to this Device or, if this Device is a VC master, to another
+        Device belonging to the same VirtualChassis.
+        """
+        filter = Q(device=self)
+        if self.virtual_chassis and self.virtual_chassis.master == self:
+            filter |= Q(device__virtual_chassis=self.virtual_chassis, mgmt_only=False)
+        return Interface.objects.filter(filter)
+
+    def get_cables(self, pk_list=False):
+        """
+        Return a QuerySet or PK list matching all Cables connected to a component of this Device.
+        """
+        cable_pks = []
+        for component_model in [
+            ConsolePort, ConsoleServerPort, PowerPort, PowerOutlet, Interface, FrontPort, RearPort
+        ]:
+            cable_pks += component_model.objects.filter(
+                device=self, cable__isnull=False
+            ).values_list('cable', flat=True)
+        if pk_list:
+            return cable_pks
+        return Cable.objects.filter(pk__in=cable_pks)
+
+    def get_children(self):
+        """
+        Return the set of child Devices installed in DeviceBays within this Device.
+        """
+        return Device.objects.filter(parent_bay__device=self.pk)
+
+    def get_status_class(self):
+        return self.STATUS_CLASS_MAP.get(self.status)
+
+
+#
+# Cables
+#
+
+@extras_features('custom_links', 'export_templates', 'webhooks')
+class Cable(ChangeLoggedModel):
+    """
+    A physical connection between two endpoints.
+    """
+    termination_a_type = models.ForeignKey(
+        to=ContentType,
+        limit_choices_to=CABLE_TERMINATION_MODELS,
+        on_delete=models.PROTECT,
+        related_name='+'
+    )
+    termination_a_id = models.PositiveIntegerField()
+    termination_a = GenericForeignKey(
+        ct_field='termination_a_type',
+        fk_field='termination_a_id'
+    )
+    termination_b_type = models.ForeignKey(
+        to=ContentType,
+        limit_choices_to=CABLE_TERMINATION_MODELS,
+        on_delete=models.PROTECT,
+        related_name='+'
+    )
+    termination_b_id = models.PositiveIntegerField()
+    termination_b = GenericForeignKey(
+        ct_field='termination_b_type',
+        fk_field='termination_b_id'
+    )
+    type = models.CharField(
+        max_length=50,
+        choices=CableTypeChoices,
+        blank=True
+    )
+    status = models.CharField(
+        max_length=50,
+        choices=CableStatusChoices,
+        default=CableStatusChoices.STATUS_CONNECTED
+    )
+    label = models.CharField(
+        max_length=100,
+        blank=True
+    )
+    color = ColorField(
+        blank=True
+    )
+    length = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True
+    )
+    length_unit = models.CharField(
+        max_length=50,
+        choices=CableLengthUnitChoices,
+        blank=True,
+    )
+    # Stores the normalized length (in meters) for database ordering
+    _abs_length = models.DecimalField(
+        max_digits=10,
+        decimal_places=4,
+        blank=True,
+        null=True
+    )
+    # Cache the associated device (where applicable) for the A and B terminations. This enables filtering of Cables by
+    # their associated Devices.
+    _termination_a_device = models.ForeignKey(
+        to=Device,
+        on_delete=models.CASCADE,
+        related_name='+',
+        blank=True,
+        null=True
+    )
+    _termination_b_device = models.ForeignKey(
+        to=Device,
+        on_delete=models.CASCADE,
+        related_name='+',
+        blank=True,
+        null=True
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'termination_a_type', 'termination_a_id', 'termination_b_type', 'termination_b_id', 'type', 'status', 'label',
+        'color', 'length', 'length_unit',
+    ]
+
+    STATUS_CLASS_MAP = {
+        CableStatusChoices.STATUS_CONNECTED: 'success',
+        CableStatusChoices.STATUS_PLANNED: 'info',
+        CableStatusChoices.STATUS_DECOMMISSIONING: 'warning',
+    }
+
+    class Meta:
+        ordering = ['pk']
+        unique_together = (
+            ('termination_a_type', 'termination_a_id'),
+            ('termination_b_type', 'termination_b_id'),
+        )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # A copy of the PK to be used by __str__ in case the object is deleted
+        self._pk = self.pk
+
+    @classmethod
+    def from_db(cls, db, field_names, values):
+        """
+        Cache the original A and B terminations of existing Cable instances for later reference inside clean().
+        """
+        instance = super().from_db(db, field_names, values)
+
+        instance._orig_termination_a_type_id = instance.termination_a_type_id
+        instance._orig_termination_a_id = instance.termination_a_id
+        instance._orig_termination_b_type_id = instance.termination_b_type_id
+        instance._orig_termination_b_id = instance.termination_b_id
+
+        return instance
+
+    def __str__(self):
+        return self.label or '#{}'.format(self._pk)
+
+    def get_absolute_url(self):
+        return reverse('dcim:cable', args=[self.pk])
+
+    def clean(self):
+        from circuits.models import CircuitTermination
+
+        # Validate that termination A exists
+        if not hasattr(self, 'termination_a_type'):
+            raise ValidationError('Termination A type has not been specified')
+        try:
+            self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
+        except ObjectDoesNotExist:
+            raise ValidationError({
+                'termination_a': 'Invalid ID for type {}'.format(self.termination_a_type)
+            })
+
+        # Validate that termination B exists
+        if not hasattr(self, 'termination_b_type'):
+            raise ValidationError('Termination B type has not been specified')
+        try:
+            self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
+        except ObjectDoesNotExist:
+            raise ValidationError({
+                'termination_b': 'Invalid ID for type {}'.format(self.termination_b_type)
+            })
+
+        # If editing an existing Cable instance, check that neither termination has been modified.
+        if self.pk:
+            err_msg = 'Cable termination points may not be modified. Delete and recreate the cable instead.'
+            if (
+                self.termination_a_type_id != self._orig_termination_a_type_id or
+                self.termination_a_id != self._orig_termination_a_id
+            ):
+                raise ValidationError({
+                    'termination_a': err_msg
+                })
+            if (
+                self.termination_b_type_id != self._orig_termination_b_type_id or
+                self.termination_b_id != self._orig_termination_b_id
+            ):
+                raise ValidationError({
+                    'termination_b': err_msg
+                })
+
+        type_a = self.termination_a_type.model
+        type_b = self.termination_b_type.model
+
+        # Validate interface types
+        if type_a == 'interface' and self.termination_a.type in NONCONNECTABLE_IFACE_TYPES:
+            raise ValidationError({
+                'termination_a_id': 'Cables cannot be terminated to {} interfaces'.format(
+                    self.termination_a.get_type_display()
+                )
+            })
+        if type_b == 'interface' and self.termination_b.type in NONCONNECTABLE_IFACE_TYPES:
+            raise ValidationError({
+                'termination_b_id': 'Cables cannot be terminated to {} interfaces'.format(
+                    self.termination_b.get_type_display()
+                )
+            })
+
+        # Check that termination types are compatible
+        if type_b not in COMPATIBLE_TERMINATION_TYPES.get(type_a):
+            raise ValidationError(
+                f"Incompatible termination types: {self.termination_a_type} and {self.termination_b_type}"
+            )
+
+        # Check that a RearPort with multiple positions isn't connected to an endpoint
+        # or a RearPort with a different number of positions.
+        for term_a, term_b in [
+            (self.termination_a, self.termination_b),
+            (self.termination_b, self.termination_a)
+        ]:
+            if isinstance(term_a, RearPort) and term_a.positions > 1:
+                if not isinstance(term_b, (FrontPort, RearPort, CircuitTermination)):
+                    raise ValidationError(
+                        "Rear ports with multiple positions may only be connected to other pass-through ports"
+                    )
+                if isinstance(term_b, RearPort) and term_b.positions > 1 and term_a.positions != term_b.positions:
+                    raise ValidationError(
+                        f"{term_a} of {term_a.device} has {term_a.positions} position(s) but "
+                        f"{term_b} of {term_b.device} has {term_b.positions}. "
+                        f"Both terminations must have the same number of positions."
+                    )
+
+        # A termination point cannot be connected to itself
+        if self.termination_a == self.termination_b:
+            raise ValidationError(f"Cannot connect {self.termination_a_type} to itself")
+
+        # A front port cannot be connected to its corresponding rear port
+        if (
+            type_a in ['frontport', 'rearport'] and
+            type_b in ['frontport', 'rearport'] and
+            (
+                getattr(self.termination_a, 'rear_port', None) == self.termination_b or
+                getattr(self.termination_b, 'rear_port', None) == self.termination_a
+            )
+        ):
+            raise ValidationError("A front port cannot be connected to it corresponding rear port")
+
+        # Check for an existing Cable connected to either termination object
+        if self.termination_a.cable not in (None, self):
+            raise ValidationError("{} already has a cable attached (#{})".format(
+                self.termination_a, self.termination_a.cable_id
+            ))
+        if self.termination_b.cable not in (None, self):
+            raise ValidationError("{} already has a cable attached (#{})".format(
+                self.termination_b, self.termination_b.cable_id
+            ))
+
+        # Validate length and length_unit
+        if self.length is not None and not self.length_unit:
+            raise ValidationError("Must specify a unit when setting a cable length")
+        elif self.length is None:
+            self.length_unit = ''
+
+    def save(self, *args, **kwargs):
+
+        # Store the given length (if any) in meters for use in database ordering
+        if self.length and self.length_unit:
+            self._abs_length = to_meters(self.length, self.length_unit)
+        else:
+            self._abs_length = None
+
+        # Store the parent Device for the A and B terminations (if applicable) to enable filtering
+        if hasattr(self.termination_a, 'device'):
+            self._termination_a_device = self.termination_a.device
+        if hasattr(self.termination_b, 'device'):
+            self._termination_b_device = self.termination_b.device
+
+        super().save(*args, **kwargs)
+
+        # Update the private pk used in __str__ in case this is a new object (i.e. just got its pk)
+        self._pk = self.pk
+
+    def to_csv(self):
+        return (
+            '{}.{}'.format(self.termination_a_type.app_label, self.termination_a_type.model),
+            self.termination_a_id,
+            '{}.{}'.format(self.termination_b_type.app_label, self.termination_b_type.model),
+            self.termination_b_id,
+            self.get_type_display(),
+            self.get_status_display(),
+            self.label,
+            self.color,
+            self.length,
+            self.length_unit,
+        )
+
+    def get_status_class(self):
+        return self.STATUS_CLASS_MAP.get(self.status)
+
+    def get_compatible_types(self):
+        """
+        Return all termination types compatible with termination A.
+        """
+        if self.termination_a is None:
+            return
+        return COMPATIBLE_TERMINATION_TYPES[self.termination_a._meta.model_name]
+
+
+#
+# Virtual chassis
+#
+
+@extras_features('custom_links', 'export_templates', 'webhooks')
+class VirtualChassis(ChangeLoggedModel):
+    """
+    A collection of Devices which operate with a shared control plane (e.g. a switch stack).
+    """
+    master = models.OneToOneField(
+        to='Device',
+        on_delete=models.PROTECT,
+        related_name='vc_master_for',
+        blank=True,
+        null=True
+    )
+    name = models.CharField(
+        max_length=64
+    )
+    domain = models.CharField(
+        max_length=30,
+        blank=True
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['name', 'domain', 'master']
+
+    class Meta:
+        ordering = ['name']
+        verbose_name_plural = 'virtual chassis'
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('dcim:virtualchassis', kwargs={'pk': self.pk})
+
+    def clean(self):
+
+        # Verify that the selected master device has been assigned to this VirtualChassis. (Skip when creating a new
+        # VirtualChassis.)
+        if self.pk and self.master and self.master not in self.members.all():
+            raise ValidationError({
+                'master': f"The selected master ({self.master}) is not assigned to this virtual chassis."
+            })
+
+    def delete(self, *args, **kwargs):
+
+        # Check for LAG interfaces split across member chassis
+        interfaces = Interface.objects.filter(
+            device__in=self.members.all(),
+            lag__isnull=False
+        ).exclude(
+            lag__device=F('device')
+        )
+        if interfaces:
+            raise ProtectedError(
+                f"Unable to delete virtual chassis {self}. There are member interfaces which form a cross-chassis LAG",
+                interfaces
+            )
+
+        return super().delete(*args, **kwargs)
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.domain,
+            self.master.name if self.master else None,
+        )
diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py
new file mode 100644
index 000000000..f760fea13
--- /dev/null
+++ b/netbox/dcim/models/power.py
@@ -0,0 +1,237 @@
+from django.contrib.contenttypes.fields import GenericRelation
+from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+from django.urls import reverse
+from taggit.managers import TaggableManager
+
+from dcim.choices import *
+from dcim.constants import *
+from extras.models import ChangeLoggedModel, CustomFieldModel, TaggedItem
+from extras.utils import extras_features
+from utilities.querysets import RestrictedQuerySet
+from utilities.validators import ExclusionValidator
+from .device_components import CableTermination
+
+__all__ = (
+    'PowerFeed',
+    'PowerPanel',
+)
+
+
+#
+# Power
+#
+
+@extras_features('custom_links', 'export_templates', 'webhooks')
+class PowerPanel(ChangeLoggedModel):
+    """
+    A distribution point for electrical power; e.g. a data center RPP.
+    """
+    site = models.ForeignKey(
+        to='Site',
+        on_delete=models.PROTECT
+    )
+    rack_group = models.ForeignKey(
+        to='RackGroup',
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True
+    )
+    name = models.CharField(
+        max_length=50
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['site', 'rack_group', 'name']
+
+    class Meta:
+        ordering = ['site', 'name']
+        unique_together = ['site', 'name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('dcim:powerpanel', args=[self.pk])
+
+    def to_csv(self):
+        return (
+            self.site.name,
+            self.rack_group.name if self.rack_group else None,
+            self.name,
+        )
+
+    def clean(self):
+
+        # RackGroup must belong to assigned Site
+        if self.rack_group and self.rack_group.site != self.site:
+            raise ValidationError("Rack group {} ({}) is in a different site than {}".format(
+                self.rack_group, self.rack_group.site, self.site
+            ))
+
+
+@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
+class PowerFeed(ChangeLoggedModel, CableTermination, CustomFieldModel):
+    """
+    An electrical circuit delivered from a PowerPanel.
+    """
+    power_panel = models.ForeignKey(
+        to='PowerPanel',
+        on_delete=models.PROTECT,
+        related_name='powerfeeds'
+    )
+    rack = models.ForeignKey(
+        to='Rack',
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True
+    )
+    connected_endpoint = models.OneToOneField(
+        to='dcim.PowerPort',
+        on_delete=models.SET_NULL,
+        related_name='+',
+        blank=True,
+        null=True
+    )
+    connection_status = models.BooleanField(
+        choices=CONNECTION_STATUS_CHOICES,
+        blank=True,
+        null=True
+    )
+    name = models.CharField(
+        max_length=50
+    )
+    status = models.CharField(
+        max_length=50,
+        choices=PowerFeedStatusChoices,
+        default=PowerFeedStatusChoices.STATUS_ACTIVE
+    )
+    type = models.CharField(
+        max_length=50,
+        choices=PowerFeedTypeChoices,
+        default=PowerFeedTypeChoices.TYPE_PRIMARY
+    )
+    supply = models.CharField(
+        max_length=50,
+        choices=PowerFeedSupplyChoices,
+        default=PowerFeedSupplyChoices.SUPPLY_AC
+    )
+    phase = models.CharField(
+        max_length=50,
+        choices=PowerFeedPhaseChoices,
+        default=PowerFeedPhaseChoices.PHASE_SINGLE
+    )
+    voltage = models.SmallIntegerField(
+        default=POWERFEED_VOLTAGE_DEFAULT,
+        validators=[ExclusionValidator([0])]
+    )
+    amperage = models.PositiveSmallIntegerField(
+        validators=[MinValueValidator(1)],
+        default=POWERFEED_AMPERAGE_DEFAULT
+    )
+    max_utilization = models.PositiveSmallIntegerField(
+        validators=[MinValueValidator(1), MaxValueValidator(100)],
+        default=POWERFEED_MAX_UTILIZATION_DEFAULT,
+        help_text="Maximum permissible draw (percentage)"
+    )
+    available_power = models.PositiveIntegerField(
+        default=0,
+        editable=False
+    )
+    comments = models.TextField(
+        blank=True
+    )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'site', 'power_panel', 'rack_group', 'rack', 'name', 'status', 'type', 'supply', 'phase', 'voltage',
+        'amperage', 'max_utilization', 'comments',
+    ]
+    clone_fields = [
+        'power_panel', 'rack', 'status', 'type', 'supply', 'phase', 'voltage', 'amperage', 'max_utilization',
+        'available_power',
+    ]
+
+    STATUS_CLASS_MAP = {
+        PowerFeedStatusChoices.STATUS_OFFLINE: 'warning',
+        PowerFeedStatusChoices.STATUS_ACTIVE: 'success',
+        PowerFeedStatusChoices.STATUS_PLANNED: 'info',
+        PowerFeedStatusChoices.STATUS_FAILED: 'danger',
+    }
+
+    TYPE_CLASS_MAP = {
+        PowerFeedTypeChoices.TYPE_PRIMARY: 'success',
+        PowerFeedTypeChoices.TYPE_REDUNDANT: 'info',
+    }
+
+    class Meta:
+        ordering = ['power_panel', 'name']
+        unique_together = ['power_panel', 'name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('dcim:powerfeed', args=[self.pk])
+
+    def to_csv(self):
+        return (
+            self.power_panel.site.name,
+            self.power_panel.name,
+            self.rack.group.name if self.rack and self.rack.group else None,
+            self.rack.name if self.rack else None,
+            self.name,
+            self.get_status_display(),
+            self.get_type_display(),
+            self.get_supply_display(),
+            self.get_phase_display(),
+            self.voltage,
+            self.amperage,
+            self.max_utilization,
+            self.comments,
+        )
+
+    def clean(self):
+
+        # Rack must belong to same Site as PowerPanel
+        if self.rack and self.rack.site != self.power_panel.site:
+            raise ValidationError("Rack {} ({}) and power panel {} ({}) are in different sites".format(
+                self.rack, self.rack.site, self.power_panel, self.power_panel.site
+            ))
+
+        # AC voltage cannot be negative
+        if self.voltage < 0 and self.supply == PowerFeedSupplyChoices.SUPPLY_AC:
+            raise ValidationError({
+                "voltage": "Voltage cannot be negative for AC supply"
+            })
+
+    def save(self, *args, **kwargs):
+
+        # Cache the available_power property on the instance
+        kva = abs(self.voltage) * self.amperage * (self.max_utilization / 100)
+        if self.phase == PowerFeedPhaseChoices.PHASE_3PHASE:
+            self.available_power = round(kva * 1.732)
+        else:
+            self.available_power = round(kva)
+
+        super().save(*args, **kwargs)
+
+    @property
+    def parent(self):
+        return self.power_panel
+
+    def get_type_class(self):
+        return self.TYPE_CLASS_MAP.get(self.type)
+
+    def get_status_class(self):
+        return self.STATUS_CLASS_MAP.get(self.status)
diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py
new file mode 100644
index 000000000..3169272b4
--- /dev/null
+++ b/netbox/dcim/models/racks.py
@@ -0,0 +1,655 @@
+from collections import OrderedDict
+from itertools import count, groupby
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.contenttypes.fields import GenericRelation
+from django.contrib.postgres.fields import ArrayField
+from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+from django.db.models import Count, Sum
+from django.urls import reverse
+from mptt.models import MPTTModel, TreeForeignKey
+from taggit.managers import TaggableManager
+
+from dcim.choices import *
+from dcim.constants import *
+from dcim.elevations import RackElevationSVG
+from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
+from extras.utils import extras_features
+from utilities.choices import ColorChoices
+from utilities.fields import ColorField, NaturalOrderingField
+from utilities.querysets import RestrictedQuerySet
+from utilities.mptt import TreeManager
+from utilities.utils import serialize_object
+from .devices import Device
+from .power import PowerFeed
+
+__all__ = (
+    'Rack',
+    'RackGroup',
+    'RackReservation',
+    'RackRole',
+)
+
+
+#
+# Racks
+#
+
+@extras_features('export_templates')
+class RackGroup(MPTTModel, ChangeLoggedModel):
+    """
+    Racks can be grouped as subsets within a Site. The scope of a group will depend on how Sites are defined. For
+    example, if a Site spans a corporate campus, a RackGroup might be defined to represent each building within that
+    campus. If a Site instead represents a single building, a RackGroup might represent a single room or floor.
+    """
+    name = models.CharField(
+        max_length=50
+    )
+    slug = models.SlugField()
+    site = models.ForeignKey(
+        to='dcim.Site',
+        on_delete=models.CASCADE,
+        related_name='rack_groups'
+    )
+    parent = TreeForeignKey(
+        to='self',
+        on_delete=models.CASCADE,
+        related_name='children',
+        blank=True,
+        null=True,
+        db_index=True
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
+    objects = TreeManager()
+
+    csv_headers = ['site', 'parent', 'name', 'slug', 'description']
+
+    class Meta:
+        ordering = ['site', 'name']
+        unique_together = [
+            ['site', 'name'],
+            ['site', 'slug'],
+        ]
+
+    class MPTTMeta:
+        order_insertion_by = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return "{}?group_id={}".format(reverse('dcim:rack_list'), self.pk)
+
+    def to_csv(self):
+        return (
+            self.site,
+            self.parent.name if self.parent else '',
+            self.name,
+            self.slug,
+            self.description,
+        )
+
+    def to_objectchange(self, action):
+        # Remove MPTT-internal fields
+        return ObjectChange(
+            changed_object=self,
+            object_repr=str(self),
+            action=action,
+            object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
+        )
+
+    def clean(self):
+
+        # Parent RackGroup (if any) must belong to the same Site
+        if self.parent and self.parent.site != self.site:
+            raise ValidationError(f"Parent rack group ({self.parent}) must belong to the same site ({self.site})")
+
+
+class RackRole(ChangeLoggedModel):
+    """
+    Racks can be organized by functional role, similar to Devices.
+    """
+    name = models.CharField(
+        max_length=50,
+        unique=True
+    )
+    slug = models.SlugField(
+        unique=True
+    )
+    color = ColorField(
+        default=ColorChoices.COLOR_GREY
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True,
+    )
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['name', 'slug', 'color', 'description']
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return "{}?role={}".format(reverse('dcim:rack_list'), self.slug)
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.color,
+            self.description,
+        )
+
+
+@extras_features('custom_fields', 'custom_links', 'export_templates', 'webhooks')
+class Rack(ChangeLoggedModel, CustomFieldModel):
+    """
+    Devices are housed within Racks. Each rack has a defined height measured in rack units, and a front and rear face.
+    Each Rack is assigned to a Site and (optionally) a RackGroup.
+    """
+    name = models.CharField(
+        max_length=50
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        max_length=100,
+        blank=True
+    )
+    facility_id = models.CharField(
+        max_length=50,
+        blank=True,
+        null=True,
+        verbose_name='Facility ID',
+        help_text='Locally-assigned identifier'
+    )
+    site = models.ForeignKey(
+        to='dcim.Site',
+        on_delete=models.PROTECT,
+        related_name='racks'
+    )
+    group = models.ForeignKey(
+        to='dcim.RackGroup',
+        on_delete=models.SET_NULL,
+        related_name='racks',
+        blank=True,
+        null=True,
+        help_text='Assigned group'
+    )
+    tenant = models.ForeignKey(
+        to='tenancy.Tenant',
+        on_delete=models.PROTECT,
+        related_name='racks',
+        blank=True,
+        null=True
+    )
+    status = models.CharField(
+        max_length=50,
+        choices=RackStatusChoices,
+        default=RackStatusChoices.STATUS_ACTIVE
+    )
+    role = models.ForeignKey(
+        to='dcim.RackRole',
+        on_delete=models.PROTECT,
+        related_name='racks',
+        blank=True,
+        null=True,
+        help_text='Functional role'
+    )
+    serial = models.CharField(
+        max_length=50,
+        blank=True,
+        verbose_name='Serial number'
+    )
+    asset_tag = models.CharField(
+        max_length=50,
+        blank=True,
+        null=True,
+        unique=True,
+        verbose_name='Asset tag',
+        help_text='A unique tag used to identify this rack'
+    )
+    type = models.CharField(
+        choices=RackTypeChoices,
+        max_length=50,
+        blank=True,
+        verbose_name='Type'
+    )
+    width = models.PositiveSmallIntegerField(
+        choices=RackWidthChoices,
+        default=RackWidthChoices.WIDTH_19IN,
+        verbose_name='Width',
+        help_text='Rail-to-rail width'
+    )
+    u_height = models.PositiveSmallIntegerField(
+        default=RACK_U_HEIGHT_DEFAULT,
+        verbose_name='Height (U)',
+        validators=[MinValueValidator(1), MaxValueValidator(100)],
+        help_text='Height in rack units'
+    )
+    desc_units = models.BooleanField(
+        default=False,
+        verbose_name='Descending units',
+        help_text='Units are numbered top-to-bottom'
+    )
+    outer_width = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True,
+        help_text='Outer dimension of rack (width)'
+    )
+    outer_depth = models.PositiveSmallIntegerField(
+        blank=True,
+        null=True,
+        help_text='Outer dimension of rack (depth)'
+    )
+    outer_unit = models.CharField(
+        max_length=50,
+        choices=RackDimensionUnitChoices,
+        blank=True,
+    )
+    comments = models.TextField(
+        blank=True
+    )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
+    images = GenericRelation(
+        to='extras.ImageAttachment'
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'site', 'group', 'name', 'facility_id', 'tenant', 'status', 'role', 'type', 'serial', 'asset_tag', 'width',
+        'u_height', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', 'comments',
+    ]
+    clone_fields = [
+        'site', 'group', 'tenant', 'status', 'role', 'type', 'width', 'u_height', 'desc_units', 'outer_width',
+        'outer_depth', 'outer_unit',
+    ]
+
+    STATUS_CLASS_MAP = {
+        RackStatusChoices.STATUS_RESERVED: 'warning',
+        RackStatusChoices.STATUS_AVAILABLE: 'success',
+        RackStatusChoices.STATUS_PLANNED: 'info',
+        RackStatusChoices.STATUS_ACTIVE: 'primary',
+        RackStatusChoices.STATUS_DEPRECATED: 'danger',
+    }
+
+    class Meta:
+        ordering = ('site', 'group', '_name', 'pk')  # (site, group, name) may be non-unique
+        unique_together = (
+            # Name and facility_id must be unique *only* within a RackGroup
+            ('group', 'name'),
+            ('group', 'facility_id'),
+        )
+
+    def __str__(self):
+        return self.display_name or super().__str__()
+
+    def get_absolute_url(self):
+        return reverse('dcim:rack', args=[self.pk])
+
+    def clean(self):
+
+        # Validate outer dimensions and unit
+        if (self.outer_width is not None or self.outer_depth is not None) and not self.outer_unit:
+            raise ValidationError("Must specify a unit when setting an outer width/depth")
+        elif self.outer_width is None and self.outer_depth is None:
+            self.outer_unit = ''
+
+        if self.pk:
+            # Validate that Rack is tall enough to house the installed Devices
+            top_device = Device.objects.filter(
+                rack=self
+            ).exclude(
+                position__isnull=True
+            ).order_by('-position').first()
+            if top_device:
+                min_height = top_device.position + top_device.device_type.u_height - 1
+                if self.u_height < min_height:
+                    raise ValidationError({
+                        'u_height': "Rack must be at least {}U tall to house currently installed devices.".format(
+                            min_height
+                        )
+                    })
+            # Validate that Rack was assigned a group of its same site, if applicable
+            if self.group:
+                if self.group.site != self.site:
+                    raise ValidationError({
+                        'group': "Rack group must be from the same site, {}.".format(self.site)
+                    })
+
+    def save(self, *args, **kwargs):
+
+        # Record the original site assignment for this rack.
+        _site_id = None
+        if self.pk:
+            _site_id = Rack.objects.get(pk=self.pk).site_id
+
+        super().save(*args, **kwargs)
+
+        # Update racked devices if the assigned Site has been changed.
+        if _site_id is not None and self.site_id != _site_id:
+            devices = Device.objects.filter(rack=self)
+            for device in devices:
+                device.site = self.site
+                device.save()
+
+    def to_csv(self):
+        return (
+            self.site.name,
+            self.group.name if self.group else None,
+            self.name,
+            self.facility_id,
+            self.tenant.name if self.tenant else None,
+            self.get_status_display(),
+            self.role.name if self.role else None,
+            self.get_type_display() if self.type else None,
+            self.serial,
+            self.asset_tag,
+            self.width,
+            self.u_height,
+            self.desc_units,
+            self.outer_width,
+            self.outer_depth,
+            self.outer_unit,
+            self.comments,
+        )
+
+    @property
+    def units(self):
+        if self.desc_units:
+            return range(1, self.u_height + 1)
+        else:
+            return reversed(range(1, self.u_height + 1))
+
+    @property
+    def display_name(self):
+        if self.facility_id:
+            return f'{self.name} ({self.facility_id})'
+        return self.name
+
+    def get_status_class(self):
+        return self.STATUS_CLASS_MAP.get(self.status)
+
+    def get_rack_units(self, user=None, face=DeviceFaceChoices.FACE_FRONT, exclude=None, expand_devices=True):
+        """
+        Return a list of rack units as dictionaries. Example: {'device': None, 'face': 0, 'id': 48, 'name': 'U48'}
+        Each key 'device' is either a Device or None. By default, multi-U devices are repeated for each U they occupy.
+
+        :param face: Rack face (front or rear)
+        :param user: User instance to be used for evaluating device view permissions. If None, all devices
+            will be included.
+        :param exclude: PK of a Device to exclude (optional); helpful when relocating a Device within a Rack
+        :param expand_devices: When True, all units that a device occupies will be listed with each containing a
+            reference to the device. When False, only the bottom most unit for a device is included and that unit
+            contains a height attribute for the device
+        """
+
+        elevation = OrderedDict()
+        for u in self.units:
+            elevation[u] = {
+                'id': u,
+                'name': f'U{u}',
+                'face': face,
+                'device': None,
+                'occupied': False
+            }
+
+        # Add devices to rack units list
+        if self.pk:
+
+            # Retrieve all devices installed within the rack
+            queryset = Device.objects.prefetch_related(
+                'device_type',
+                'device_type__manufacturer',
+                'device_role'
+            ).annotate(
+                devicebay_count=Count('devicebays')
+            ).exclude(
+                pk=exclude
+            ).filter(
+                rack=self,
+                position__gt=0,
+                device_type__u_height__gt=0
+            ).filter(
+                Q(face=face) | Q(device_type__is_full_depth=True)
+            )
+
+            # Determine which devices the user has permission to view
+            permitted_device_ids = []
+            if user is not None:
+                permitted_device_ids = self.devices.restrict(user, 'view').values_list('pk', flat=True)
+
+            for device in queryset:
+                if expand_devices:
+                    for u in range(device.position, device.position + device.device_type.u_height):
+                        if user is None or device.pk in permitted_device_ids:
+                            elevation[u]['device'] = device
+                        elevation[u]['occupied'] = True
+                else:
+                    if user is None or device.pk in permitted_device_ids:
+                        elevation[device.position]['device'] = device
+                    elevation[device.position]['occupied'] = True
+                    elevation[device.position]['height'] = device.device_type.u_height
+                    for u in range(device.position + 1, device.position + device.device_type.u_height):
+                        elevation.pop(u, None)
+
+        return [u for u in elevation.values()]
+
+    def get_available_units(self, u_height=1, rack_face=None, exclude=None):
+        """
+        Return a list of units within the rack available to accommodate a device of a given U height (default 1).
+        Optionally exclude one or more devices when calculating empty units (needed when moving a device from one
+        position to another within a rack).
+
+        :param u_height: Minimum number of contiguous free units required
+        :param rack_face: The face of the rack (front or rear) required; 'None' if device is full depth
+        :param exclude: List of devices IDs to exclude (useful when moving a device within a rack)
+        """
+        # Gather all devices which consume U space within the rack
+        devices = self.devices.prefetch_related('device_type').filter(position__gte=1)
+        if exclude is not None:
+            devices = devices.exclude(pk__in=exclude)
+
+        # Initialize the rack unit skeleton
+        units = list(range(1, self.u_height + 1))
+
+        # Remove units consumed by installed devices
+        for d in devices:
+            if rack_face is None or d.face == rack_face or d.device_type.is_full_depth:
+                for u in range(d.position, d.position + d.device_type.u_height):
+                    try:
+                        units.remove(u)
+                    except ValueError:
+                        # Found overlapping devices in the rack!
+                        pass
+
+        # Remove units without enough space above them to accommodate a device of the specified height
+        available_units = []
+        for u in units:
+            if set(range(u, u + u_height)).issubset(units):
+                available_units.append(u)
+
+        return list(reversed(available_units))
+
+    def get_reserved_units(self):
+        """
+        Return a dictionary mapping all reserved units within the rack to their reservation.
+        """
+        reserved_units = {}
+        for r in self.reservations.all():
+            for u in r.units:
+                reserved_units[u] = r
+        return reserved_units
+
+    def get_elevation_svg(
+            self,
+            face=DeviceFaceChoices.FACE_FRONT,
+            user=None,
+            unit_width=settings.RACK_ELEVATION_DEFAULT_UNIT_WIDTH,
+            unit_height=settings.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT,
+            legend_width=RACK_ELEVATION_LEGEND_WIDTH_DEFAULT,
+            include_images=True,
+            base_url=None
+    ):
+        """
+        Return an SVG of the rack elevation
+
+        :param face: Enum of [front, rear] representing the desired side of the rack elevation to render
+        :param user: User instance to be used for evaluating device view permissions. If None, all devices
+            will be included.
+        :param unit_width: Width in pixels for the rendered drawing
+        :param unit_height: Height of each rack unit for the rendered drawing. Note this is not the total
+            height of the elevation
+        :param legend_width: Width of the unit legend, in pixels
+        :param include_images: Embed front/rear device images where available
+        :param base_url: Base URL for links and images. If none, URLs will be relative.
+        """
+        elevation = RackElevationSVG(self, user=user, include_images=include_images, base_url=base_url)
+
+        return elevation.render(face, unit_width, unit_height, legend_width)
+
+    def get_0u_devices(self):
+        return self.devices.filter(position=0)
+
+    def get_utilization(self):
+        """
+        Determine the utilization rate of the rack and return it as a percentage. Occupied and reserved units both count
+        as utilized.
+        """
+        # Determine unoccupied units
+        available_units = self.get_available_units()
+
+        # Remove reserved units
+        for u in self.get_reserved_units():
+            if u in available_units:
+                available_units.remove(u)
+
+        occupied_unit_count = self.u_height - len(available_units)
+        percentage = int(float(occupied_unit_count) / self.u_height * 100)
+
+        return percentage
+
+    def get_power_utilization(self):
+        """
+        Determine the utilization rate of power in the rack and return it as a percentage.
+        """
+        power_stats = PowerFeed.objects.filter(
+            rack=self
+        ).annotate(
+            allocated_draw_total=Sum('connected_endpoint__poweroutlets__connected_endpoint__allocated_draw'),
+        ).values(
+            'allocated_draw_total',
+            'available_power'
+        )
+
+        if power_stats:
+            allocated_draw_total = sum(x['allocated_draw_total'] or 0 for x in power_stats)
+            available_power_total = sum(x['available_power'] for x in power_stats)
+            return int(allocated_draw_total / available_power_total * 100) or 0
+        return 0
+
+
+@extras_features('custom_links', 'export_templates', 'webhooks')
+class RackReservation(ChangeLoggedModel):
+    """
+    One or more reserved units within a Rack.
+    """
+    rack = models.ForeignKey(
+        to='dcim.Rack',
+        on_delete=models.CASCADE,
+        related_name='reservations'
+    )
+    units = ArrayField(
+        base_field=models.PositiveSmallIntegerField()
+    )
+    tenant = models.ForeignKey(
+        to='tenancy.Tenant',
+        on_delete=models.PROTECT,
+        related_name='rackreservations',
+        blank=True,
+        null=True
+    )
+    user = models.ForeignKey(
+        to=User,
+        on_delete=models.PROTECT
+    )
+    description = models.CharField(
+        max_length=200
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = ['site', 'rack_group', 'rack', 'units', 'tenant', 'user', 'description']
+
+    class Meta:
+        ordering = ['created']
+
+    def __str__(self):
+        return "Reservation for rack {}".format(self.rack)
+
+    def get_absolute_url(self):
+        return reverse('dcim:rackreservation', args=[self.pk])
+
+    def clean(self):
+
+        if hasattr(self, 'rack') and self.units:
+
+            # Validate that all specified units exist in the Rack.
+            invalid_units = [u for u in self.units if u not in self.rack.units]
+            if invalid_units:
+                raise ValidationError({
+                    'units': "Invalid unit(s) for {}U rack: {}".format(
+                        self.rack.u_height,
+                        ', '.join([str(u) for u in invalid_units]),
+                    ),
+                })
+
+            # Check that none of the units has already been reserved for this Rack.
+            reserved_units = []
+            for resv in self.rack.reservations.exclude(pk=self.pk):
+                reserved_units += resv.units
+            conflicting_units = [u for u in self.units if u in reserved_units]
+            if conflicting_units:
+                raise ValidationError({
+                    'units': 'The following units have already been reserved: {}'.format(
+                        ', '.join([str(u) for u in conflicting_units]),
+                    )
+                })
+
+    def to_csv(self):
+        return (
+            self.rack.site.name,
+            self.rack.group if self.rack.group else None,
+            self.rack.name,
+            ','.join([str(u) for u in self.units]),
+            self.tenant.name if self.tenant else None,
+            self.user.username,
+            self.description
+        )
+
+    @property
+    def unit_list(self):
+        """
+        Express the assigned units as a string of summarized ranges. For example:
+            [0, 1, 2, 10, 14, 15, 16] => "0-2, 10, 14-16"
+        """
+        group = (list(x) for _, x in groupby(sorted(self.units), lambda x, c=count(): next(c) - x))
+        return ', '.join('-'.join(map(str, (g[0], g[-1])[:len(g)])) for g in group)
diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py
new file mode 100644
index 000000000..daf7055db
--- /dev/null
+++ b/netbox/dcim/models/sites.py
@@ -0,0 +1,246 @@
+from django.contrib.contenttypes.fields import GenericRelation
+from django.db import models
+from django.urls import reverse
+from mptt.models import MPTTModel, TreeForeignKey
+from taggit.managers import TaggableManager
+from timezone_field import TimeZoneField
+
+from dcim.choices import *
+from dcim.constants import *
+from dcim.fields import ASNField
+from extras.models import ChangeLoggedModel, CustomFieldModel, ObjectChange, TaggedItem
+from extras.utils import extras_features
+from utilities.fields import NaturalOrderingField
+from utilities.querysets import RestrictedQuerySet
+from utilities.mptt import TreeManager
+from utilities.utils import serialize_object
+
+__all__ = (
+    'Region',
+    'Site',
+)
+
+
+#
+# Regions
+#
+
+@extras_features('export_templates', 'webhooks')
+class Region(MPTTModel, ChangeLoggedModel):
+    """
+    Sites can be grouped within geographic Regions.
+    """
+    parent = TreeForeignKey(
+        to='self',
+        on_delete=models.CASCADE,
+        related_name='children',
+        blank=True,
+        null=True,
+        db_index=True
+    )
+    name = models.CharField(
+        max_length=50,
+        unique=True
+    )
+    slug = models.SlugField(
+        unique=True
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+
+    objects = TreeManager()
+
+    csv_headers = ['name', 'slug', 'parent', 'description']
+
+    class MPTTMeta:
+        order_insertion_by = ['name']
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return "{}?region={}".format(reverse('dcim:site_list'), self.slug)
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.parent.name if self.parent else None,
+            self.description,
+        )
+
+    def get_site_count(self):
+        return Site.objects.filter(
+            Q(region=self) |
+            Q(region__in=self.get_descendants())
+        ).count()
+
+    def to_objectchange(self, action):
+        # Remove MPTT-internal fields
+        return ObjectChange(
+            changed_object=self,
+            object_repr=str(self),
+            action=action,
+            object_data=serialize_object(self, exclude=['level', 'lft', 'rght', 'tree_id'])
+        )
+
+
+#
+# Sites
+#
+
+@extras_features('custom_fields', 'custom_links', 'graphs', 'export_templates', 'webhooks')
+class Site(ChangeLoggedModel, CustomFieldModel):
+    """
+    A Site represents a geographic location within a network; typically a building or campus. The optional facility
+    field can be used to include an external designation, such as a data center name (e.g. Equinix SV6).
+    """
+    name = models.CharField(
+        max_length=50,
+        unique=True
+    )
+    _name = NaturalOrderingField(
+        target_field='name',
+        max_length=100,
+        blank=True
+    )
+    slug = models.SlugField(
+        unique=True
+    )
+    status = models.CharField(
+        max_length=50,
+        choices=SiteStatusChoices,
+        default=SiteStatusChoices.STATUS_ACTIVE
+    )
+    region = models.ForeignKey(
+        to='dcim.Region',
+        on_delete=models.SET_NULL,
+        related_name='sites',
+        blank=True,
+        null=True
+    )
+    tenant = models.ForeignKey(
+        to='tenancy.Tenant',
+        on_delete=models.PROTECT,
+        related_name='sites',
+        blank=True,
+        null=True
+    )
+    facility = models.CharField(
+        max_length=50,
+        blank=True,
+        help_text='Local facility ID or description'
+    )
+    asn = ASNField(
+        blank=True,
+        null=True,
+        verbose_name='ASN',
+        help_text='32-bit autonomous system number'
+    )
+    time_zone = TimeZoneField(
+        blank=True
+    )
+    description = models.CharField(
+        max_length=200,
+        blank=True
+    )
+    physical_address = models.CharField(
+        max_length=200,
+        blank=True
+    )
+    shipping_address = models.CharField(
+        max_length=200,
+        blank=True
+    )
+    latitude = models.DecimalField(
+        max_digits=8,
+        decimal_places=6,
+        blank=True,
+        null=True,
+        help_text='GPS coordinate (latitude)'
+    )
+    longitude = models.DecimalField(
+        max_digits=9,
+        decimal_places=6,
+        blank=True,
+        null=True,
+        help_text='GPS coordinate (longitude)'
+    )
+    contact_name = models.CharField(
+        max_length=50,
+        blank=True
+    )
+    contact_phone = models.CharField(
+        max_length=20,
+        blank=True
+    )
+    contact_email = models.EmailField(
+        blank=True,
+        verbose_name='Contact E-mail'
+    )
+    comments = models.TextField(
+        blank=True
+    )
+    custom_field_values = GenericRelation(
+        to='extras.CustomFieldValue',
+        content_type_field='obj_type',
+        object_id_field='obj_id'
+    )
+    images = GenericRelation(
+        to='extras.ImageAttachment'
+    )
+    tags = TaggableManager(through=TaggedItem)
+
+    objects = RestrictedQuerySet.as_manager()
+
+    csv_headers = [
+        'name', 'slug', 'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
+        'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email', 'comments',
+    ]
+    clone_fields = [
+        'status', 'region', 'tenant', 'facility', 'asn', 'time_zone', 'description', 'physical_address',
+        'shipping_address', 'latitude', 'longitude', 'contact_name', 'contact_phone', 'contact_email',
+    ]
+
+    STATUS_CLASS_MAP = {
+        SiteStatusChoices.STATUS_PLANNED: 'info',
+        SiteStatusChoices.STATUS_STAGING: 'primary',
+        SiteStatusChoices.STATUS_ACTIVE: 'success',
+        SiteStatusChoices.STATUS_DECOMMISSIONING: 'warning',
+        SiteStatusChoices.STATUS_RETIRED: 'danger',
+    }
+
+    class Meta:
+        ordering = ('_name',)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse('dcim:site', args=[self.slug])
+
+    def to_csv(self):
+        return (
+            self.name,
+            self.slug,
+            self.get_status_display(),
+            self.region.name if self.region else None,
+            self.tenant.name if self.tenant else None,
+            self.facility,
+            self.asn,
+            self.time_zone,
+            self.description,
+            self.physical_address,
+            self.shipping_address,
+            self.latitude,
+            self.longitude,
+            self.contact_name,
+            self.contact_phone,
+            self.contact_email,
+            self.comments,
+        )
+
+    def get_status_class(self):
+        return self.STATUS_CLASS_MAP.get(self.status)

From bf4fee159292c49dd78ce772e3256e272d07540f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 20 Aug 2020 09:44:45 -0400
Subject: [PATCH 501/505] Fixes #5020: Correct handling of dependent objects
 during bulk deletion

---
 docs/release-notes/version-2.9.md  |  1 +
 netbox/utilities/error_handlers.py | 11 ++++++-----
 netbox/utilities/views.py          |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index b53aaed4a..596956f9f 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,6 +6,7 @@
 
 * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
 * [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
+* [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion
 
 ---
 
diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py
index 7f912dcb1..1d3bdbafd 100644
--- a/netbox/utilities/error_handlers.py
+++ b/netbox/utilities/error_handlers.py
@@ -3,18 +3,19 @@ from django.utils.html import escape
 from django.utils.safestring import mark_safe
 
 
-def handle_protectederror(obj, request, e):
+def handle_protectederror(obj_list, request, e):
     """
     Generate a user-friendly error message in response to a ProtectedError exception.
     """
     protected_objects = list(e.protected_objects)
-    err_message = f"Unable to delete {obj._meta.verbose_name} <strong>{obj}</strong>. " \
-                  f"{len(protected_objects)} dependent objects were found: "
+    protected_count = len(protected_objects) if len(protected_objects) <= 50 else 'More than 50'
+    err_message = f"Unable to delete <strong>{', '.join(str(obj) for obj in obj_list)}</strong>. " \
+                  f"{protected_count} dependent objects were found: "
 
     # Append dependent objects to error message
     dependent_objects = []
-    for dependent in protected_objects:
-        if hasattr(obj, 'get_absolute_url'):
+    for dependent in protected_objects[:50]:
+        if hasattr(dependent, 'get_absolute_url'):
             dependent_objects.append(f'<a href="{dependent.get_absolute_url()}">{escape(dependent)}</a>')
         else:
             dependent_objects.append(str(dependent))
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index a13a47df8..c7db2f649 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -509,7 +509,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 obj.delete()
             except ProtectedError as e:
                 logger.info("Caught ProtectedError while attempting to delete object")
-                handle_protectederror(obj, request, e)
+                handle_protectederror([obj], request, e)
                 return redirect(obj.get_absolute_url())
 
             msg = 'Deleted {} {}'.format(self.queryset.model._meta.verbose_name, obj)
@@ -1164,7 +1164,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                     deleted_count = queryset.delete()[1][model._meta.label]
                 except ProtectedError as e:
                     logger.info("Caught ProtectedError while attempting to delete objects")
-                    handle_protectederror(list(queryset), request, e)
+                    handle_protectederror(queryset, request, e)
                     return redirect(self.get_return_url(request))
 
                 msg = 'Deleted {} {}'.format(deleted_count, model._meta.verbose_name_plural)

From bc0e6cc8dd12ded382c5e9931fb0b63030a47e90 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 20 Aug 2020 12:47:26 -0400
Subject: [PATCH 502/505] Fixes #5012: Return details of exceptions resulting
 from report/script execution

---
 docs/release-notes/version-2.9.md          |  1 +
 netbox/extras/models/models.py             |  6 ++--
 netbox/extras/reports.py                   | 33 ++++++++++++++--------
 netbox/extras/scripts.py                   | 18 ++++--------
 netbox/templates/extras/report_result.html |  6 ++--
 netbox/templates/extras/script_result.html |  8 +-----
 6 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 596956f9f..cf759e3bf 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -6,6 +6,7 @@
 
 * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
 * [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
+* [#5012](https://github.com/netbox-community/netbox/issues/5012) - Return details of exceptions resulting from report/script execution
 * [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion
 
 ---
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index f3810e7c5..e57caf091 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -652,15 +652,13 @@ class JobResult(models.Model):
 
     def set_status(self, status):
         """
-        Helper method to change the status of the job result and save. If the target status is terminal, the
-        completion time is also set.
+        Helper method to change the status of the job result. If the target status is terminal, the  completion
+        time is also set.
         """
         self.status = status
         if status in JobResultStatusChoices.TERMINAL_STATE_CHOICES:
             self.completed = timezone.now()
 
-        self.save()
-
     @classmethod
     def enqueue_job(cls, func, name, obj_type, user, *args, **kwargs):
         """
diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index 439868dfd..64fbffb46 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -2,10 +2,10 @@ import importlib
 import inspect
 import logging
 import pkgutil
+import traceback
 from collections import OrderedDict
 
 from django.conf import settings
-from django.db.models import Q
 from django.utils import timezone
 from django_rq import job
 
@@ -79,6 +79,7 @@ def run_report(job_result, *args, **kwargs):
     except Exception as e:
         print(e)
         job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
+        job_result.save()
         logging.error(f"Error during execution of report {job_result.name}")
 
     # Delete any previous terminal state results
@@ -170,7 +171,7 @@ class Report(object):
             timezone.now().isoformat(),
             level,
             str(obj) if obj else None,
-            obj.get_absolute_url() if getattr(obj, 'get_absolute_url', None) else None,
+            obj.get_absolute_url() if hasattr(obj, 'get_absolute_url') else None,
             message,
         ))
 
@@ -223,17 +224,25 @@ class Report(object):
         job_result.status = JobResultStatusChoices.STATUS_RUNNING
         job_result.save()
 
-        for method_name in self.test_methods:
-            self.active_test = method_name
-            test_method = getattr(self, method_name)
-            test_method()
+        try:
 
-        if self.failed:
-            self.logger.warning("Report failed")
-            job_result.status = JobResultStatusChoices.STATUS_FAILED
-        else:
-            self.logger.info("Report completed successfully")
-            job_result.status = JobResultStatusChoices.STATUS_COMPLETED
+            for method_name in self.test_methods:
+                self.active_test = method_name
+                test_method = getattr(self, method_name)
+                test_method()
+
+            if self.failed:
+                self.logger.warning("Report failed")
+                job_result.status = JobResultStatusChoices.STATUS_FAILED
+            else:
+                self.logger.info("Report completed successfully")
+                job_result.status = JobResultStatusChoices.STATUS_COMPLETED
+
+        except Exception as e:
+            stacktrace = traceback.format_exc()
+            self.log_failure(None, f"An exception occurred: {type(e).__name__}: {e} <pre>{stacktrace}</pre>")
+            logger.error(f"Exception raised during report execution: {e}")
+            job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
 
         job_result.data = self._results
         job_result.completed = timezone.now()
diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py
index 1d7229089..9d5380655 100644
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -446,32 +446,26 @@ def run_script(data, request, commit=True, *args, **kwargs):
         try:
             with transaction.atomic():
                 script.output = script.run(**kwargs)
+                job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
 
                 if not commit:
                     raise AbortTransaction()
 
         except AbortTransaction:
-            pass
+            script.log_info("Database changes have been reverted automatically.")
 
         except Exception as e:
             stacktrace = traceback.format_exc()
             script.log_failure(
-                "An exception occurred: `{}: {}`\n```\n{}\n```".format(type(e).__name__, e, stacktrace)
+                f"An exception occurred: `{type(e).__name__}: {e}`\n```\n{stacktrace}\n```"
             )
+            script.log_info("Database changes have been reverted due to error.")
             logger.error(f"Exception raised during script execution: {e}")
-            commit = False
             job_result.set_status(JobResultStatusChoices.STATUS_ERRORED)
 
         finally:
-            if job_result.status != JobResultStatusChoices.STATUS_ERRORED:
-                job_result.data = ScriptOutputSerializer(script).data
-                job_result.set_status(JobResultStatusChoices.STATUS_COMPLETED)
-
-            if not commit:
-                # Delete all pending changelog entries
-                script.log_info(
-                    "Database changes have been reverted automatically."
-                )
+            job_result.data = ScriptOutputSerializer(script).data
+            job_result.save()
 
         logger.info(f"Script completed in {job_result.duration}")
 
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index e1c46fe90..80715f2aa 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -16,7 +16,7 @@
                 {% endif %}
                 <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
             </p>
-            {% if result.completed and result.status != 'errored' %}
+            {% if result.completed %}
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <strong>Report Methods</strong>
@@ -75,10 +75,8 @@
                         </tbody>
                     </table>
                 </div>
-            {% elif result.status == 'errored' %}
-                <div class="well">Error during report execution</div>
             {% else %}
-            <div class="well">Pending results</div>
+                <div class="well">Pending results</div>
             {% endif %}
         </div>
     </div>
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 88013e05e..c9fc348ee 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -41,7 +41,7 @@
             <span id="pending-result-label">{% include 'extras/inc/job_label.html' with result=result %}</span>
         </p>
         <div role="tabpanel" class="tab-pane active" id="log">
-            {% if result.completed and result.status != 'errored' %}
+            {% if result.completed %}
                 <div class="row">
                     <div class="col-md-12">
                         <div class="panel panel-default">
@@ -76,12 +76,6 @@
                         </div>
                     </div>
                 </div>
-            {% elif result.stats == 'errored' %}
-                <div class="row">
-                    <div class="col-md-12">
-                        <div class="well">Error during script execution</div>
-                    </div>
-                </div>
             {% else %}
                 <div class="row">
                     <div class="col-md-12">

From 8d351178accded92b2894ed7036c6c40c888c542 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 20 Aug 2020 14:38:58 -0400
Subject: [PATCH 503/505] Fixes #5022: Fix exception when editing IP address
 with NAT inside IP assigned

---
 docs/release-notes/version-2.9.md |  1 +
 netbox/ipam/forms.py              | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index cf759e3bf..2b06d0582 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -8,6 +8,7 @@
 * [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
 * [#5012](https://github.com/netbox-community/netbox/issues/5012) - Return details of exceptions resulting from report/script execution
 * [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion
+* [#5022](https://github.com/netbox-community/netbox/issues/5022) - Fix exception when editing IP address with NAT inside IP assigned
 
 ---
 
diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py
index 5f6a28dad..1e8e9038a 100644
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -616,10 +616,15 @@ class IPAddressForm(BootstrapMixin, TenancyForm, ReturnURLForm, CustomFieldModel
             elif type(instance.assigned_object) is VMInterface:
                 initial['virtual_machine'] = instance.assigned_object.virtual_machine
                 initial['vminterface'] = instance.assigned_object
-            if instance.nat_inside and instance.nat_inside.device is not None:
-                initial['nat_site'] = instance.nat_inside.device.site
-                initial['nat_rack'] = instance.nat_inside.device.rack
-                initial['nat_device'] = instance.nat_inside.device
+            if instance.nat_inside:
+                nat_inside_parent = instance.nat_inside.assigned_object
+                if type(nat_inside_parent) is Interface:
+                    initial['nat_site'] = nat_inside_parent.device.site.pk
+                    initial['nat_rack'] = nat_inside_parent.device.rack.pk
+                    initial['nat_device'] = nat_inside_parent.device.pk
+                elif type(nat_inside_parent) is VMInterface:
+                    initial['nat_cluster'] = nat_inside_parent.virtual_machine.cluster.pk
+                    initial['nat_virtual_machine'] = nat_inside_parent.virtual_machine.pk
         kwargs['initial'] = initial
 
         super().__init__(*args, **kwargs)

From 8f88d2afab97cb41fd25f22aad2e500d99aa3638 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 20 Aug 2020 15:44:30 -0400
Subject: [PATCH 504/505] Closes #5024: List available options for choice
 fields within CSV import forms

---
 docs/release-notes/version-2.9.md              |  4 ++++
 .../templates/utilities/obj_bulk_import.html   | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 2b06d0582..8dd45b1f8 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -2,6 +2,10 @@
 
 ## v2.9-beta3 (FUTURE)
 
+### Enhancements
+
+* [#5024](https://github.com/netbox-community/netbox/issues/5024) - List available options for choice fields within CSV import forms
+
 ### Bug Fixes
 
 * [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
diff --git a/netbox/templates/utilities/obj_bulk_import.html b/netbox/templates/utilities/obj_bulk_import.html
index 4359d49a6..9d63788ba 100644
--- a/netbox/templates/utilities/obj_bulk_import.html
+++ b/netbox/templates/utilities/obj_bulk_import.html
@@ -66,6 +66,24 @@
                                             {% endif %}
                                         </td>
                                         <td>
+                                            {% if field.choice_values %}
+                                                <button type="button" class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#{{ name }}_choices">
+                                                    <i class="fa fa-question"></i>
+                                                </button>
+                                                <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">
+                                                    <div class="modal-dialog" role="document">
+                                                        <div class="modal-content">
+                                                            <div class="modal-header">
+                                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                                                                <h4 class="modal-title"><code>{{ name }}</code> Choices</h4>
+                                                            </div>
+                                                            <div class="modal-body">
+                                                                <ul>{% for value, label in field.choices %}{% if value %}<li>{{ value }}</li>{% endif %}{% endfor %}</ul>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            {% endif %}
                                             {% if field.help_text %}
                                                 {{ field.help_text }}<br />
                                             {% elif field.label %}

From 8b5e701ba43b5081a1730695016945331f26e290 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 21 Aug 2020 09:18:28 -0400
Subject: [PATCH 505/505] Cleaned up release notes for v2.9.0

---
 docs/release-notes/version-2.9.md | 91 ++++++++++---------------------
 1 file changed, 28 insertions(+), 63 deletions(-)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 8dd45b1f8..bf7354769 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -1,65 +1,6 @@
 # NetBox v2.9
 
-## v2.9-beta3 (FUTURE)
-
-### Enhancements
-
-* [#5024](https://github.com/netbox-community/netbox/issues/5024) - List available options for choice fields within CSV import forms
-
-### Bug Fixes
-
-* [#4990](https://github.com/netbox-community/netbox/issues/4990) - Restore change logging during custom script execution
-* [#5004](https://github.com/netbox-community/netbox/issues/5004) - Permit assignment of an interface to a LAG on any peer virtual chassis member
-* [#5012](https://github.com/netbox-community/netbox/issues/5012) - Return details of exceptions resulting from report/script execution
-* [#5020](https://github.com/netbox-community/netbox/issues/5020) - Correct handling of dependent objects during bulk deletion
-* [#5022](https://github.com/netbox-community/netbox/issues/5022) - Fix exception when editing IP address with NAT inside IP assigned
-
----
-
-## v2.9-beta2 (2020-08-13)
-
-**WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.
-
-### Enhancements
-
-* [#4639](https://github.com/netbox-community/netbox/issues/4639) - Improve performance of web UI prefixes list
-* [#4919](https://github.com/netbox-community/netbox/issues/4919) - Allow adding/changing assigned permissions within group and user admin views
-* [#4922](https://github.com/netbox-community/netbox/issues/4922) - Optimize schema migration for replicating VM interfaces
-* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
-* [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
-* [#4946](https://github.com/netbox-community/netbox/issues/4946) - Extend ObjectPermission to OR multiple constraints
-* [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
-* [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
-* [#4994](https://github.com/netbox-community/netbox/issues/4994) - Add `cable` attribute to PowerFeed API serializer
-* [#4996](https://github.com/netbox-community/netbox/issues/4996) - Add "connect" buttons to individual device component views
-* [#4997](https://github.com/netbox-community/netbox/issues/4997) - The browsable API now lists available endpoints alphabetically
-
-### Bug Fixes
-
-* [#4903](https://github.com/netbox-community/netbox/issues/4903) - Fix member count when searching for virtual chassis
-* [#4905](https://github.com/netbox-community/netbox/issues/4905) - Fix front port count on device type view
-* [#4912](https://github.com/netbox-community/netbox/issues/4912) - Fix image attachment API endpoint
-* [#4914](https://github.com/netbox-community/netbox/issues/4914) - Fix toggling cable status under device view
-* [#4921](https://github.com/netbox-community/netbox/issues/4921) - Render non-viewable devices as unavailable space in rack elevations
-* [#4930](https://github.com/netbox-community/netbox/issues/4930) - Replicate label values when instantiating device type components
-* [#4931](https://github.com/netbox-community/netbox/issues/4931) - Fix DoesNotExist exception when deleting devices
-* [#4938](https://github.com/netbox-community/netbox/issues/4938) - Show add, import buttons on virtual chassis list view
-* [#4939](https://github.com/netbox-community/netbox/issues/4939) - Fix linking to LAG interfaces on other VC members
-* [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view
-* [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creating a new inventory item
-* [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM
-* [#4968](https://github.com/netbox-community/netbox/issues/4968) - Fix exception when activating user keys in admin UI
-* [#4995](https://github.com/netbox-community/netbox/issues/4995) - Fix missing buttons to add console/power ports under device view
-
-### Other Changes
-
-* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
-* [#4942](https://github.com/netbox-community/netbox/issues/4942) - Make ObjectPermission's `name` field required
-* [#4943](https://github.com/netbox-community/netbox/issues/4943) - Add a `description` field to ObjectPermission
-
----
-
-## v2.9-beta1 (2020-07-23)
+## v2.9.0 (FUTURE)
 
 **WARNING:** This is a beta release and is not suitable for production use. It is intended for development and evaluation purposes only. No upgrade path to the final v2.9 release will be provided from this beta, and users should assume that all data entered into the application will be lost. Please reference [the v2.9 beta documentation](https://netbox.readthedocs.io/en/develop-2.9/) for further information regarding this release.
 
@@ -73,11 +14,29 @@ NetBox v2.9 replaces Django's built-in permissions framework with one that suppo
 
 When running a report or custom script, its execution is now queued for background processing and the user receives an immediate response indicating its status. This prevents long-running scripts from resulting in a timeout error. Once the execution has completed, the page will automatically refresh to display its results. Both scripts and reports now store their output in the new JobResult model. (The ReportResult model has been removed.)
 
+#### Named Virtual Chassis ([#2018](https://github.com/netbox-community/netbox/issues/2018))
+
+The VirtualChassis model now has a mandatory `name` field. Names are assigned to the virtual chassis itself rather than referencing the master VC member. Additionally, the designation of a master is now optional: a virtual chassis may have only non-master members.
+
+#### Changes to Tag Creation ([#3703](https://github.com/netbox-community/netbox/issues/3703))
+
+Tags are no longer created automatically: A tag must be created by a user before it can be applied to any object. Additionally, the REST API representation of assigned tags has been expanded to be consistent with other objects.
+
+#### Dedicated Model for VM Interfaces ([#4721](https://github.com/netbox-community/netbox/issues/4721))
+
+A new model has been introduced to represent virtual machine interfaces. Although this change is largely transparent to the end user, note that the IP address model no longer has a foreign key to the Interface model under the DCIM app. This has been replaced with a generic foreign key named `assigned_object`.
+
+#### REST API Endpoints for Users and Groups ([#4877](https://github.com/netbox-community/netbox/issues/4877))
+
+Two new REST API endpoints have been added to facilitate the retrieval and manipulation of users and groups:
+
+* `/api/users/groups/`
+* `/api/users/users/`
+
 ### Enhancements
 
-* [#2018](https://github.com/netbox-community/netbox/issues/2018) - Add `name` field to virtual chassis model
-* [#3703](https://github.com/netbox-community/netbox/issues/3703) - Tags must be created administratively before being assigned to an object
 * [#4615](https://github.com/netbox-community/netbox/issues/4615) - Add `label` field for all device components and component templates
+* [#4639](https://github.com/netbox-community/netbox/issues/4639) - Improve performance of web UI prefixes list
 * [#4742](https://github.com/netbox-community/netbox/issues/4742) - Add tagging for cables, power panels, and rack reservations
 * [#4788](https://github.com/netbox-community/netbox/issues/4788) - Add dedicated views for all device components
 * [#4792](https://github.com/netbox-community/netbox/issues/4792) - Add bulk rename capability for console and power ports
@@ -88,7 +47,13 @@ When running a report or custom script, its execution is now queued for backgrou
 * [#4817](https://github.com/netbox-community/netbox/issues/4817) - Standardize device/VM component `name` field to 64 characters
 * [#4837](https://github.com/netbox-community/netbox/issues/4837) - Use dynamic form widget for relationships to MPTT objects (e.g. regions)
 * [#4840](https://github.com/netbox-community/netbox/issues/4840) - Enable change logging for config contexts
-* [#4877](https://github.com/netbox-community/netbox/issues/4877) - Add REST API endpoints for users and groups
+* [#4940](https://github.com/netbox-community/netbox/issues/4940) - Add an `occupied` field to rack unit representations for rack elevation views
+* [#4945](https://github.com/netbox-community/netbox/issues/4945) - Add a user-friendly 403 error page
+* [#4969](https://github.com/netbox-community/netbox/issues/4969) - Replace secret role user/group assignment with object permissions
+* [#4982](https://github.com/netbox-community/netbox/issues/4982) - Extended ObjectVar to allow filtering API query
+* [#4994](https://github.com/netbox-community/netbox/issues/4994) - Add `cable` attribute to PowerFeed API serializer
+* [#4997](https://github.com/netbox-community/netbox/issues/4997) - The browsable API now lists available endpoints alphabetically
+* [#5024](https://github.com/netbox-community/netbox/issues/5024) - List available options for choice fields within CSV import forms
 
 ### Configuration Changes