Skip to content

Commit f9648d8

Browse files
committed
Closes #13400: Add 'name' property to BaseTable class
1 parent 2236b86 commit f9648d8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

netbox/netbox/tables/tables.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def __init__(self, *args, user=None, **kwargs):
5454
# 3. Meta.fields
5555
selected_columns = None
5656
if user is not None and not isinstance(user, AnonymousUser):
57-
selected_columns = user.config.get(f"tables.{self.__class__.__name__}.columns")
57+
selected_columns = user.config.get(f"tables.{self.name}.columns")
5858
if not selected_columns:
5959
selected_columns = getattr(self.Meta, 'default_columns', self.Meta.fields)
6060

@@ -113,6 +113,10 @@ def _get_columns(self, visible=True):
113113
columns.append((name, column.verbose_name))
114114
return columns
115115

116+
@property
117+
def name(self):
118+
return self.__class__.__name__
119+
116120
@property
117121
def available_columns(self):
118122
return self._get_columns(visible=False)
@@ -138,17 +142,16 @@ def configure(self, request):
138142
"""
139143
# Save ordering preference
140144
if request.user.is_authenticated:
141-
table_name = self.__class__.__name__
142145
if self.prefixed_order_by_field in request.GET:
143146
if request.GET[self.prefixed_order_by_field]:
144147
# If an ordering has been specified as a query parameter, save it as the
145148
# user's preferred ordering for this table.
146149
ordering = request.GET.getlist(self.prefixed_order_by_field)
147-
request.user.config.set(f'tables.{table_name}.ordering', ordering, commit=True)
150+
request.user.config.set(f'tables.{self.name}.ordering', ordering, commit=True)
148151
else:
149152
# If the ordering has been set to none (empty), clear any existing preference.
150-
request.user.config.clear(f'tables.{table_name}.ordering', commit=True)
151-
elif ordering := request.user.config.get(f'tables.{table_name}.ordering'):
153+
request.user.config.clear(f'tables.{self.name}.ordering', commit=True)
154+
elif ordering := request.user.config.get(f'tables.{self.name}.ordering'):
152155
# If no ordering has been specified, set the preferred ordering (if any).
153156
self.order_by = ordering
154157

0 commit comments

Comments
 (0)