diff --git a/netbox/core/tables/tasks.py b/netbox/core/tables/tasks.py
index 9af1bee25..de792d134 100644
--- a/netbox/core/tables/tasks.py
+++ b/netbox/core/tables/tasks.py
@@ -9,8 +9,8 @@ from utilities.templatetags.helpers import annotated_date
class BackgroundQueueTable(BaseTable):
- name = tables.LinkColumn("core:background_tasks_queues", args=[A("index")], verbose_name=_("Name"))
- jobs = tables.LinkColumn("core:background_tasks_queues", args=[A("index")], verbose_name=_("Queued"))
+ name = tables.LinkColumn("core:background_task_list", args=[A("index")], verbose_name=_("Name"))
+ jobs = tables.LinkColumn("core:background_task_list", args=[A("index")], verbose_name=_("Queued"))
oldest_job_timestamp = tables.Column(verbose_name=_("Oldest Queued"))
started_jobs = tables.Column(verbose_name=_("Active"))
deferred_jobs = tables.Column(verbose_name=_("Deferred"))
@@ -52,7 +52,7 @@ class BackgroundTaskTable(BaseTable):
def render_id(self, value, record):
return mark_safe('' + value + ''
)
diff --git a/netbox/core/urls.py b/netbox/core/urls.py
index 77e48fc7c..c9616a2fd 100644
--- a/netbox/core/urls.py
+++ b/netbox/core/urls.py
@@ -26,9 +26,9 @@ urlpatterns = (
path('jobs//delete/', views.JobDeleteView.as_view(), name='job_delete'),
# Background Tasks
- path('background-queues/', views.BackgroundQueuesListView.as_view(), name='background_tasks_list'),
- path('background-queues//', views.BackgroundTasksListView.as_view(), name='background_tasks_queues'),
- path('background-tasks///', views.BackgroundTaskDetailView.as_view(), name='background_tasks_job_detail'),
+ path('background-queues/', views.BackgroundQueueListView.as_view(), name='background_queue_list'),
+ path('background-queues//', views.BackgroundTaskListView.as_view(), name='background_task_list'),
+ path('background-tasks///', views.BackgroundTaskDetailView.as_view(), name='background_task'),
# Config revisions
path('config-revisions/', views.ConfigRevisionListView.as_view(), name='configrevision_list'),
diff --git a/netbox/core/views.py b/netbox/core/views.py
index 45f49ef80..ee0d0a873 100644
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -246,7 +246,7 @@ class ConfigRevisionRestoreView(ContentTypePermissionRequiredMixin, View):
#
-class BackgroundQueuesListView(UserPassesTestMixin, View):
+class BackgroundQueueListView(UserPassesTestMixin, View):
def test_func(self):
return self.request.user.is_staff
@@ -254,12 +254,12 @@ class BackgroundQueuesListView(UserPassesTestMixin, View):
def get(self, request):
table = tables.BackgroundQueueTable(get_statistics(run_maintenance_tasks=True)["queues"], user=request.user)
table.configure(request)
- return render(request, 'core/background_queues_list.html', {
+ return render(request, 'core/background_queue_list.html', {
'table': table,
})
-class BackgroundTasksListView(UserPassesTestMixin, View):
+class BackgroundTaskListView(UserPassesTestMixin, View):
def test_func(self):
return self.request.user.is_staff
@@ -274,7 +274,7 @@ class BackgroundTasksListView(UserPassesTestMixin, View):
table = tables.BackgroundTaskTable(data=jobs, user=request.user, queue_index=queue_index)
table.configure(request)
- return render(request, 'core/background_tasks_list.html', {
+ return render(request, 'core/background_task_list.html', {
'table': table,
'queue': queue,
})
diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py
index 27556bae5..5be26f6c0 100644
--- a/netbox/netbox/navigation/menu.py
+++ b/netbox/netbox/navigation/menu.py
@@ -357,7 +357,7 @@ OPERATIONS_MENU = Menu(
permissions=['core.view_job'],
),
MenuItem(
- link='core:background_tasks_list',
+ link='core:background_queue_list',
link_text=_('Background Tasks'),
permissions=['core.view_job'],
),
diff --git a/netbox/templates/core/background_queues_list.html b/netbox/templates/core/background_queue_list.html
similarity index 100%
rename from netbox/templates/core/background_queues_list.html
rename to netbox/templates/core/background_queue_list.html
diff --git a/netbox/templates/core/background_task.html b/netbox/templates/core/background_task.html
index fee8a956d..2d505c540 100644
--- a/netbox/templates/core/background_task.html
+++ b/netbox/templates/core/background_task.html
@@ -4,8 +4,8 @@
{% load render_table from django_tables2 %}
{% block breadcrumbs %}
- {% trans 'Background Tasks' %}
- {{ queue.name }}
+ {% trans 'Background Tasks' %}
+ {{ queue.name }}
{% endblock breadcrumbs %}
{% block title %}{% trans "Job" %} {{ job.id }}{% endblock %}
diff --git a/netbox/templates/core/background_tasks_list.html b/netbox/templates/core/background_task_list.html
similarity index 95%
rename from netbox/templates/core/background_tasks_list.html
rename to netbox/templates/core/background_task_list.html
index ca00335ad..cb7aeefe2 100644
--- a/netbox/templates/core/background_tasks_list.html
+++ b/netbox/templates/core/background_task_list.html
@@ -8,7 +8,7 @@
{# Breadcrumbs #}