Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with RQ 2.0 #675

Merged
merged 18 commits into from
Oct 28, 2024
+696 −144
Merged

Compatibility with RQ 2.0 #675

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ffa550b
rqworker command can now run
selwin Sep 16, 2024
b90d42a
Merge branch 'master' of github.com:rq/django-rq into rq-v2
selwin Sep 30, 2024
b02a724
Make job_detail.html display better
selwin Oct 1, 2024
7df99c2
Properly show currently running executions
selwin Oct 1, 2024
0981474
Minor job detail cleanup
selwin Oct 3, 2024
78efadd
Merge branch 'master' into rq-v2
selwin Oct 6, 2024
555b013
Fixed a few tests
selwin Oct 6, 2024
3232841
Made stop job command work again
selwin Oct 6, 2024
baad70c
Fixed tests
selwin Oct 6, 2024
40f109f
Failed job registry should show jobs in reverse chronological order.
selwin Oct 12, 2024
9722a96
Make failed jobs sortable
selwin Oct 19, 2024
aa55e5a
Merge branch 'master' into rq-v2
selwin Oct 19, 2024
5240461
Make finished jobs sortable
selwin Oct 19, 2024
087de5f
Require RQ >= 2
selwin Oct 28, 2024
8254667
Temporarily skip rq-scheduler tests
selwin Oct 28, 2024
ddb192a
Comment out scheduler test
selwin Oct 28, 2024
553ff96
Comment out invalid test
selwin Oct 28, 2024
38eb2c3
Updated changelog
selwin Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make finished jobs sortable
  • Loading branch information
@selwin
selwin committed Oct 19, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
miri64 Martine Lenders
GPG key ID: 2134D77A5336DD80
Expired
Verified
Learn about vigilant mode
commit 52404612ae0fbfce69cacb7ed43fd1e35f43cd5f
2 changes: 1 addition & 1 deletion django_rq/templates/django_rq/failed_jobs.html
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

{% load static jquery_path django_rq %}

{% block title %}{{ job_status }} Jobs in {{ queue.name }} {{ block.super }}{% endblock %}
{% block title %}Failed Jobs in {{ queue.name }} {{ block.super }}{% endblock %}

{% block extrastyle %}
{{ block.super }}
170 changes: 170 additions & 0 deletions django_rq/templates/django_rq/finished_jobs.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{% extends "admin/base_site.html" %}

{% load static jquery_path django_rq %}

{% block title %}Finished Jobs in {{ queue.name }} {{ block.super }}{% endblock %}

{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}">
{% endblock %}

{% block extrahead %}
{{ block.super }}
<script type="text/javascript" src="{% get_jquery_path as jquery_path %}{% static jquery_path %}"></script>
<script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/actions.js" %}"></script>
<script type="text/javascript">
(function($) {
$(document).ready(function($) {
$("tr input.action-select").actions();
});
})(django.jQuery);
</script>
{% endblock %}


{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="{% url 'admin:index' %}">Home</a> &rsaquo;
<a href="{% url 'rq_home' %}">Django RQ</a> &rsaquo;
<a href="{% url 'rq_jobs' queue_index %}">{{ queue.name }}</a>
</div>
{% endblock %}

{% block content_title %}<h1>{{ job_status }} jobs in {{ queue.name }}</h1>{% endblock %}

{% block content %}

<div id="content-main">
<ul class="object-tools">
<li><a href="{% url 'rq_requeue_all' queue_index %}" class="requeuelink">Requeue All</a></li>
<li><a href="{% url 'rq_delete_failed_jobs' queue_index %}" class="requeuelink">Delete All</a></li>
</ul>
<div class="module" id="changelist">
<div class="changelist-form-container">
<form id="changelist-form" action="{% url 'rq_confirm_action' queue_index %}" method="post">
{% csrf_token %}
<div class="actions">
<label>Actions:
<select name="action" required>
<option value="" selected>---------</option>
<option value="delete">Delete</option>
<option value="requeue">Requeue</option>
</select>
</label>
<button type="submit" class="button" title="Execute selected action" name="index" value="0">Go</button>
</div>
<div class="results">
<table id="result_list">
<thead>
<tr>
<th scope="col" class="action-checkbox-column">
<div class="text">
<span><input type="checkbox" id="action-toggle"></span>
</div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable">
<div class='text'><span>ID</span></div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable">
<div class='text'><span>Created</span></div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable">
<div class='text'><span>Enqueued</span></div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable sorted {{ sort_direction }}">
<div class="sortoptions">
{% if sort_direction == 'ascending' %}
<a href="?desc=1" class="toggle ascending" title="Toggle sorting"></a>
{% else %}
<a href="?desc=0" class="toggle descending" title="Toggle sorting"></a>
{% endif %}
</div>
<div class='text'>
{% if sort_direction == 'ascending' %}
<a href="?desc=1">
{% else %}
<a href="?desc=0">
{% endif %}
Ended
</a>
</div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable">
<div class='text'><span>Status</span></div>
<div class="clear"></div>
</th>
<th scope="col" class="sortable">
<div class='text'><span>Callable</span></div>
<div class="clear"></div>
</th>
{% block extra_columns %}
{% endblock extra_columns %}
</tr>
</thead>
<tbody>
{% for job in jobs %}
<tr>
<td class="action-checkbox">
<input class="action-select" name="_selected_action" type="checkbox" value="{{ job.id }}">
</td>
<th>
<a href="{% url 'rq_job_detail' queue_index job.id %}">
{{ job.id }}
</a>
</th>
<td>
{% if job.created_at %}
{{ job.created_at|to_localtime|date:"Y-m-d, H:i:s" }}
{% endif %}
</td>
{% if job_status == 'Scheduled' %}
<td>
{% if job.scheduled_at %}
{{ job.scheduled_at|to_localtime|date:"Y-m-d, H:i:s" }}
{% endif %}
</td>
{% endif %}
<td>
{% if job.enqueued_at %}
{{ job.enqueued_at|to_localtime|date:"Y-m-d, H:i:s" }}
{% endif %}
</td>
<td>
{% if job.ended_at %}
{{ job.ended_at|to_localtime|date:"Y-m-d, H:i:s" }}
{% endif %}
</td>
<td>{{ job.get_status.value }}</td>
<td>{{ job|show_func_name }}</td>
{% block extra_columns_values %}
{% endblock extra_columns_values %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
<p class="paginator">
{% for p in page_range %}
{% if p == page %}
<span class="this-page">{{ p }}</span>
{% elif forloop.last %}
<a href="?page={{ p }}" class="end">{{ p }}</a>
{% else %}
<a href="?page={{ p }}">{{ p }}</a>
{% endif %}
{% endfor %}
{{ num_jobs }} jobs
</p>
</form>
</div>
</div>
</div>

{% endblock %}
13 changes: 9 additions & 4 deletions django_rq/views.py
View file
Original file line number Diff line number Diff line change
@@ -92,13 +92,19 @@ def finished_jobs(request, queue_index):
items_per_page = 100
num_jobs = len(registry)
page = int(request.GET.get('page', 1))

if request.GET.get('desc', '1') == '1':
sort_direction = 'descending'
else:
sort_direction = 'ascending'

jobs = []

if num_jobs > 0:
last_page = int(ceil(num_jobs / items_per_page))
page_range = list(range(1, last_page + 1))
offset = items_per_page * (page - 1)
job_ids = registry.get_job_ids(offset, offset + items_per_page - 1)
job_ids = registry.get_job_ids(offset, offset + items_per_page - 1, desc=sort_direction == 'descending')
jobs = get_jobs(queue, job_ids, registry)

else:
@@ -112,9 +118,9 @@ def finished_jobs(request, queue_index):
'num_jobs': num_jobs,
'page': page,
'page_range': page_range,
'job_status': 'Finished',
'sort_direction': sort_direction,
}
return render(request, 'django_rq/jobs.html', context_data)
return render(request, 'django_rq/finished_jobs.html', context_data)


@never_cache
@@ -154,7 +160,6 @@ def failed_jobs(request, queue_index):
'num_jobs': num_jobs,
'page': page,
'page_range': page_range,
'job_status': 'Failed',
'sort_direction': sort_direction,
}
return render(request, 'django_rq/failed_jobs.html', context_data)