From 4215f72452045ef54ccf8aaf8b45c2eacba610ef Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 19 Jan 2024 09:59:23 -0800 Subject: [PATCH] 14729 review changes --- netbox/core/tables/tasks.py | 18 +----------------- netbox/core/views.py | 11 +++++------ netbox/templates/admin/index.html | 5 ----- ..._tasks.html => background_queues_list.html} | 0 ...und_tasks_job.html => background_task.html} | 0 ...s_queue.html => background_tasks_list.html} | 0 6 files changed, 6 insertions(+), 28 deletions(-) rename netbox/templates/core/{background_tasks.html => background_queues_list.html} (100%) rename netbox/templates/core/{background_tasks_job.html => background_task.html} (100%) rename netbox/templates/core/{background_tasks_queue.html => background_tasks_list.html} (100%) diff --git a/netbox/core/tables/tasks.py b/netbox/core/tables/tasks.py index 8e0f740a2..9af1bee25 100644 --- a/netbox/core/tables/tasks.py +++ b/netbox/core/tables/tasks.py @@ -4,9 +4,8 @@ from django.urls import reverse from django.utils.html import mark_safe from django.utils.translation import gettext_lazy as _ -from netbox.tables import BaseTable, NetBoxTable, columns +from netbox.tables import BaseTable from utilities.templatetags.helpers import annotated_date -from ..models import Job class BackgroundQueueTable(BaseTable): @@ -32,9 +31,6 @@ class BackgroundQueueTable(BaseTable): default_columns = ( 'name', 'jobs', 'started_jobs', 'deferred_jobs', 'finished_jobs', 'failed_jobs', 'scheduled_jobs', ) - attrs = { - 'class': 'table table-hover object-list', - } class BackgroundTaskTable(BaseTable): @@ -53,9 +49,6 @@ class BackgroundTaskTable(BaseTable): default_columns = ( 'id', 'created_at', 'enqueued_at', 'ended_at', 'status', 'callable', ) - attrs = { - 'class': 'table table-hover object-list', - } def render_id(self, value, record): return mark_safe('' + value + '' ) - def render_created_at(self, value, record): - return annotated_date(value) - - def render_enqueued_at(self, value, record): - return annotated_date(value) - - def render_ended_at(self, value, record): - return annotated_date(value) - def render_status(self, value, record): return record.get_status diff --git a/netbox/core/views.py b/netbox/core/views.py index aea1a1887..45f49ef80 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -4,6 +4,7 @@ from django.contrib import messages from django.contrib.auth.mixins import UserPassesTestMixin from django.core.cache import cache from django.http import HttpResponseForbidden, Http404 +from django.utils.translation import gettext_lazy as _ from django_rq.queues import get_queue_by_index from django_rq.utils import get_scheduler_statistics, get_statistics from django.shortcuts import get_object_or_404, redirect, render @@ -253,7 +254,7 @@ 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_tasks.html', { + return render(request, 'core/background_queues_list.html', { 'table': table, }) @@ -264,7 +265,6 @@ class BackgroundTasksListView(UserPassesTestMixin, View): return self.request.user.is_staff def get(self, request, queue_index): - queue_index = int(queue_index) queue = get_queue_by_index(queue_index) if queue.count > 0: @@ -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_queue.html', { + return render(request, 'core/background_tasks_list.html', { 'table': table, 'queue': queue, }) @@ -286,13 +286,12 @@ class BackgroundTaskDetailView(UserPassesTestMixin, View): return self.request.user.is_staff def get(self, request, queue_index, job_id): - queue_index = int(queue_index) queue = get_queue_by_index(queue_index) try: job = RQ_Job.fetch(job_id, connection=queue.connection, serializer=queue.serializer) except NoSuchJobError: - raise Http404("Couldn't find job with this ID: %s" % job_id) + raise Http404(_("Job {job_id} not found").format(job_id=job_id)) try: job.func_name @@ -300,7 +299,7 @@ class BackgroundTaskDetailView(UserPassesTestMixin, View): except Exception: data_is_valid = False - return render(request, 'core/background_tasks_job.html', { + return render(request, 'core/background_task.html', { 'queue': queue, 'job': job, 'queue_index': queue_index, diff --git a/netbox/templates/admin/index.html b/netbox/templates/admin/index.html index b96a872b0..e72b5a78d 100644 --- a/netbox/templates/admin/index.html +++ b/netbox/templates/admin/index.html @@ -14,11 +14,6 @@ {% trans "Background Tasks" %} - - - {% trans "Installed plugins" %} - - diff --git a/netbox/templates/core/background_tasks.html b/netbox/templates/core/background_queues_list.html similarity index 100% rename from netbox/templates/core/background_tasks.html rename to netbox/templates/core/background_queues_list.html diff --git a/netbox/templates/core/background_tasks_job.html b/netbox/templates/core/background_task.html similarity index 100% rename from netbox/templates/core/background_tasks_job.html rename to netbox/templates/core/background_task.html diff --git a/netbox/templates/core/background_tasks_queue.html b/netbox/templates/core/background_tasks_list.html similarity index 100% rename from netbox/templates/core/background_tasks_queue.html rename to netbox/templates/core/background_tasks_list.html