NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

#9665 review changes

Browse Source
This commit is contained in:
Arthur 2022-09-01 11:12:01 -07:00
parent 80d5a966db
commit 43b3ce9ed1
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
netbox/dcim/views.py
View File

@ -589,17 +589,17 @@ class RackElevationListView(generic.ObjectListView):
racks = filtersets.RackFilterSet(request.GET, self.queryset).qs racks = filtersets.RackFilterSet(request.GET, self.queryset).qs
total_count = racks.count() 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") sort = request.GET.get('sort', "name")
if sort: if sort not in ORDERING_CHOICES:
if sort == 'name': sort = 'name'
racks = racks.order_by('name')
elif sort == '-name': racks = racks.order_by(sort)
racks = racks.order_by('-name')
elif sort == 'facility':
racks = racks.order_by('facility_id')
elif sort == '-facility':
racks = racks.order_by('-facility_id')
# Pagination # Pagination
per_page = get_paginate_count(request) per_page = get_paginate_count(request)
@ -622,6 +622,7 @@ class RackElevationListView(generic.ObjectListView):
'page': page, 'page': page,
'total_count': total_count, 'total_count': total_count,
'sort': sort, 'sort': sort,
'sort_choices': ORDERING_CHOICES,
'rack_face': rack_face, 'rack_face': rack_face,
'filter_form': forms.RackElevationFilterForm(request.GET), 'filter_form': forms.RackElevationFilterForm(request.GET),
}) })

7
netbox/templates/dcim/rack_elevation_list.html
View File

@ -23,10 +23,9 @@
<i class="mdi mdi-sort"></i>&nbsp;Sort By ({{ sort }}) <i class="mdi mdi-sort"></i>&nbsp;Sort By ({{ sort }})
</button> </button>
<ul class="dropdown-menu dropdown-menu-end"> <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> {% for sort_key, sort_display_name in sort_choices.items %}
<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 == sort_key %} active{% endif %}" href="{% url 'dcim:rack_elevation_list' %}{% querystring request sort=sort_key %}">{{ sort_display_name }}</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> {% endfor %}
<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>
</ul> </ul>
</div> </div>
</div> </div>