nautobot 2.3.10__py3-none-any.whl → 2.3.11__py3-none-any.whl

nautobot/core/tests/test_utils.py

@@ -21,6 +21,7 @@ from nautobot.extras import models as extras_models, utils as extras_utils
 from nautobot.extras.choices import ObjectChangeActionChoices, RelationshipTypeChoices
 from nautobot.extras.models import ObjectChange
 from nautobot.extras.registry import registry
+from nautobot.ipam import models as ipam_models
 
 from example_app.models import ExampleModel
 
@@ -164,7 +165,7 @@ class GetFooForModelTest(TestCase):
 
     def test_get_filterset_for_model(self):
         """
-        Test the util function `get_filterset_for_model` returns the appropriate FilterSet, if model (as dotted string or class) provided.
+        Test that `get_filterset_for_model` returns the right FilterSet for various inputs.
         """
         self.assertEqual(lookup.get_filterset_for_model("dcim.device"), dcim_filters.DeviceFilterSet)
         self.assertEqual(lookup.get_filterset_for_model(dcim_models.Device), dcim_filters.DeviceFilterSet)
@@ -173,7 +174,7 @@ class GetFooForModelTest(TestCase):
 
     def test_get_form_for_model(self):
         """
-        Test the util function `get_form_for_model` returns the appropriate Form, if form type and model (as dotted string or class) provided.
+        Test that `get_form_for_model` returns the right Form for various inputs.
         """
         self.assertEqual(lookup.get_form_for_model("dcim.device", "Filter"), dcim_forms.DeviceFilterForm)
         self.assertEqual(lookup.get_form_for_model(dcim_models.Device, "Filter"), dcim_forms.DeviceFilterForm)
@@ -184,9 +185,28 @@ class GetFooForModelTest(TestCase):
         self.assertEqual(lookup.get_form_for_model("dcim.location"), dcim_forms.LocationForm)
         self.assertEqual(lookup.get_form_for_model(dcim_models.Location), dcim_forms.LocationForm)
 
+    def test_get_related_field_for_models(self):
+        """
+        Test that `get_related_field_for_models` returns the appropriate field for various inputs.
+        """
+        # No direct relation found
+        self.assertIsNone(lookup.get_related_field_for_models(dcim_models.Device, dcim_models.LocationType))
+        # ForeignKey and reverse
+        self.assertEqual(lookup.get_related_field_for_models(dcim_models.Device, dcim_models.Location).name, "location")
+        self.assertEqual(lookup.get_related_field_for_models(dcim_models.Location, dcim_models.Device).name, "devices")
+        # ManyToMany and reverse
+        self.assertEqual(
+            lookup.get_related_field_for_models(ipam_models.Prefix, dcim_models.Location).name, "locations"
+        )
+        self.assertEqual(lookup.get_related_field_for_models(dcim_models.Location, ipam_models.Prefix).name, "prefixes")
+        # Multiple candidate fields
+        with self.assertRaises(AttributeError):
+            # both primary_ip4 and primary_ip6 are candidates
+            lookup.get_related_field_for_models(dcim_models.Device, ipam_models.IPAddress)
+
     def test_get_route_for_model(self):
         """
-        Test the util function `get_route_for_model` returns the appropriate URL route name, if model (as dotted string or class) provided.
+        Test that `get_route_for_model` returns the appropriate URL route name for various inputs.
         """
         # UI
         self.assertEqual(lookup.get_route_for_model("dcim.device", "list"), "dcim:device_list")
@@ -221,7 +241,7 @@ class GetFooForModelTest(TestCase):
 
     def test_get_table_for_model(self):
         """
-        Test the util function `get_table_for_model` returns the appropriate Table, if model (as dotted string or class) provided.
+        Test that `get_table_for_model` returns the appropriate Table for various inputs.
         """
         self.assertEqual(lookup.get_table_for_model("dcim.device"), tables.DeviceTable)
         self.assertEqual(lookup.get_table_for_model(dcim_models.Device), tables.DeviceTable)
@@ -237,7 +257,7 @@ class GetFooForModelTest(TestCase):
 
     def test_get_model_for_view_name(self):
         """
-        Test the util function `get_model_for_view_name` returns the appropriate Model, if the colon separated view name provided.
+        Test that `get_model_for_view_name` returns the appropriate Model, if the colon separated view name provided.
         """
         with self.subTest("Test core view."):
             self.assertEqual(lookup.get_model_for_view_name("dcim:device_list"), dcim_models.Device)

nautobot/core/utils/lookup.py

@@ -177,6 +177,41 @@ def get_form_for_model(model, form_prefix=""):
     return get_related_class_for_model(model, module_name="forms", object_suffix=object_suffix)
 
 
+def get_related_field_for_models(from_model, to_model):
+    """
+    Find the field on `from_model` that is a relation to `to_model`.
+
+    If no such field is found, returns None.
+    If more than one such field is found, raises an AttributeError.
+
+    Args:
+        from_model (BaseModel): The model class that should contain the relevant field or relation.
+        to_model (BaseModel): The model class that we're looking for as the destination.
+
+    Examples:
+        >>> get_related_field_for_models(Device, Location)
+        <django.db.models.fields.related.ForeignKey: location>
+        >>> get_related_field_for_models(Location, Device)
+        <ManyToOneRel: dcim.device>
+        >>> get_related_field_for_models(Prefix, Location)
+        <django.db.models.fields.related.ManyToManyField: locations>
+        >>> get_related_field_for_models(Location, Prefix)
+        <ManyToManyRel: ipam.prefix>
+        >>> get_related_field_for_models(Device, IPAddress)
+        AttributeError: Device has more than one relation to IPAddress: primary_ip4, primary_ip6
+    """
+    matching_field = None
+    for field in from_model._meta.get_fields():
+        if hasattr(field, "remote_field") and field.remote_field and field.remote_field.model == to_model:
+            if matching_field is not None:
+                raise AttributeError(
+                    f"{from_model.__name__} has more than one relation to {to_model.__name__}: "
+                    f"{matching_field.name}, {field.name}"
+                )
+            matching_field = field
+    return matching_field
+
+
 def get_table_for_model(model):
     """Return the `Table` class associated with a given `model`.
 

nautobot/core/views/generic.py

@@ -46,7 +46,7 @@ from nautobot.core.utils.requests import (
     get_filterable_params_from_filter_params,
     normalize_querydict,
 )
-from nautobot.core.views.mixins import GetReturnURLMixin, ObjectPermissionRequiredMixin
+from nautobot.core.views.mixins import EditAndDeleteAllModelMixin, GetReturnURLMixin, ObjectPermissionRequiredMixin
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.core.views.utils import (
     check_filter_for_display,
@@ -979,7 +979,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):  #
         )
 
 
-class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
+class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, EditAndDeleteAllModelMixin, View):
     """
     Edit objects in bulk.
 
@@ -1013,18 +1013,18 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     def post(self, request, **kwargs):
         logger = logging.getLogger(__name__ + ".BulkEditView")
         model = self.queryset.model
+        edit_all = request.POST.get("_all")
 
         # If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
-        if request.POST.get("_all"):
-            if self.filterset is not None:
-                pk_list = list(self.filterset(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True))
-            else:
-                pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if edit_all:
+            pk_list = []
+            queryset = self._get_bulk_edit_delete_all_queryset(request)
         else:
             pk_list = request.POST.getlist("pk")
+            queryset = self.queryset.filter(pk__in=pk_list)
 
         if "_apply" in request.POST:
-            form = self.form(model, request.POST)
+            form = self.form(model, request.POST, edit_all=edit_all)
             restrict_form_fields(form, request.user)
 
             if form.is_valid():
@@ -1041,7 +1041,8 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 try:
                     with deferred_change_logging_for_bulk_operation():
                         updated_objects = []
-                        for obj in self.queryset.filter(pk__in=form.cleaned_data["pk"]):
+                        queryset = queryset if edit_all else queryset.filter(pk__in=form.cleaned_data["pk"])
+                        for obj in queryset:
                             obj = self.alter_obj(obj, request, [], kwargs)
 
                             # Update standard fields. If a field is listed in _nullify, delete its value.
@@ -1130,23 +1131,26 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             elif "device_type" in request.GET:
                 initial_data["device_type"] = request.GET.get("device_type")
 
-            form = self.form(model, initial=initial_data)
+            form = self.form(model, initial=initial_data, edit_all=edit_all)
             restrict_form_fields(form, request.user)
 
         # Retrieve objects being edited
-        table = self.table(self.queryset.filter(pk__in=pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(request, f"No {model._meta.verbose_name_plural} were selected.")
-            return redirect(self.get_return_url(request))
-        # Hide actions column if present
-        if "actions" in table.columns:
-            table.columns.hide("actions")
+        table = None
+        if not edit_all:
+            table = self.table(queryset, orderable=False)
+            if not table.rows:
+                messages.warning(request, f"No {model._meta.verbose_name_plural} were selected.")
+                return redirect(self.get_return_url(request))
+            # Hide actions column if present
+            if "actions" in table.columns:
+                table.columns.hide("actions")
 
         context = {
             "form": form,
             "table": table,
             "obj_type_plural": model._meta.verbose_name_plural,
             "return_url": self.get_return_url(request),
+            "objs_count": queryset.count(),
         }
         context.update(self.extra_context())
         return render(request, self.template_name, context)
@@ -1255,7 +1259,7 @@ class BulkRenameView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
         return ""
 
 
-class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
+class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, EditAndDeleteAllModelMixin, View):
     """
     Delete objects in bulk.
 
@@ -1278,18 +1282,37 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
     def get(self, request):
         return redirect(self.get_return_url(request))
 
-    def post(self, request, **kwargs):
+    def _perform_delete_operation(self, request, queryset, model):
         logger = logging.getLogger(__name__ + ".BulkDeleteView")
+        self.perform_pre_delete(request, queryset)
+        try:
+            _, deleted_info = bulk_delete_with_bulk_change_logging(queryset)
+            deleted_count = deleted_info[model._meta.label]
+        except ProtectedError as e:
+            logger.info("Caught ProtectedError while attempting to delete objects")
+            handle_protectederror(queryset, request, e)
+            return redirect(self.get_return_url(request))
+        msg = f"Deleted {deleted_count} {model._meta.verbose_name_plural}"
+        logger.info(msg)
+        messages.success(request, msg)
+        return redirect(self.get_return_url(request))
+
+    def post(self, request, **kwargs):
+        logger = logging.getLogger(f"{__name__}.BulkDeleteView")
         model = self.queryset.model
 
         # Are we deleting *all* objects in the queryset or just a selected subset?
         if request.POST.get("_all"):
-            if self.filterset is not None:
-                pk_list = list(self.filterset(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True))
-            else:
-                pk_list = list(model.objects.all().values_list("pk", flat=True))
-        else:
-            pk_list = request.POST.getlist("pk")
+            queryset = self._get_bulk_edit_delete_all_queryset(request)
+
+            if "_confirm" in request.POST:
+                return self._perform_delete_operation(request, queryset, model)
+
+            context = self._bulk_delete_all_context(request, queryset)
+            context.update(self.extra_context())
+            return render(request, self.template_name, context)
+
+        pk_list = request.POST.getlist("pk")
 
         form_cls = self.get_form()
 
@@ -1300,20 +1323,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
 
                 # Delete objects
                 queryset = self.queryset.filter(pk__in=pk_list)
-
-                self.perform_pre_delete(request, queryset)
-                try:
-                    _, deleted_info = bulk_delete_with_bulk_change_logging(queryset)
-                    deleted_count = deleted_info[model._meta.label]
-                except ProtectedError as e:
-                    logger.info("Caught ProtectedError while attempting to delete objects")
-                    handle_protectederror(queryset, request, e)
-                    return redirect(self.get_return_url(request))
-                msg = f"Deleted {deleted_count} {model._meta.verbose_name_plural}"
-                logger.info(msg)
-                messages.success(request, msg)
-                return redirect(self.get_return_url(request))
-
+                return self._perform_delete_operation(request, queryset, model)
             else:
                 logger.debug("Form validation failed")
 
@@ -1342,6 +1352,7 @@ class BulkDeleteView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
             "obj_type_plural": model._meta.verbose_name_plural,
             "table": table,
             "return_url": self.get_return_url(request),
+            "total_objs_to_delete": len(table.rows),
         }
         context.update(self.extra_context())
         return render(request, self.template_name, context)

nautobot/core/views/mixins.py

@@ -414,7 +414,7 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         else:
             # render the form with the error message.
             data = {}
-            if self.action in ["bulk_update", "bulk_destroy"]:
+            if not request.POST.get("_all") and self.action in ["bulk_update", "bulk_destroy"]:
                 pk_list = self.pk_list
                 table_class = self.get_table_class()
                 table = table_class(queryset.filter(pk__in=pk_list), orderable=False)
@@ -578,6 +578,9 @@ class NautobotViewSetMixin(GenericViewSet, AccessMixin, GetReturnURLMixin, FormV
         if not form_class:
             if self.action == "bulk_destroy":
                 queryset = self.get_queryset()
+                bulk_delete_all = bool(self.request.POST.get("_all"))
+                if bulk_delete_all:
+                    return ConfirmationForm
 
                 class BulkDestroyForm(ConfirmationForm):
                     pk = ModelMultipleChoiceField(queryset=queryset, widget=MultipleHiddenInput)
@@ -909,7 +912,48 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
             return self.form_invalid(form)
 
 
-class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
+class EditAndDeleteAllModelMixin:
+    """
+    UI mixin to bulk destroy all and bulk edit all model instances.
+    """
+
+    def _get_bulk_edit_delete_all_queryset(self, request):
+        """
+        Retrieve the queryset of model instances to be bulk-deleted or bulk-deleted, filtered based on request parameters.
+
+        This method handles the retrieval of a queryset of model instances that match the specified
+        filter criteria in the request parameters, allowing a bulk delete operation to be performed
+        on all matching instances.
+        """
+        model = self.queryset.model
+
+        # This Mixin is currently been used by both NautobotUIViewSet ObjectBulkDestroyViewMixin, ObjectBulkUpdateViewMixin
+        # BulkEditView, and BulkDeleteView which uses different keys for accessing filterset
+        filterset_class = getattr(self, "filterset", None)
+        if filterset_class is None:
+            filterset_class = getattr(self, "filterset_class", None)
+
+        if request.GET and filterset_class is not None:
+            queryset = filterset_class(request.GET, model.objects.all()).qs
+            # We take this approach because filterset.qs has already applied .distinct(),
+            # and performing a .delete directly on a queryset with .distinct applied is not allowed.
+            queryset = self.queryset.filter(pk__in=queryset)
+        else:
+            queryset = model.objects.all()
+        return queryset
+
+    def _bulk_delete_all_context(self, request, queryset):
+        model = queryset.model
+        return {
+            "obj_type_plural": model._meta.verbose_name_plural,
+            "return_url": self.get_return_url(request),
+            "total_objs_to_delete": queryset.count(),
+            "delete_all": True,
+            "table": None,
+        }
+
+
+class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk destroy model instances.
     """
@@ -923,7 +967,10 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         queryset = self.get_queryset()
         model = queryset.model
         # Delete objects
-        queryset = queryset.filter(pk__in=pk_list)
+        if self.request.POST.get("_all"):
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+        else:
+            queryset = queryset.filter(pk__in=pk_list)
 
         try:
             with transaction.atomic():
@@ -951,35 +998,33 @@ class ObjectBulkDestroyViewMixin(NautobotViewSetMixin, BulkDestroyModelMixin):
         request.POST "_confirm": Function to validate the table form/BulkDestroyConfirmationForm and to perform the action of bulk destroy. Render the form with errors if exceptions are raised.
         """
         queryset = self.get_queryset()
-        model = queryset.model
+        delete_all = bool(request.POST.get("_all"))
+        data = {}
         # Are we deleting *all* objects in the queryset or just a selected subset?
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if delete_all:
+            queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            data = self._bulk_delete_all_context(request, queryset)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+
         form_class = self.get_form_class(**kwargs)
-        data = {}
         if "_confirm" in request.POST:
             form = form_class(request.POST, initial=normalize_querydict(request.GET, form_class=form_class))
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
-            )
-            return redirect(self.get_return_url(request))
+        if not delete_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected for deletion.",
+                )
+                return redirect(self.get_return_url(request))
 
-        data.update({"table": table})
+            data.update({"table": table})
         return Response(data)
 
 
@@ -1037,7 +1082,7 @@ class ObjectBulkCreateViewMixin(NautobotViewSetMixin):  # 3.0 TODO: remove, unus
             return self.form_invalid(form)
 
 
-class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
+class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, EditAndDeleteAllModelMixin):
     """
     UI mixin to bulk update model instances.
     """
@@ -1062,7 +1107,13 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         nullified_fields = request.POST.getlist("_nullify")
         with deferred_change_logging_for_bulk_operation():
             updated_objects = []
-            for obj in queryset.filter(pk__in=form.cleaned_data["pk"]):
+            edit_all = self.request.POST.get("_all")
+
+            if edit_all:
+                queryset = self._get_bulk_edit_delete_all_queryset(self.request)
+            else:
+                queryset = queryset.filter(pk__in=form.cleaned_data["pk"])
+            for obj in queryset:
                 self.obj = obj
                 # Update standard fields. If a field is listed in _nullify, delete its value.
                 for name in standard_fields:
@@ -1133,38 +1184,41 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin):
         request.POST "_edit": Function to render the user selection of objects in a table form/BulkUpdateForm via Response that is passed to NautobotHTMLRenderer.
         request.POST "_apply": Function to validate the table form/BulkUpdateForm and to perform the action of bulk update. Render the form with errors if exceptions are raised.
         """
-        queryset = self.get_queryset()
-        model = queryset.model
+        edit_all = request.POST.get("_all")
 
-        # If we are editing *all* objects in the queryset, replace the PK list with all matched objects.
-        if request.POST.get("_all"):
-            if self.filterset_class is not None:
-                self.pk_list = list(
-                    self.filterset_class(request.GET, model.objects.only("pk")).qs.values_list("pk", flat=True)
-                )
-            else:
-                self.pk_list = list(model.objects.all().values_list("pk", flat=True))
+        if edit_all:
+            self.pk_list = None
+            queryset = self._get_bulk_edit_delete_all_queryset(request)
         else:
             self.pk_list = list(request.POST.getlist("pk"))
+            queryset = self.get_queryset().filter(pk__in=self.pk_list)
+
         data = {}
         form_class = self.get_form_class()
         if "_apply" in request.POST:
             self.kwargs = kwargs
-            form = form_class(queryset.model, request.POST)
+            form = form_class(queryset.model, request.POST, edit_all=edit_all)
             restrict_form_fields(form, request.user)
             if form.is_valid():
                 return self.form_valid(form)
             else:
                 return self.form_invalid(form)
-        table_class = self.get_table_class()
-        table = table_class(queryset.filter(pk__in=self.pk_list), orderable=False)
-        if not table.rows:
-            messages.warning(
-                request,
-                f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
-            )
-            return redirect(self.get_return_url(request))
-        data.update({"table": table})
+        table = None
+        if not edit_all:
+            table_class = self.get_table_class()
+            table = table_class(queryset, orderable=False)
+            if not table.rows:
+                messages.warning(
+                    request,
+                    f"No {queryset.model._meta.verbose_name_plural} were selected to update.",
+                )
+                return redirect(self.get_return_url(request))
+        data.update(
+            {
+                "table": table,
+                "objs_count": queryset.count(),
+            }
+        )
         return Response(data)
 
 

nautobot/core/views/renderers.py

@@ -249,19 +249,22 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
                         "return_url": return_url,
                     }
                     form = form_class(initial=initial)
-                table = self.construct_table(view, pk_list=pk_list)
+                delete_all = request.POST.get("_all")
+                if not delete_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "bulk_create":  # 3.0 TODO: remove, replaced by ImportObjects system Job
                 form = view.get_form()
                 if request.data:
                     table = data.get("table")
             elif view.action == "bulk_update":
+                edit_all = request.POST.get("_all")
                 pk_list = getattr(view, "pk_list", [])
-                if pk_list:
+                if pk_list or edit_all:
                     initial_data = {"pk": pk_list}
-                    form = form_class(model, initial=initial_data)
-
+                    form = form_class(model, initial=initial_data, edit_all=edit_all)
                     restrict_form_fields(form, request.user)
-                table = self.construct_table(view, pk_list=pk_list)
+                if not edit_all:
+                    table = self.construct_table(view, pk_list=pk_list)
             elif view.action == "notes":
                 initial_data = {
                     "assigned_object_type": content_type,

nautobot/dcim/tables/devices.py

@@ -1277,6 +1277,9 @@ class SoftwareImageFileTable(StatusTableMixin, BaseTable):
 class SoftwareVersionTable(StatusTableMixin, BaseTable):
     pk = ToggleColumn()
     version = tables.Column(linkify=True)
+    platform = tables.Column(linkify=True)
+    release_date = tables.DateColumn()
+    end_of_support_date = tables.DateColumn()
     software_image_file_count = LinkedCountColumn(
         viewname="dcim:softwareimagefile_list",
         url_params={"software_version": "pk"},

nautobot/dcim/templates/dcim/device_component_add.html

@@ -7,7 +7,7 @@
 <form action="" method="post" class="form form-horizontal">
     {% csrf_token %}
     <div class="row">
-        <div class="col-md-6 col-md-offset-3">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
             {% if form.non_field_errors %}
                 <div class="panel panel-danger">
                     <div class="panel-heading"><strong>Errors</strong></div>
@@ -25,13 +25,13 @@
                 </div>
             </div>
             {% include 'inc/extras_features_edit_form_fields.html' with form=model_form %}
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3 text-right">
-                    <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                    <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
-                    <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-                </div>
-            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
+            <button type="submit" name="_create" class="btn btn-primary">Create</button>
+            <button type="submit" name="_addanother" class="btn btn-primary">Create and Add More</button>
+            <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
         </div>
     </div>
 </form>

nautobot/dcim/templates/dcim/virtualchassis_add_member.html

@@ -5,7 +5,7 @@
     <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
         {% csrf_token %}
         <div class="row">
-            <div class="col-md-6 col-md-offset-3">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}</h3>
                 {% if membership_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -25,7 +25,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6 col-md-offset-3 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_save" class="btn btn-primary">Save</button>
                 <button type="submit" name="_addanother" class="btn btn-primary">Add Another</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>

nautobot/dcim/templates/dcim/virtualchassis_edit.html

@@ -8,7 +8,7 @@
         {{ pk_form.pk }}
         {{ formset.management_form }}
         <div class="row">
-            <div class="col-md-8 col-md-offset-2">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
                 <h3>{% block title %}{% if vc_form.instance %}Editing {{ vc_form.instance }}{% else %}New Virtual Chassis{% endif %}{% endblock %}</h3>
                 {% if vc_form.non_field_errors %}
                     <div class="panel panel-danger">
@@ -84,7 +84,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-md-8 col-md-offset-2 text-right">
+            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 text-right">
                 <button type="submit" name="_update" class="btn btn-primary">Update</button>
                 <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
             </div>