Clean up generic view templates

netbox/netbox/views/generic.py

@@ -74,7 +74,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
     filterset = None
     filterset_form = None
     table = None
-    template_name = 'utilities/obj_list.html'
+    template_name = 'generic/object_list.html'
     action_buttons = ('add', 'import', 'export')
 
     def get_required_permission(self):
@@ -196,7 +196,7 @@ class ObjectEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     """
     queryset = None
     model_form = None
-    template_name = 'utilities/obj_edit.html'
+    template_name = 'generic/object_edit.html'
 
     def get_required_permission(self):
         # self._permission_action is set by dispatch() to either "add" or "change" depending on whether
@@ -308,7 +308,7 @@ class ObjectDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     template_name: The name of the template
     """
     queryset = None
-    template_name = 'utilities/obj_delete.html'
+    template_name = 'generic/object_delete.html'
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'delete')
@@ -482,7 +482,7 @@ class ObjectImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     queryset = None
     model_form = None
     related_object_forms = dict()
-    template_name = 'utilities/obj_import.html'
+    template_name = 'generic/object_import.html'
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'add')
@@ -615,7 +615,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     queryset = None
     model_form = None
     table = None
-    template_name = 'utilities/obj_bulk_import.html'
+    template_name = 'generic/object_bulk_import.html'
     widget_attrs = {}
 
     def _import_form(self, *args, **kwargs):
@@ -720,7 +720,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     filterset = None
     table = None
     form = None
-    template_name = 'utilities/obj_bulk_edit.html'
+    template_name = 'generic/object_bulk_edit.html'
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'change')
@@ -857,7 +857,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     An extendable view for renaming objects in bulk.
     """
     queryset = None
-    template_name = 'utilities/obj_bulk_rename.html'
+    template_name = 'generic/object_bulk_rename.html'
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -944,7 +944,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     filterset = None
     table = None
     form = None
-    template_name = 'utilities/obj_bulk_delete.html'
+    template_name = 'generic/object_bulk_delete.html'
 
     def get_required_permission(self):
         return get_permission_for_model(self.queryset.model, 'delete')
@@ -1127,7 +1127,7 @@ class BulkComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin,
     model_form = None
     filterset = None
     table = None
-    template_name = 'utilities/obj_bulk_add_component.html'
+    template_name = 'generic/object_bulk_add_component.html'
 
     def get_required_permission(self):
         return f'dcim.add_{self.queryset.model._meta.model_name}'

netbox/templates/circuits/circuit_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/circuits/provider_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/cable_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 
 {% block form %}
     {% include 'dcim/inc/cable_form.html' %}

netbox/templates/dcim/device_component_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form_fields %}

netbox/templates/dcim/device_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/device_import.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_bulk_import.html' %}
+{% extends 'generic/object_bulk_import.html' %}
 
 {% block tabs %}
     {% include 'dcim/inc/device_import_header.html' %}

netbox/templates/dcim/device_import_child.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_bulk_import.html' %}
+{% extends 'generic/object_bulk_import.html' %}
 
 {% block tabs %}
     {% include 'dcim/inc/device_import_header.html' with active_tab='child_import' %}

netbox/templates/dcim/device_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 
 {% block bulk_buttons %}
     {% if perms.dcim.change_device %}

netbox/templates/dcim/devicetype_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/interface_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/inventoryitem_bulk_delete.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_bulk_delete.html' %}
+{% extends 'generic/object_bulk_delete.html' %}
 
 {% block message_extra %}
     <p class="text-center text-danger"><i class="mdi mdi-alert"></i> This will also delete all child inventory items of those listed.</p>

netbox/templates/dcim/powerfeed_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/powerpanel_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/rack_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/rackreservation_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/site_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/dcim/virtualchassis_add.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/extras/configcontext_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/extras/objectchange_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 
 {% block title %}Change Log{% endblock %}
 

netbox/templates/extras/tag_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/ipam/aggregate_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/ipam/aggregate_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 {% load humanize %}
 
 {% block sidebar %}

netbox/templates/ipam/ipaddress_assign.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load form_helpers %}
 {% load helpers %}

netbox/templates/ipam/ipaddress_bulk_add.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load form_helpers %}
 

netbox/templates/ipam/ipaddress_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load form_helpers %}
 {% load helpers %}

netbox/templates/ipam/prefix_delete.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_delete.html' %}
+{% extends 'generic/object_delete.html' %}
 
 {% block message_extra %}
     <p>Note: This will <strong>not</strong> delete any child prefixes or IP addresses.</p>

netbox/templates/ipam/prefix_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/ipam/prefix_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 {% load helpers %}
 
 {% block buttons %}

netbox/templates/ipam/rir_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 
 {% block buttons %}
     {% if request.GET.family == '6' %}

netbox/templates/ipam/service_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/ipam/vlan_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/ipam/vrf_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/secrets/secret_import.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_bulk_import.html' %}
+{% extends 'generic/object_bulk_import.html' %}
 {% load static %}
 
 {% block content %}

netbox/templates/tenancy/tenant_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load form_helpers %}
 

netbox/templates/users/sessionkey_delete.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_delete.html' %}
+{% extends 'generic/object_delete.html' %}
 
 {% block message %}
     <p>Are you sure you want to delete your session key?</p>

netbox/templates/virtualization/cluster_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/virtualization/virtualmachine_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/templates/virtualization/virtualmachine_list.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_list.html' %}
+{% extends 'generic/object_list.html' %}
 
 {% block bulk_buttons %}
     {% if perms.virtualization.change_virtualmachine %}

netbox/templates/virtualization/vminterface_edit.html

@@ -1,4 +1,4 @@
-{% extends 'utilities/obj_edit.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load form_helpers %}
 
 {% block form %}

netbox/users/views.py

@@ -293,7 +293,7 @@ class TokenEditView(LoginRequiredMixin, View):
 
         form = TokenForm(instance=token)
 
-        return render(request, 'utilities/obj_edit.html', {
+        return render(request, 'generic/object_edit.html', {
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
@@ -322,7 +322,7 @@ class TokenEditView(LoginRequiredMixin, View):
             else:
                 return redirect('user:token_list')
 
-        return render(request, 'utilities/obj_edit.html', {
+        return render(request, 'generic/object_edit.html', {
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
@@ -340,7 +340,7 @@ class TokenDeleteView(LoginRequiredMixin, View):
         }
         form = ConfirmationForm(initial=initial_data)
 
-        return render(request, 'utilities/obj_delete.html', {
+        return render(request, 'generic/object_delete.html', {
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
@@ -356,7 +356,7 @@ class TokenDeleteView(LoginRequiredMixin, View):
             messages.success(request, "Token deleted")
             return redirect('user:token_list')
 
-        return render(request, 'utilities/obj_delete.html', {
+        return render(request, 'generic/object_delete.html', {
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,

netbox/virtualization/views.py

@@ -184,7 +184,7 @@ class ClusterAddDevicesView(generic.ObjectEditView):
 class ClusterRemoveDevicesView(generic.ObjectEditView):
     queryset = Cluster.objects.all()
     form = forms.ClusterRemoveDevicesForm
-    template_name = 'utilities/obj_bulk_remove.html'
+    template_name = 'generic/object_bulk_remove.html'
 
     def post(self, request, pk):