nautobot 2.4.8__py3-none-any.whl → 2.4.9__py3-none-any.whl

nautobot/core/tests/test_ui.py

@@ -3,10 +3,13 @@
 from unittest.mock import patch
 
 from django.template import Context
+from django.test import RequestFactory
 
 from nautobot.core.templatetags.helpers import HTML_NONE
 from nautobot.core.testing import TestCase
-from nautobot.core.ui.object_detail import BaseTextPanel, DataTablePanel, Panel
+from nautobot.core.ui.object_detail import BaseTextPanel, DataTablePanel, ObjectsTablePanel, Panel
+from nautobot.dcim.models import DeviceRedundancyGroup
+from nautobot.dcim.tables.devices import DeviceTable
 
 
 class DataTablePanelTest(TestCase):
@@ -148,3 +151,52 @@ class BaseTextPanelTest(TestCase):
         panel = BaseTextPanel(weight=100)
         with self.assertRaises(NotImplementedError):
             panel.get_value({})
+
+
+class ObjectsTablePanelTest(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.factory = RequestFactory()
+        self.request = self.factory.get("/")
+        self.request.user = self.user
+
+    def test_include_exclude_columns(self):
+        panel = ObjectsTablePanel(
+            weight=100,
+            table_class=DeviceTable,
+            table_attribute="devices_sorted",
+            related_field_name="device_redundancy_group",
+            include_columns=[
+                "device_redundancy_group_priority",
+            ],
+            exclude_columns=[
+                "rack",
+            ],
+        )
+        redundancy_group = DeviceRedundancyGroup.objects.first()
+        context = {
+            "request": self.request,
+            "object": redundancy_group,
+        }
+        result = panel.get_extra_context(context)
+        columns = result["body_content_table"].columns
+        self.assertIn("device_redundancy_group_priority", [col.name for col in columns])
+        self.assertNotIn("rack", [col.name for col in columns])
+
+    def test_invalid_include_columns(self):
+        with self.assertRaises(ValueError) as context:
+            panel = ObjectsTablePanel(
+                weight=100,
+                table_class=DeviceTable,
+                table_attribute="devices_sorted",
+                related_field_name="device_redundancy_group",
+                include_columns=["non_existent_column"],
+            )
+            redundancy_group = DeviceRedundancyGroup.objects.first()
+            context_data = {
+                "request": self.request,
+                "object": redundancy_group,
+            }
+            panel.get_extra_context(context_data)
+
+        self.assertIn("non-existent column `non_existent_column`", str(context.exception))

nautobot/core/tests/test_utils.py

@@ -714,6 +714,17 @@ class LookupRelatedFunctionTest(TestCase):
                 form_field.queryset, extras_utils.ChangeLoggedModelsQuery().as_queryset()
             )
 
+            form_field = filtering.get_filterset_parameter_form_field(
+                extras_models.ObjectMetadata, "assigned_object_type"
+            )
+            self.assertIsInstance(form_field, forms.MultipleContentTypeField)
+            self.assertQuerysetEqualAndNotEmpty(
+                form_field.queryset,
+                ContentType.objects.filter(extras_utils.FeatureQuery("metadata").get_query()).order_by(
+                    "app_label", "model"
+                ),
+            )
+
         with self.subTest("Test prefers_id"):
             form_field = filtering.get_filterset_parameter_form_field(dcim_models.Device, "location")
             self.assertEqual("id", form_field.to_field_name)

nautobot/core/ui/object_detail.py

@@ -728,9 +728,7 @@ class ObjectsTablePanel(Panel):
             table_title (str, optional): The title to display in the panel heading for the table.
                 If None, defaults to the plural verbose name of the table model.
             include_columns (list, optional): A list of field names to include in the table display.
-                If provided, only these fields will be displayed in the table.
             exclude_columns (list, optional): A list of field names to exclude from the table display.
-                Mutually exclusive with `include_columns`.
             add_button_route (str, optional): The route used to generate the "add" button URL. Defaults to "default",
                 which uses the default table's model `add` route.
             add_permissions (list, optional): A list of permissions required for the "add" button to be displayed.
@@ -777,8 +775,6 @@ class ObjectsTablePanel(Panel):
         self.order_by_fields = order_by_fields
         self.table_title = table_title
         self.max_display_count = max_display_count
-        if exclude_columns and include_columns:
-            raise ValueError("You can only specify either `exclude_columns` or `include_columns`")
         self.include_columns = include_columns
         self.exclude_columns = exclude_columns
         self.add_button_route = add_button_route
@@ -878,14 +874,17 @@ class ObjectsTablePanel(Panel):
                 # to redirect the user back to the correct tab after editing/deleteing an object
                 body_content_table.columns["actions"].column.extra_context["return_url_extra"] = f"?tab={self.tab_id}"
 
-        if self.exclude_columns or self.include_columns:
+        if self.exclude_columns:
             for column in body_content_table.columns:
-                if (self.exclude_columns and column.name in self.exclude_columns) or (
-                    self.include_columns and column.name not in self.include_columns
-                ):
+                if column.name in self.exclude_columns:
                     body_content_table.columns.hide(column.name)
-                else:
-                    body_content_table.columns.show(column.name)
+
+        if self.include_columns:
+            for column in self.include_columns:
+                if column not in body_content_table.base_columns:
+                    raise ValueError(f"You are specifying a non-existent column `{column}`")
+                body_content_table.columns.show(column)
+
         # Enable bulk action toggle if the user has appropriate permissions
         user = request.user
         if self.enable_bulk_actions and (
@@ -906,10 +905,18 @@ class ObjectsTablePanel(Panel):
         body_content_table_model = body_content_table.Meta.model
         related_field_name = self.related_field_name or self.table_filter or obj._meta.model_name
 
+        list_url = getattr(self.table_class, "list_url", None)
+        if not list_url:
+            list_url = get_route_for_model(body_content_table_model, "list")
+
         try:
-            list_route = reverse(get_route_for_model(body_content_table_model, "list"))
-            body_content_table_list_url = f"{list_route}?{related_field_name}={obj.pk}"
+            list_route = reverse(list_url)
         except NoReverseMatch:
+            list_route = None
+
+        if list_route:
+            body_content_table_list_url = f"{list_route}?{related_field_name}={obj.pk}"
+        else:
             body_content_table_list_url = None
 
         body_content_table_add_url = self._get_table_add_url(context)

nautobot/core/utils/filtering.py

@@ -135,11 +135,14 @@ def get_filterset_parameter_form_field(model, parameter, filterset=None):
         from nautobot.core.models.fields import slugify_dashes_to_underscores  # Avoid circular import
 
         plural_name = slugify_dashes_to_underscores(model._meta.verbose_name_plural)
+
         # Cable-connectable models use "cable_terminations", not "cables", as the feature name
         if plural_name == "cables":
             plural_name = "cable_terminations"
         elif plural_name == "metadata_types":
             plural_name = "metadata"
+        elif plural_name == "object_metadata":
+            plural_name = "metadata"
         try:
             form_field = MultipleContentTypeField(choices_as_strings=True, feature=plural_name)
         except KeyError:

nautobot/core/views/renderers.py

@@ -301,7 +301,7 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                 # If the view does not have a object_detail_content attribute, set it to None.
                 context["object_detail_content"] = None
             context.update(common_detail_view_context(request, instance))
-        elif view.action == "list":
+        if view.action == "list":
             # Construct valid actions for list view.
             valid_actions = self.validate_action_buttons(view, request)
             # Query SavedViews for dropdown button

nautobot/dcim/forms.py

@@ -727,6 +727,16 @@ class RackReservationForm(NautobotModelForm, TenancyForm):
             "tags",
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        rack = getattr(self.instance, "rack", None)
+        if rack:
+            if not self.initial.get("location"):
+                self.initial["location"] = rack.location
+            if not self.initial.get("rack_group"):
+                self.initial["rack_group"] = rack.rack_group
+
 
 class RackReservationBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
     pk = forms.ModelMultipleChoiceField(queryset=RackReservation.objects.all(), widget=forms.MultipleHiddenInput())

nautobot/dcim/templates/dcim/devicefamily_retrieve.html

@@ -1,44 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Device Family</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Name</td>
-                    <td>{{ object.name }}</a></td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description }}</a></td>
-                </tr>
-                <tr>
-                    <td>Device Types</td>
-                    <td><a href="{% url 'dcim:devicetype_list' %}?device_family={{ object.name }}">{{ device_type_count }}</a></td>
-                </tr>
-                <tr>
-                    <td>Total Devices</td>
-                    <td><a href="{% url 'dcim:device_list' %}?device_family={{ object.name }}">{{ total_devices }}</a></td>
-                </tr>
-            </table>
-        </div>
-{% endblock %}
-
-{% block content_full_width_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Device Types</strong>
-        </div>
-        {% include 'panel_table.html' with table=device_type_table %}
-        {% if perms.dcim.add_devicetype %}
-            <div class="panel-footer text-right noprint">
-                <a href="{% url 'dcim:devicetype_add' %}?device_family={{ object.pk }}" class="btn btn-xs btn-primary">
-                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Device Type
-                </a>
-            </div>
-        {% endif %}
-    </div>
-    {% include 'inc/paginator.html' with paginator=device_type_table.paginator page=device_type_table.page %}
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/deviceredundancygroup_retrieve.html

@@ -1,60 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Device Redundancy Group</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <tr>
-                    <td>Status</td>
-                    <td>
-                        {{ object.status| hyperlinked_object_with_color }}
-                    </td>
-                </tr>
-                <tr>
-                    <td>Description</td>
-                    <td>{{ object.description }}</td>
-                </tr>
-                <tr>
-                    <td>Failover Strategy</td>
-                    <td>{{ object.get_failover_strategy_display }}</td>
-                </tr>
-                <tr>
-                    <td>Secrets Group</td>
-                    <td>{{ object.secrets_group|hyperlinked_object }}</td>
-                </tr>
-            </table>
-        </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Comments</strong>
-            </div>
-            <div class="panel-body rendered-markdown">
-                {% if object.comments %}
-                    {{ object.comments|render_markdown }}
-                {% else %}
-                    <span class="text-muted">None</span>
-                {% endif %}
-            </div>
-        </div>
-{% endblock content_right_page %}
-
-{% block content_full_width_page %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Controllers</strong>
-            </div>
-            {% include 'responsive_table.html' with table=controllers_table %}
-        </div>
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Devices</strong>
-            </div>
-            {% include 'responsive_table.html' with table=devices_table %}
-        </div>
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/devicetype.html

@@ -1,217 +1,2 @@
-{% extends 'generic/object_retrieve.html' %}
-{% load buttons %}
-{% load helpers %}
-{% load plugins %}
-
-{% block extra_breadcrumbs %}
-                <li><a href="{% url 'dcim:devicetype_list' %}?manufacturer={{ object.manufacturer.name }}">{{ object.manufacturer }}</a></li>
-{% endblock extra_breadcrumbs %}
-
-{% block extra_buttons %}
-    {% if perms.dcim.change_devicetype %}
-        <div class="btn-group">
-            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-type-add-components-button">
-                <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="caret"></span>
-            </button>
-            <ul class="dropdown-menu">
-                {% if perms.dcim.add_consoleporttemplate %}
-                    <li><a href="{% url 'dcim:consoleporttemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleports">Console Ports</a></li>
-                {% endif %}
-                {% if perms.dcim.add_consoleserverporttemplate %}
-                    <li><a href="{% url 'dcim:consoleserverporttemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleserverports">Console Server Ports</a></li>
-                {% endif %}
-                {% if perms.dcim.add_powerporttemplate %}
-                    <li><a href="{% url 'dcim:powerporttemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=powerports">Power Ports</a></li>
-                {% endif %}
-                {% if perms.dcim.add_poweroutlettemplate %}
-                    <li><a href="{% url 'dcim:poweroutlettemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=poweroutlets">Power Outlets</a></li>
-                {% endif %}
-                {% if perms.dcim.add_interfacetemplate %}
-                    <li><a href="{% url 'dcim:interfacetemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=interfaces">Interfaces</a></li>
-                {% endif %}
-                {% if perms.dcim.add_frontporttemplate %}
-                    <li><a href="{% url 'dcim:frontporttemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=frontports">Front Ports</a></li>
-                {% endif %}
-                {% if perms.dcim.add_rearporttemplate %}
-                    <li><a href="{% url 'dcim:rearporttemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=rearports">Rear Ports</a></li>
-                {% endif %}
-                {% if perms.dcim.add_devicebaytemplate %}
-                    <li><a href="{% url 'dcim:devicebaytemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=devicebays">Device Bays</a></li>
-                {% endif %}
-                {% if perms.dcim.add_modulebaytemplate %}
-                    <li><a href="{% url 'dcim:modulebaytemplate_add' %}?device_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=modulebays">Module Bays</a></li>
-                {% endif %}
-            </ul>
-        </div>
-    {% endif %}
-{% endblock extra_buttons %}
-
-{% block title %}{{ object.manufacturer }} {{ object.model }}{% endblock title %}
-
-{% block extra_nav_tabs %}
-        <li role="presentation" {% if request.GET.tab == 'interfaces' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#interfaces" onclick="switch_tab(this.href)" aria-controls="interfaces" role="tab" data-toggle="tab">
-                Interfaces {% badge interface_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'frontports' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#frontports" onclick="switch_tab(this.href)" aria-controls="frontports" role="tab" data-toggle="tab">
-                Front Ports {% badge front_port_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'rearports' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#rearports" onclick="switch_tab(this.href)" aria-controls="rearports" role="tab" data-toggle="tab">
-                Rear Ports {% badge rear_port_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'consoleports' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#consoleports" onclick="switch_tab(this.href)" aria-controls="consoleports" role="tab" data-toggle="tab">
-                Console Ports {% badge consoleport_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'consoleserverports' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#consoleserverports" onclick="switch_tab(this.href)" aria-controls="consoleserverports" role="tab" data-toggle="tab">
-                Console Server Ports {% badge consoleserverport_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'powerports' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#powerports" onclick="switch_tab(this.href)" aria-controls="powerports" role="tab" data-toggle="tab">
-                Power Ports {% badge powerport_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation" {% if request.GET.tab == 'poweroutlets' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#poweroutlets" onclick="switch_tab(this.href)" aria-controls="poweroutlets" role="tab" data-toggle="tab">
-                Power Outlets {% badge poweroutlet_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation"{% if request.GET.tab == 'devicebays' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#devicebays" onclick="switch_tab(this.href)" aria-controls="devicebays" role="tab" data-toggle="tab">
-                Device Bays {% badge devicebay_table.rows|length %}
-            </a>
-        </li>
-        <li role="presentation"{% if request.GET.tab == 'modulebays' %} class="active"{% endif %}>
-            <a href="{{ object.get_absolute_url }}#modulebays" onclick="switch_tab(this.href)" aria-controls="modulebays" role="tab" data-toggle="tab">
-                Module Bays {% badge modulebay_table.rows|length %}
-            </a>
-        </li>
-{% endblock extra_nav_tabs %}
-
-{% block content_left_page %}
-            <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={{ object.manufacturer.name }}">{{ object.manufacturer }}</a></td>
-                    </tr>
-                    <tr>
-                        <td>Device Family</td>
-                        <td>
-                            {{ object.device_family | hyperlinked_object }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Model Name</td>
-                        <td>
-                            {{ object.model }}<br/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Part Number</td>
-                        <td>{{ object.part_number|placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Height (U)</td>
-                        <td>{{ object.u_height }}</td>
-                    </tr>
-                    <tr>
-                        <td>Full Depth</td>
-                        <td>{{ object.is_full_depth | render_boolean }}</td>
-                    </tr>
-                    <tr>
-                        <td>Parent/Child</td>
-                        <td>
-                            {{ object.get_subdevice_role_display|placeholder }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Front Image</td>
-                        <td>
-                            {% if object.front_image %}
-                                <a href="{{ object.front_image.url }}">
-                                    <img src="{{ object.front_image.url }}" alt="{{ object.front_image.name }}" class="img-responsive" />
-                                </a>
-                            {% else %}
-                                <span class="text-muted">&mdash;</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Rear Image</td>
-                        <td>
-                            {% if object.rear_image %}
-                                <a href="{{ object.rear_image.url }}">
-                                    <img src="{{ object.rear_image.url }}" alt="{{ object.rear_image.name }}" class="img-responsive" />
-                                </a>
-                            {% else %}
-                                <span class="text-muted">&mdash;</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>Device Instances</td>
-                        <td><a href="{% url 'dcim:device_list' %}?device_type={{ object.pk }}">{{ instance_count }}</a></td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Comments</strong>
-                </div>
-                <div class="panel-body rendered-markdown">
-                    {% if object.comments %}
-                        {{ object.comments|render_markdown }}
-                    {% else %}
-                        <span class="text-muted">None</span>
-                    {% endif %}
-                </div>
-            </div>
-            {% if object.software_image_files.count %}
-                {% include 'panel_table.html' with table=software_image_files_table heading='Software Image Files' %}
-            {% endif %}
-{% endblock content_right_page %}
-
-{% block extra_tab_content %}
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'interfaces' %}active{% else %}fade{% endif %}" id="interfaces">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' tab='interfaces' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'frontports' %}active{% else %}fade{% endif %}" id="frontports">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=front_port_table title='Front Ports' tab='frontports' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'rearports' %}active{% else %}fade{% endif %}" id="rearports">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=rear_port_table title='Rear Ports' tab='rearports' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'consoleports' %}active{% else %}fade{% endif %}" id="consoleports">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' tab='consoleports' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'consoleserverports' %}active{% else %}fade{% endif %}" id="consoleserverports">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' tab='consoleserverports' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'powerports' %}active{% else %}fade{% endif %}" id="powerports">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' tab='powerports' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'poweroutlets' %}active{% else %}fade{% endif %}" id="poweroutlets">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' tab='poweroutlets' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'devicebays' %}active{% else %}fade{% endif %}" id="devicebays">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' tab='devicebays' %}
-                </div>
-                <div role="tabpanel" class="tab-pane {% if request.GET.tab == 'modulebays' %}active{% else %}fade{% endif %}" id="modulebays">
-                    {% include 'dcim/inc/devicetype_component_table.html' with table=modulebay_table title='Module Bays' tab='modulebays' %}
-                </div>
-{% endblock extra_tab_content %}
+{% extends 'dcim/devicetype_retrieve.html' %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/dcim/templates/dcim/devicetype_edit.html

@@ -1,32 +1,2 @@
-{% extends 'generic/object_create.html' %}
-{% load form_helpers %}
-
-{% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Device Type</strong></div>
-        <div class="panel-body">
-            {% render_field form.manufacturer %}
-            {% render_field form.device_family %}
-            {% render_field form.model %}
-            {% render_field form.part_number %}
-            {% render_field form.u_height %}
-            {% render_field form.is_full_depth %}
-            {% render_field form.subdevice_role %}
-            {% render_field form.software_image_files %}
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Rack Images</strong></div>
-        <div class="panel-body">
-            {% render_field form.front_image %}
-            {% render_field form.rear_image %}
-        </div>
-    </div>
-    {% include 'inc/extras_features_edit_form_fields.html' %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Comments</strong></div>
-        <div class="panel-body">
-            {% render_field form.comments %}
-        </div>
-    </div>
-{% endblock %}
+{% extends "dcim/devicetype_update.html" %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}