Procházet zdrojové kódy

Fix add_preserved_filters for Django < 1.6

Denis K před 9 roky
rodič
revize
7ee3a89a5f
1 změnil soubory, kde provedl 7 přidání a 4 odebrání
  1. 7 4
      jet/templatetags/jet_tags.py

+ 7 - 4
jet/templatetags/jet_tags.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 from __future__ import unicode_literals
 from django import template
 from django import template
-from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse
 from django.db.models import OneToOneField
 from django.db.models import OneToOneField
 from django.forms import CheckboxInput, ModelChoiceField, Select, ModelMultipleChoiceField, SelectMultiple
 from django.forms import CheckboxInput, ModelChoiceField, Select, ModelMultipleChoiceField, SelectMultiple
@@ -210,9 +209,13 @@ def select2_lookups(field):
 @register.simple_tag(takes_context=True)
 @register.simple_tag(takes_context=True)
 def jet_add_preserved_filters(context, url, popup=False, to_field=None):
 def jet_add_preserved_filters(context, url, popup=False, to_field=None):
     try:
     try:
-        return add_preserved_filters(context, url, popup, to_field)
-    except TypeError:
-        return add_preserved_filters(context, url, popup)  # old django
+        from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
+        try:
+            return add_preserved_filters(context, url, popup, to_field)
+        except TypeError:
+            return add_preserved_filters(context, url, popup)  # old django
+    except ImportError:
+        return url
 
 
 
 
 @register.assignment_tag(takes_context=True)
 @register.assignment_tag(takes_context=True)