NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-18 05:28:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

14729 merge feature

Browse Source
This commit is contained in:
Arthur 2024-01-19 09:06:50 -08:00
parent d70ad54a7c
commit 3da1efd23e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/core/tables/tasks.py
View File

@ -24,7 +24,7 @@ class BackgroundQueueTable(BaseTable):
db = tables.Column(accessor="connection_kwargs__db", verbose_name=_("DB")) db = tables.Column(accessor="connection_kwargs__db", verbose_name=_("DB"))
pid = tables.Column(accessor="scheduler__pid", verbose_name=_("Scheduler PID")) pid = tables.Column(accessor="scheduler__pid", verbose_name=_("Scheduler PID"))
class Meta: class Meta(BaseTable.Meta):
empty_text = _('No tasks found') empty_text = _('No tasks found')
fields = ( fields = (
'name', 'jobs', 'oldest_job_timestamp', 'started_jobs', 'deferred_jobs', 'finished_jobs', 'failed_jobs', 'scheduled_jobs', 'workers', 'host', 'port', 'db', 'pid', 'name', 'jobs', 'oldest_job_timestamp', 'started_jobs', 'deferred_jobs', 'finished_jobs', 'failed_jobs', 'scheduled_jobs', 'workers', 'host', 'port', 'db', 'pid',
@ -45,7 +45,7 @@ class BackgroundTaskTable(BaseTable):
status = tables.Column(empty_values=(), verbose_name=_("Status")) status = tables.Column(empty_values=(), verbose_name=_("Status"))
callable = tables.Column(empty_values=(), verbose_name=_("Callable")) callable = tables.Column(empty_values=(), verbose_name=_("Callable"))
class Meta: class Meta(BaseTable.Meta):
empty_text = _('No queues found') empty_text = _('No queues found')
fields = ( fields = (
'id', 'created_at', 'enqueued_at', 'ended_at', 'status', 'callable', 'id', 'created_at', 'enqueued_at', 'ended_at', 'status', 'callable',

4
netbox/core/views.py
View File

@ -252,7 +252,7 @@ class BackgroundQueuesListView(UserPassesTestMixin, View):
def get(self, request): def get(self, request):
table = tables.BackgroundQueueTable(get_statistics(run_maintenance_tasks=True)["queues"]) table = tables.BackgroundQueueTable(get_statistics(run_maintenance_tasks=True)["queues"])
table.configure(request) table.configure(request, user=request.user)
return render(request, 'core/background_tasks.html', { return render(request, 'core/background_tasks.html', {
'table': table, 'table': table,
}) })
@ -273,7 +273,7 @@ class BackgroundTasksListView(UserPassesTestMixin, View):
jobs = [] jobs = []
table = tables.BackgroundTaskTable(data=jobs, queue_index=queue_index) table = tables.BackgroundTaskTable(data=jobs, queue_index=queue_index)
table.configure(request) table.configure(request, user=request.user)
return render(request, 'core/background_tasks_queue.html', { return render(request, 'core/background_tasks_queue.html', {
'table': table, 'table': table,
'queue': queue, 'queue': queue,