NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 04:02:52 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Clear ordering preferences if set to a nonexistent field (i.e. if upgrading to a version with changed fields)

Browse Source
This commit is contained in:
Brian Tiemann 2024-12-02 14:46:09 -05:00
parent d122c334fd
commit 93821ca0ea
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/netbox/tables/tables.py
View File

@ -4,7 +4,7 @@ from functools import cached_property
import django_tables2 as tables import django_tables2 as tables
from django.contrib.auth.models import AnonymousUser from django.contrib.auth.models import AnonymousUser
from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.fields import GenericForeignKey
from django.core.exceptions import FieldDoesNotExist from django.core.exceptions import FieldDoesNotExist, FieldError
from django.db.models.fields.related import RelatedField from django.db.models.fields.related import RelatedField
from django.db.models.fields.reverse_related import ManyToOneRel from django.db.models.fields.reverse_related import ManyToOneRel
from django.urls import reverse from django.urls import reverse
@ -162,7 +162,11 @@ class BaseTable(tables.Table):
request.user.config.clear(f'tables.{self.name}.ordering', commit=True) request.user.config.clear(f'tables.{self.name}.ordering', commit=True)
elif ordering := request.user.config.get(f'tables.{self.name}.ordering'): elif ordering := request.user.config.get(f'tables.{self.name}.ordering'):
# If no ordering has been specified, set the preferred ordering (if any). # If no ordering has been specified, set the preferred ordering (if any).
self.order_by = ordering # Check that the requested field exists and clear the preference if previously set.
try:
self.order_by = ordering
except FieldError:
request.user.config.clear(f'tables.{self.name}.ordering', commit=True)
# Paginate the table results # Paginate the table results
paginate = { paginate = {