From 43b3ce9ed13d86ef1cd496f5471222d7df3cdc4a Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 1 Sep 2022 11:12:01 -0700
Subject: [PATCH] #9665 review changes

---
 netbox/dcim/views.py                          | 21 ++++++++++---------
 .../templates/dcim/rack_elevation_list.html   |  7 +++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0f6e388ca..3637e5c5f 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -589,17 +589,17 @@ class RackElevationListView(generic.ObjectListView):
         racks = filtersets.RackFilterSet(request.GET, self.queryset).qs
         total_count = racks.count()
 
-        # Determine ordering
+        ORDERING_CHOICES = {
+            'name': 'Name (A-Z)',
+            '-name': 'Name (Z-A)',
+            'facility_id': 'Facility ID (A-Z)',
+            '-facility_id': 'Facility ID (Z-A)',
+        }
         sort = request.GET.get('sort', "name")
-        if sort:
-            if sort == 'name':
-                racks = racks.order_by('name')
-            elif sort == '-name':
-                racks = racks.order_by('-name')
-            elif sort == 'facility':
-                racks = racks.order_by('facility_id')
-            elif sort == '-facility':
-                racks = racks.order_by('-facility_id')
+        if sort not in ORDERING_CHOICES:
+            sort = 'name'
+
+        racks = racks.order_by(sort)
 
         # Pagination
         per_page = get_paginate_count(request)
@@ -622,6 +622,7 @@ class RackElevationListView(generic.ObjectListView):
             'page': page,
             'total_count': total_count,
             'sort': sort,
+            'sort_choices': ORDERING_CHOICES,
             '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 13953b4b1..97f5055cf 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -23,10 +23,9 @@
                 <i class="mdi mdi-sort"></i>&nbsp;Sort By ({{ sort }})
               </button>
               <ul class="dropdown-menu dropdown-menu-end">
-                <li><a class="dropdown-item{% if sort == 'name' %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request sort='name' %}">Name (A-Z)</a></li>
-                <li><a class="dropdown-item{% if sort == '-name' %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request  sort='-name' %}">Name (Z-A)</a></li>
-                <li><a class="dropdown-item{% if sort == 'facility' %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request sort='facility' %}">Facility ID (A-Z)</a></li>
-                <li><a class="dropdown-item{% if sort == '-facility' %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request sort='-facility' %}">Facility ID (Z-A)</a></li>
+                {% for sort_key, sort_display_name in sort_choices.items %}
+                  <li><a class="dropdown-item{% if sort == sort_key %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request sort=sort_key %}">{{ sort_display_name }}</a></li>
+                {% endfor %}
               </ul>
             </div>
         </div>