diff --git a/netbox/core/views.py b/netbox/core/views.py index d60b2fcff..c1663852a 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -275,7 +275,7 @@ class BackgroundQueueListView(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_queue_list.html', { + return render(request, 'core/rq_queue_list.html', { 'table': table, }) @@ -340,7 +340,7 @@ class BackgroundTaskListView(BaseTaskListView): 'status': status, }) - return render(request, 'core/background_task_list.html', { + return render(request, 'core/rq_task_list.html', { 'table': table, 'queue': queue, 'status': status, @@ -377,7 +377,7 @@ class WorkerListView(BaseTaskListView): 'queue': queue, }) - return render(request, 'core/worker_list.html', { + return render(request, 'core/rq_worker_list.html', { 'table': table, 'queue': queue, }) @@ -404,7 +404,7 @@ class BackgroundTaskDetailView(UserPassesTestMixin, View): except AttributeError: exc_info = None - return render(request, 'core/background_task.html', { + return render(request, 'core/rq_task.html', { 'queue': queue, 'job': job, 'queue_index': queue_index, @@ -551,7 +551,7 @@ class WorkerDetailView(UserPassesTestMixin, View): # Convert microseconds to milliseconds worker.total_working_time = worker.total_working_time / 1000 - return render(request, 'core/worker.html', { + return render(request, 'core/rq_worker.html', { 'worker': worker, 'job': worker.get_current_job(), 'total_working_time': worker.total_working_time * 1000, diff --git a/netbox/templates/core/background_task.html b/netbox/templates/core/background_task.html deleted file mode 100644 index 398cbaf24..000000000 --- a/netbox/templates/core/background_task.html +++ /dev/null @@ -1,113 +0,0 @@ -{% extends 'generic/object.html' %} -{% load i18n %} -{% load buttons %} -{% load helpers %} -{% load render_table from django_tables2 %} - -{% block breadcrumbs %} -
  • {% trans 'Background Tasks' %}
    • -
  • {{ queue.name }}
    • -{% endblock breadcrumbs %} - -{% block title %}{% trans "Job" %} {{ job.id }}{% endblock %} - -{% block object_identifier %}{% endblock %} - -{% block controls %} -
    - {% url 'core:background_task_delete' job_id=job.id as delete_url %} - {% include "buttons/delete.html" with url=delete_url %} - - {% if job.is_started %} - - {% trans "Stop" %} - - {% endif %} - {% if job.is_failed %} - - {% trans "Requeue" %} - - {% endif %} - {% if not job.is_queued and not job.is_failed %} - - {% trans "Enqueue" %} - - {% endif %} - -
    -{% endblock controls %} - -{% block tabs %} - -{% endblock tabs %} - -{% block content %} -
    -
    -
    -
    {% trans "Job" %}
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if dependency_id %} - - - - - {% endif %} - {% if exc_info %} - - - - - {% endif %} - -
    {% trans "Queue" %}{{ job.origin|placeholder }}
    {% trans "Timeout" %}{{ job.timeout|placeholder }}
    {% trans "Result TTL" %}{{ job.result_ttl|placeholder }}
    {% trans "Created" %}{{ job.created_at|annotated_date }}
    {% trans "Queued" %}{{ job.enqueued_at|annotated_date }}
    {% trans "Status" %}{{ job.get_status|placeholder }}
    {% trans "Callable" %}{{ object.get_type_display|placeholder }}
    {% trans "Meta" %}{{ job.meta|placeholder }}
    {% trans "Args" %}{{ jobs.args|placeholder }}
    {% trans "Kwargs" %}{{ job.kwargs|placeholder }}
    {% trans "Depends on" %}{{ dependency_id }}
    {% trans "Exception" %}
    {% if job.exc_info %}{{ job.exc_info|linebreaks }}{% endif %}
    -
    -
    -
    -
    -{% endblock content %} diff --git a/netbox/templates/core/background_task_delete.html b/netbox/templates/core/background_task_delete.html deleted file mode 100644 index b3067607b..000000000 --- a/netbox/templates/core/background_task_delete.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends 'generic/_base.html' %} -{% load helpers %} -{% load form_helpers %} -{% load i18n %} - -{% block title %} - {% trans "Delete" %} {{ object_name }}? -{% endblock %} - -{% block content %} -
    -
    -
    - {% include 'core/htmx/delete_form.html' %} -
    -
    -
    -{% endblock %} diff --git a/netbox/templates/core/background_queue_list.html b/netbox/templates/core/rq_queue_list.html similarity index 67% rename from netbox/templates/core/background_queue_list.html rename to netbox/templates/core/rq_queue_list.html index cdfb2a51f..44203ee25 100644 --- a/netbox/templates/core/background_queue_list.html +++ b/netbox/templates/core/rq_queue_list.html @@ -1,14 +1,17 @@ -{% extends 'generic/_base.html' %} -{% load helpers %} +{% extends 'generic/object_list.html' %} {% load i18n %} {% load render_table from django_tables2 %} -{% block title %}{% trans "Background Tasks" %}{% endblock %} +{% block title %}{% trans "Background Queues" %}{% endblock %} + +{% block controls %}{% endblock %} {% block tabs %} -