From d83274f16bffe27d89d1e777c3e8b1cf1ea57244 Mon Sep 17 00:00:00 2001
From: Daniel Ruiz <daniel-ruiz@users.noreply.github.com>
Date: Wed, 30 Jan 2019 12:16:06 +0100
Subject: [PATCH] Avoid loading admin_static in templates under Django>=1.10
 (#27)

---
 .../templates/rangefilter/date_filter.html    |  2 +-
 rangefilter/templatetags/__init__.py          |  0
 .../templatetags/static_or_admin_static.py    | 14 +++++++++++
 rangefilter/tests.py                          | 23 +++++++++++++++++++
 runtests.py                                   |  1 +
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 rangefilter/templatetags/__init__.py
 create mode 100644 rangefilter/templatetags/static_or_admin_static.py

diff --git a/rangefilter/templates/rangefilter/date_filter.html b/rangefilter/templates/rangefilter/date_filter.html
index 439e005..2041188 100644
--- a/rangefilter/templates/rangefilter/date_filter.html
+++ b/rangefilter/templates/rangefilter/date_filter.html
@@ -1,4 +1,4 @@
-{% load i18n admin_static %}
+{% load i18n static_or_admin_static %}
 <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
 <link rel="stylesheet" type="text/css" href="{% static 'admin/css/widgets.css' %}">
 <style>
diff --git a/rangefilter/templatetags/__init__.py b/rangefilter/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/rangefilter/templatetags/static_or_admin_static.py b/rangefilter/templatetags/static_or_admin_static.py
new file mode 100644
index 0000000..83e8235
--- /dev/null
+++ b/rangefilter/templatetags/static_or_admin_static.py
@@ -0,0 +1,14 @@
+import django
+from django.template import Library
+
+register = Library()
+
+
+@register.simple_tag()
+def static(path):
+    if django.VERSION[:2] >= (1, 10):
+        from django.templatetags.static import static as _static
+    else:
+        from django.contrib.admin.templatetags.admin_static import static as _static
+
+    return _static(path)
diff --git a/rangefilter/tests.py b/rangefilter/tests.py
index a9a65a4..e019779 100644
--- a/rangefilter/tests.py
+++ b/rangefilter/tests.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 
 import datetime
 
+from django.contrib.staticfiles.storage import staticfiles_storage
+
 try:
     import pytz
 except ImportError:
@@ -21,6 +23,7 @@ from django.contrib.auth.models import User
 from django.utils.encoding import force_text
 
 from .filter import DateRangeFilter, DateTimeRangeFilter
+from .templatetags import static_or_admin_static
 
 
 class MyModel(models.Model):
@@ -274,3 +277,23 @@ class DateTimeRangeFilterTestCase(TestCase):
         choice = select_by(filterspec.choices(changelist))
         self.assertEqual(choice['query_string'], '?')
         self.assertEqual(choice['system_name'], 'created-at')
+
+
+class StaticOrAdminStaticTestCase(TestCase):
+
+    @override_settings(STATIC_URL='/my_statics/')
+    def test_returns_static_path_to_asset_when_staticfiles_app_is_not_installed(self):
+        self.assertEqual(static_or_admin_static.static('admin/css/widgets.css'),
+                         '/my_statics/admin/css/widgets.css')
+
+    def test_returns_static_path_to_asset_when_staticfiles_app_is_installed(self):
+        with self.modify_settings(INSTALLED_APPS={
+            'append': 'django.contrib.staticfiles',
+        }):
+            old_url = staticfiles_storage.base_url
+            staticfiles_storage.base_url = '/test/'
+            try:
+                self.assertEqual(static_or_admin_static.static('admin/css/widgets.css'),
+                                 '/test/admin/css/widgets.css')
+            finally:
+                staticfiles_storage.base_url = old_url
diff --git a/runtests.py b/runtests.py
index cf971e9..449e233 100755
--- a/runtests.py
+++ b/runtests.py
@@ -23,6 +23,7 @@ settings.configure(
     TEST_RUNNER='django.test.runner.DiscoverRunner',
     USE_TZ=True,
     TIME_ZONE='UTC',
+    STATIC_URL='/static/',
 )
 
 django.setup()