From 3da1efd23e8ebf726f64a9da07fcfcc1a8811b85 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 19 Jan 2024 09:06:50 -0800 Subject: [PATCH] 14729 merge feature --- netbox/core/tables/tasks.py | 4 ++-- netbox/core/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/core/tables/tasks.py b/netbox/core/tables/tasks.py index fb708ae8b..8e0f740a2 100644 --- a/netbox/core/tables/tasks.py +++ b/netbox/core/tables/tasks.py @@ -24,7 +24,7 @@ class BackgroundQueueTable(BaseTable): db = tables.Column(accessor="connection_kwargs__db", verbose_name=_("DB")) pid = tables.Column(accessor="scheduler__pid", verbose_name=_("Scheduler PID")) - class Meta: + class Meta(BaseTable.Meta): empty_text = _('No tasks found') fields = ( '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")) callable = tables.Column(empty_values=(), verbose_name=_("Callable")) - class Meta: + class Meta(BaseTable.Meta): empty_text = _('No queues found') fields = ( 'id', 'created_at', 'enqueued_at', 'ended_at', 'status', 'callable', diff --git a/netbox/core/views.py b/netbox/core/views.py index 55ef2654f..74e7d9a03 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -252,7 +252,7 @@ class BackgroundQueuesListView(UserPassesTestMixin, View): def get(self, request): 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', { 'table': table, }) @@ -273,7 +273,7 @@ class BackgroundTasksListView(UserPassesTestMixin, View): jobs = [] 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', { 'table': table, 'queue': queue,