From 8bd8f28cb98cc1bccfcf3e266394f3811712acff Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 24 Apr 2025 14:31:53 -0400 Subject: [PATCH] Fixes #19296: Fix logic for determining default selected columns --- netbox/netbox/tables/tables.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 37540a92b..6f6b30af2 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -165,11 +165,10 @@ class BaseTable(tables.Table): ordering = userconfig.get(f"tables.{self.name}.ordering") # Fall back to the default columns & ordering + if columns is None and hasattr(settings, 'DEFAULT_USER_PREFERENCES'): + columns = settings.DEFAULT_USER_PREFERENCES.get('tables', {}).get(self.name, {}).get('columns') if columns is None: - if hasattr(settings, 'DEFAULT_USER_PREFERENCES'): - columns = settings.DEFAULT_USER_PREFERENCES.get('tables', {}).get(self.name, {}).get('columns') - else: - columns = getattr(self.Meta, 'default_columns', self.Meta.fields) + columns = getattr(self.Meta, 'default_columns', self.Meta.fields) self._set_columns(columns) if ordering is not None: