diff --git a/setup.py b/setup.py index 2545f61..177e8da 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ platforms='any', install_requires=[ 'django-suit >=0.2.15, <0.3.0', - 'django-rq >=0.8.0, <0.9.0', + 'django-rq >=2.0.2, <3.0.0', ], classifiers=[ 'Development Status :: 5 - Production/Stable', diff --git a/suit_rq/__init__.py b/suit_rq/__init__.py index 2862504..ff8bc66 100644 --- a/suit_rq/__init__.py +++ b/suit_rq/__init__.py @@ -1,2 +1,2 @@ -__version__ = '1.0.1' +__version__ = '2.0.0' default_app_config = 'suit_rq.apps.SuitRQConfig' diff --git a/suit_rq/templates/django_rq/job_detail.html b/suit_rq/templates/django_rq/job_detail.html index 36f4af2..516bb46 100644 --- a/suit_rq/templates/django_rq/job_detail.html +++ b/suit_rq/templates/django_rq/job_detail.html @@ -21,7 +21,7 @@ {% endblock %} -{% block content_title %}

Job Info

{% endblock %} +{% block content_title %}

Job {{ job.id }}

{% endblock %} {% block content %} @@ -63,6 +63,16 @@ Callable: {{ job.func_name }} + + Depends On: + + {% if job.dependency %} + + {{ job.dependency.id }} + + {% endif %} + + {% if job.args %} Args: @@ -105,6 +115,12 @@ {% endif %} Delete + {% if job.is_queued and not job.is_failed %} +
+ {% csrf_token %} + +
+ {% endif %} diff --git a/suit_rq/templates/django_rq/jobs.html b/suit_rq/templates/django_rq/jobs.html index 102f345..2a53d40 100644 --- a/suit_rq/templates/django_rq/jobs.html +++ b/suit_rq/templates/django_rq/jobs.html @@ -1,12 +1,9 @@ {% extends "admin/base_site.html" %} -{% load admin_static %} +{% load static %} {% block extrahead %} {{ block.super }} - - -