14729 review changes

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('<a href=' + reverse(
@@ -63,15 +56,6 @@ class BackgroundTaskTable(BaseTable):
             args=[self.queue_index, value]) + '>' + value + '</a>'
         )
 
-    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
 

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,

netbox/templates/admin/index.html

@@ -14,11 +14,6 @@
                         <a href="{% url 'rq_home' %}">{% trans "Background Tasks" %}</a>
                     </th>
                 </tr>
-                <tr>
-                    <th>
-                        <a href="{% url 'plugins_list' %}">{% trans "Installed plugins" %}</a>
-                    </th>
-                </tr>
             </tbody>
         </table>
     </div>