diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index 112947751..5c489a96c 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -13,6 +13,7 @@ * [#3983](https://github.com/netbox-community/netbox/issues/3983) - Permit the creation of multiple unnamed devices * [#3989](https://github.com/netbox-community/netbox/issues/3989) - Correct HTTP content type assignment for webhooks * [#3999](https://github.com/netbox-community/netbox/issues/3999) - Do not filter child results by null if non-required parent fields are blank +* [#4008](https://github.com/netbox-community/netbox/issues/4008) - Toggle rack elevation face using front/rear strings --- diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c83cee8fb..fd3d09ab7 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -30,6 +30,7 @@ from utilities.views import ( ) from virtualization.models import VirtualMachine from . import filters, forms, tables +from .choices import DeviceFaceChoices from .models import ( Cable, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceTemplate, @@ -376,16 +377,15 @@ class RackElevationListView(PermissionRequiredMixin, View): page = paginator.page(paginator.num_pages) # Determine rack face - if request.GET.get('face') == '1': - face_id = 1 - else: - face_id = 0 + rack_face = request.GET.get('face', DeviceFaceChoices.FACE_FRONT) + if rack_face not in DeviceFaceChoices.values(): + rack_face = DeviceFaceChoices.FACE_FRONT return render(request, 'dcim/rack_elevation_list.html', { 'paginator': paginator, 'page': page, 'total_count': total_count, - 'face_id': face_id, + 'rack_face': rack_face, 'filter_form': forms.RackElevationFilterForm(request.GET), }) diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index de7c55919..da4f002d6 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -3,8 +3,8 @@ {% block content %}
- Front - Rear + Front + Rear

{% block title %}Rack Elevations{% endblock %}

@@ -17,11 +17,7 @@ {{ rack.name|truncatechars:"25" }}

{{ rack.facility_id|truncatechars:"30" }}

- {% if face_id %} - {% include 'dcim/inc/rack_elevation.html' with face='rear' %} - {% else %} - {% include 'dcim/inc/rack_elevation.html' with face='front' %} - {% endif %} + {% include 'dcim/inc/rack_elevation.html' with face=rack_face %}
{{ rack.name|truncatechars:"25" }}