From c9b1d60a16b7357e40d8a0075f835946488ee0df Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Apr 2025 10:13:48 -0400 Subject: [PATCH] Misc cleanup --- netbox/extras/models/models.py | 4 ++++ netbox/extras/utils.py | 7 +++---- netbox/netbox/views/generic/bulk_views.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index b16bc4194..be357379b 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -601,6 +601,10 @@ class TableConfig(ChangeLoggedModel): @property def ordering_items(self): + """ + Return a list of two-tuples indicating the column(s) by which the table is to be ordered and a boolean for each + column indicating whether its ordering is ascending. + """ items = [] for col in self.ordering or []: if col.startswith('-'): diff --git a/netbox/extras/utils.py b/netbox/extras/utils.py index 78e743763..c9f554d22 100644 --- a/netbox/extras/utils.py +++ b/netbox/extras/utils.py @@ -25,13 +25,12 @@ class SharedObjectViewMixin: Return only shared objects, or those owned by the current user, unless this is a superuser. """ queryset = super().get_queryset(request) - user = request.user - if user.is_superuser: + if request.user.is_superuser: return queryset - if user.is_anonymous: + if request.user.is_anonymous: return queryset.filter(shared=True) return queryset.filter( - Q(shared=True) | Q(user=user) + Q(shared=True) | Q(user=request.user) ) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index a53e69b1d..8df9f945f 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -140,7 +140,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): tableconfig = get_object_or_404(TableConfig, pk=tableconfig_id) if request.user.is_authenticated: table = self.table.__name__ - request.user.config.set(f'tables.{table}.columns', tableconfig.columns, commit=True) + request.user.config.set(f'tables.{table}.columns', tableconfig.columns) request.user.config.set(f'tables.{table}.ordering', tableconfig.ordering, commit=True) return redirect(request.path) @@ -181,7 +181,7 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin): # Retrieve available configurations for the table table_configs = TableConfig.objects.filter( - Q(shared=True) | Q(user=request.user), + Q(shared=True) | Q(user=request.user if request.user.is_authenticated else None), object_type=object_type, table=table.name, enabled=True,