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

14729 url fixup

Browse Source
This commit is contained in:
Arthur 2024-01-19 11:11:50 -08:00
parent dc825c1a20
commit 3e18fa997b
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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('<a href=' + reverse(
"core:background_tasks_job_detail",
"core:background_task",
args=[self.queue_index, value]) + '>' + value + '</a>'
)

6
netbox/core/urls.py
View File

@ -26,9 +26,9 @@ urlpatterns = (
path('jobs/<int:pk>/delete/', views.JobDeleteView.as_view(), name='job_delete'),
# Background Tasks
path('background-queues/', views.BackgroundQueuesListView.as_view(), name='background_tasks_list'),
path('background-queues/<int:queue_index>/', views.BackgroundTasksListView.as_view(), name='background_tasks_queues'),
path('background-tasks/<int:queue_index>/<str:job_id>/', views.BackgroundTaskDetailView.as_view(), name='background_tasks_job_detail'),
path('background-queues/', views.BackgroundQueueListView.as_view(), name='background_queue_list'),
path('background-queues/<int:queue_index>/', views.BackgroundTaskListView.as_view(), name='background_task_list'),
path('background-tasks/<int:queue_index>/<str:job_id>/', views.BackgroundTaskDetailView.as_view(), name='background_task'),
# Config revisions
path('config-revisions/', views.ConfigRevisionListView.as_view(), name='configrevision_list'),

8
netbox/core/views.py
View File

@ -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,
})

2
netbox/netbox/navigation/menu.py
View File

@ -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'],
),

0
netbox/templates/core/background_queues_list.html → netbox/templates/core/background_queue_list.html
View File

4
netbox/templates/core/background_task.html
View File

@ -4,8 +4,8 @@
{% load render_table from django_tables2 %}
{% block breadcrumbs %}
<li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
<li class="breadcrumb-item"><a href="{% url 'core:background_tasks_queues' queue_index=queue_index %}">{{ queue.name }}</a></li>
<li class="breadcrumb-item"><a href="{% url 'core:background_queue_list' %}">{% trans 'Background Tasks' %}</a></li>
<li class="breadcrumb-item"><a href="{% url 'core:background_task_list' queue_index=queue_index %}">{{ queue.name }}</a></li>
{% endblock breadcrumbs %}
{% block title %}{% trans "Job" %} {{ job.id }}{% endblock %}

2
netbox/templates/core/background_tasks_list.html → netbox/templates/core/background_task_list.html
View File

@ -8,7 +8,7 @@
{# Breadcrumbs #}
<nav class="breadcrumb-container px-3" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
<li class="breadcrumb-item"><a href="{% url 'core:background_queue_list' %}">{% trans 'Background Tasks' %}</a></li>
</ol>
</nav>
</div>