Move the jquery path logic into a template tag.

Author: philippbosch

django_rq/templates/django_rq/jobs.html

@@ -1,6 +1,6 @@
 {% extends "admin/base_site.html" %}
 
-{% load admin_static %}
+{% load admin_static jquery_path %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -9,7 +9,7 @@
 
 {% block extrahead %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static jquery_path %}"></script>
+    <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">

django_rq/templatetags/__init__.py

@@ -0,0 +1,20 @@
+from distutils.version import LooseVersion
+from django import template
+from django.utils.version import get_version
+
+
+register = template.Library()
+
+if LooseVersion(get_version()) >= LooseVersion('1.9'):
+    JQUERY_PATH = 'admin/js/vendor/jquery/jquery.js'
+
+    # `assignment_tag` is deprecated as of 1.9, `simple_tag` should be used
+    tag_decorator = register.simple_tag
+else:
+    JQUERY_PATH = 'admin/js/jquery.js'
+    tag_decorator = register.assignment_tag
+
+
+@register.assignment_tag
+def get_jquery_path():
+    return JQUERY_PATH

django_rq/templatetags/jquery_path.py

@@ -1,13 +1,11 @@
 from __future__ import division
 
-from distutils.version import StrictVersion
 from math import ceil
 
 from django.contrib import messages
 from django.contrib.admin.views.decorators import staff_member_required
 from django.http import Http404
 from django.shortcuts import redirect, render
-from django.utils.version import get_main_version
 
 from redis.exceptions import ResponseError
 from rq import requeue_job, Worker
@@ -20,12 +18,6 @@
 from .settings import QUEUES_LIST
 
 
-if StrictVersion(get_main_version()) >= StrictVersion('1.9'):
-    JQUERY_PATH = 'admin/js/vendor/jquery/jquery.js'
-else:
-    JQUERY_PATH = 'admin/js/jquery.js'
-
-
 @staff_member_required
 def stats(request):
     queues = []
@@ -92,7 +84,6 @@ def jobs(request, queue_index):
         'page': page,
         'page_range': page_range,
         'job_status': 'Queued',
-        'jquery_path': JQUERY_PATH,
     }
     return render(request, 'django_rq/jobs.html', context_data)
 
@@ -132,7 +123,6 @@ def finished_jobs(request, queue_index):
         'page': page,
         'page_range': page_range,
         'job_status': 'Finished',
-        'jquery_path': JQUERY_PATH,
     }
     return render(request, 'django_rq/jobs.html', context_data)
 
@@ -172,7 +162,6 @@ def started_jobs(request, queue_index):
         'page': page,
         'page_range': page_range,
         'job_status': 'Started',
-        'jquery_path': JQUERY_PATH,
     }
     return render(request, 'django_rq/jobs.html', context_data)
 
@@ -212,7 +201,6 @@ def deferred_jobs(request, queue_index):
         'page': page,
         'page_range': page_range,
         'job_status': 'Deferred',
-        'jquery_path': JQUERY_PATH,
     }
     return render(request, 'django_rq/jobs.html', context_data)