Merge pull request sshwsfc#408 from idalin/master

fix django version compare bug
birui · Jun 7, 2017 · 0f15749 · 0f15749
2 parents 7aec57c + 3411e9c
commit 0f15749
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/.vscode/temp.sql b/.vscode/temp.sql
diff --git a/xadmin/plugins/xversion.py b/xadmin/plugins/xversion.py
@@ -204,7 +204,7 @@ def get(self, request, *args, **kwargs):
 
         return TemplateResponse(
             request, self.recover_list_template or self.get_template_list(
-                "views/recover_list.html"),
+                "views/recover_list.html"), 
             context)
 
 

diff --git a/xadmin/util.py b/xadmin/util.py
@@ -35,7 +35,7 @@
 except ImportError:
     from django.utils.timezone import localtime as tz_localtime
 
-if version[1] < 11:
+if django.VERSION < (1, 11):
     DJANGO_11 = False
 else:
     DJANGO_11 = True

diff --git a/xadmin/views/base.py b/xadmin/views/base.py
@@ -253,7 +253,7 @@ def __init__(self, request, *args, **kwargs):
         self.request = request
         self.request_method = request.method.lower()
         self.user = request.user
-
+        
         self.base_plugins = [p(self) for p in getattr(self,
                                                       "plugin_classes", [])]