mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #7442: Fix missing actions column on user-configured tables

Browse Source
This commit is contained in:
jeremystretch
2021-10-05 09:34:30 -04:00
parent c262af550d
commit 1757102536
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/release-notes/version-3.0.md
View File

@ -1,5 +1,13 @@
# NetBox v3.0 # NetBox v3.0
## v3.0.6 (FUTURE)
### Bug Fixes
* [#7442](https://github.com/netbox-community/netbox/issues/7442) - Fix missing actions column on user-configured tables
---
## v3.0.5 (2021-10-04) ## v3.0.5 (2021-10-04)
### Enhancements ### Enhancements

18
netbox/utilities/tables.py
View File

@ -57,14 +57,14 @@ class BaseTable(tables.Table):
if user is not None and not isinstance(user, AnonymousUser): if user is not None and not isinstance(user, AnonymousUser):
selected_columns = user.config.get(f"tables.{self.__class__.__name__}.columns") selected_columns = user.config.get(f"tables.{self.__class__.__name__}.columns")
if selected_columns: if selected_columns:
pk = self.base_columns.pop('pk', None)
actions = self.base_columns.pop('actions', None)
# Show only persistent or selected columns
for name, column in self.columns.items(): for name, column in self.columns.items():
if name in selected_columns: if name in ['pk', 'actions', *selected_columns]:
self.columns.show(name) self.columns.show(name)
else: else:
self.columns.hide(name) self.columns.hide(name)
# Rearrange the sequence to list selected columns first, followed by all remaining columns # Rearrange the sequence to list selected columns first, followed by all remaining columns
# TODO: There's probably a more clever way to accomplish this # TODO: There's probably a more clever way to accomplish this
self.sequence = [ self.sequence = [
@ -72,12 +72,14 @@ class BaseTable(tables.Table):
*[c for c in self.columns.names() if c not in selected_columns] *[c for c in self.columns.names() if c not in selected_columns]
] ]
# Always include PK and actions column, if defined on the table # PK column should always come first
if pk: if 'pk' in self.sequence:
self.base_columns['pk'] = pk self.sequence.remove('pk')
self.sequence.insert(0, 'pk') self.sequence.insert(0, 'pk')
if actions:
self.base_columns['actions'] = actions # Actions column should always come last
if 'actions' in self.sequence:
self.sequence.remove('actions')
self.sequence.append('actions') self.sequence.append('actions')
# Dynamically update the table's QuerySet to ensure related fields are pre-fetched # Dynamically update the table's QuerySet to ensure related fields are pre-fetched