mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-17 21:18:16 -06:00
14729 merge feature
This commit is contained in:
parent
d70ad54a7c
commit
3da1efd23e
@ -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',
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user