Compatible for Django 3.x (Test for 3.2.15)

README.rst

@@ -6,6 +6,30 @@ Xadmin |Build Status|
 
 Drop-in replacement of Django admin comes with lots of goodies, fully extensible with plugin support, pretty UI based on Twitter Bootstrap.
 
+Xadmin-Django3
+--------------
+- Tips: 这个项目合并了原项目的#706和#716 PR请求，并做了部分修改适应Django3
+- 在django-3.2.15上测试暂无问题
+- 参考:  
+- https://github.com/sshwsfc/xadmin/pull/706/files
+- https://github.com/sshwsfc/xadmin/pull/716/files  
+- https://blog.csdn.net/weixin_43865334/article/details/115071848  
+
+安装以下两个依赖：
+
+.. code:: bash   
+
+    pip install requests
+
+    pip install cryptography
+
+使用pip安装这个分支的xadmin：
+
+.. code:: bash   
+
+    pip install https://github.com/SzLeaves/xadmin-django3/archive/refs/heads/master.zip
+
+
 Live Demo
 ---------
 

demo_app/app/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import Group
 from django.conf import settings
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 
 AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 

requirements.txt

@@ -2,7 +2,7 @@ django>=1.9.0
 django-crispy-forms>=1.6.0
 django-import-export>=0.5.1
 django-reversion>=2.0.0
-django-formtools==1.0
+django-formtools==2.2
 future==0.15.2
 httplib2==0.9.2
 six==1.10.0

tests/xtests/site/apps.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 #coding:utf-8
 import sys
-from django.utils import six
+import six
+
 if six.PY2 and sys.getdefaultencoding()=='ascii':
     import imp
     imp.reload(sys)

tests/xtests/view_base/apps.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 #coding:utf-8
 import sys
-from django.utils import six
+import six
+
 if six.PY2 and sys.getdefaultencoding()=='ascii':
     import imp
     imp.reload(sys)

xadmin/filters.py

@@ -6,21 +6,21 @@
 from django.utils import timezone
 from django.template.loader import get_template
 from django.template.context import Context
-from django.utils import six
+import six
 from django.utils.safestring import mark_safe
-from django.utils.html import escape,format_html
+from django.utils.html import escape, format_html
 from django.utils.text import Truncator
 from django.core.cache import cache, caches
 
 from xadmin.views.list import EMPTY_CHANGELIST_VALUE
-from xadmin.util import is_related_field,is_related_field2
+from xadmin.util import is_related_field, is_related_field2
 import datetime
 
 FILTER_PREFIX = '_p_'
 SEARCH_VAR = '_q_'
 
 from .util import (get_model_from_relation,
-    reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value)
+                   reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value)
 
 
 class BaseFilter(object):
@@ -125,9 +125,9 @@ def __init__(self, field, request, params, model, admin_view, field_path):
                 self.context_params["%s_val" % name] = ''
 
         arr = map(
-                lambda kv: setattr(self, 'lookup_' + kv[0], kv[1]),
-                self.context_params.items()
-                )
+            lambda kv: setattr(self, 'lookup_' + kv[0], kv[1]),
+            self.context_params.items()
+        )
         if six.PY3:
             list(arr)
 
@@ -169,27 +169,27 @@ def choices(self):
                 ('', _('All')),
                 ('1', _('Yes')),
                 ('0', _('No')),
-                ):
+        ):
             yield {
-                    'selected': (
-                            self.lookup_exact_val == lookup
-                            and not self.lookup_isnull_val
-                            ),
-                    'query_string': self.query_string(
-                            {self.lookup_exact_name: lookup},
-                            [self.lookup_isnull_name],
-                            ),
-                    'display': title,
-                    }
+                'selected': (
+                    self.lookup_exact_val == lookup
+                    and not self.lookup_isnull_val
+                ),
+                'query_string': self.query_string(
+                    {self.lookup_exact_name: lookup},
+                    [self.lookup_isnull_name],
+                ),
+                'display': title,
+            }
         if isinstance(self.field, models.NullBooleanField):
             yield {
-                    'selected': self.lookup_isnull_val == 'True',
-                    'query_string': self.query_string(
-                                {self.lookup_isnull_name: 'True'},
-                                [self.lookup_exact_name],
-                                ),
-                    'display': _('Unknown'),
-                    }
+                'selected': self.lookup_isnull_val == 'True',
+                'query_string': self.query_string(
+                    {self.lookup_isnull_name: 'True'},
+                    [self.lookup_exact_name],
+                ),
+                'display': _('Unknown'),
+            }
 
 
 @manager.register
@@ -202,7 +202,7 @@ def test(cls, field, request, params, model, admin_view, field_path):
 
     def choices(self):
         yield {
-            'selected': self.lookup_exact_val is '',
+            'selected': self.lookup_exact_val == '',
             'query_string': self.query_string({}, [self.lookup_exact_name]),
             'display': _('All')
         }
@@ -222,10 +222,10 @@ class TextFieldListFilter(FieldFilter):
     @classmethod
     def test(cls, field, request, params, model, admin_view, field_path):
         return (
-                isinstance(field, models.CharField)
-                and field.max_length > 20
-                or isinstance(field, models.TextField)
-               )
+            isinstance(field, models.CharField)
+            and field.max_length > 20
+            or isinstance(field, models.TextField)
+        )
 
 
 @manager.register
@@ -320,7 +320,7 @@ def choices(self):
             yield {
                 'selected': self.date_params == param_dict,
                 'query_string': self.query_string(
-                param_dict, [FILTER_PREFIX + self.field_generic]),
+                    param_dict, [FILTER_PREFIX + self.field_generic]),
                 'display': title,
             }
 
@@ -339,12 +339,12 @@ def test(cls, field, request, params, model, admin_view, field_path):
 
     def __init__(self, field, request, params, model, model_admin, field_path):
         other_model = get_model_from_relation(field)
-        if hasattr(field, 'rel'):
-            rel_name = field.rel.get_related_field().name
+        if hasattr(field, 'remote_field'):
+            rel_name = field.remote_field.get_related_field().name
         else:
             rel_name = other_model._meta.pk.name
 
-        self.lookup_formats = {'in': '%%s__%s__in' % rel_name,'exact': '%%s__%s__exact' % rel_name}
+        self.lookup_formats = {'in': '%%s__%s__in' % rel_name, 'exact': '%%s__%s__exact' % rel_name}
         super(RelatedFieldSearchFilter, self).__init__(
             field, request, params, model, model_admin, field_path)
 
@@ -360,9 +360,9 @@ def __init__(self, field, request, params, model, model_admin, field_path):
             other_model._meta.app_label, other_model._meta.model_name))
         self.label = self.label_for_value(other_model, rel_name, self.lookup_exact_val) if self.lookup_exact_val else ""
         self.choices = '?'
-        if field.rel.limit_choices_to:
-            for i in list(field.rel.limit_choices_to):
-                self.choices += "&_p_%s=%s" % (i, field.rel.limit_choices_to[i])
+        if field.remote_field.limit_choices_to:
+            for i in list(field.remote_field.limit_choices_to):
+                self.choices += "&_p_%s=%s" % (i, field.remote_field.limit_choices_to[i])
             self.choices = format_html(self.choices)
 
     def label_for_value(self, other_model, rel_name, value):
@@ -390,12 +390,12 @@ def test(cls, field, request, params, model, admin_view, field_path):
 
     def __init__(self, field, request, params, model, model_admin, field_path):
         other_model = get_model_from_relation(field)
-        if hasattr(field, 'rel'):
-            rel_name = field.rel.get_related_field().name
+        if hasattr(field, 'remote_field'):
+            rel_name = field.remote_field.get_related_field().name
         else:
             rel_name = other_model._meta.pk.name
 
-        self.lookup_formats = {'in': '%%s__%s__in' % rel_name,'exact': '%%s__%s__exact' %
+        self.lookup_formats = {'in': '%%s__%s__in' % rel_name, 'exact': '%%s__%s__exact' %
                                rel_name, 'isnull': '%s__isnull'}
         self.lookup_choices = field.get_choices(include_blank=False)
         super(RelatedFieldListFilter, self).__init__(
@@ -409,7 +409,7 @@ def __init__(self, field, request, params, model, model_admin, field_path):
 
     def has_output(self):
         if (is_related_field(self.field)
-                and self.field.field.null or hasattr(self.field, 'rel')
+                and self.field.field.null or hasattr(self.field, 'remote_field')
                 and self.field.null):
             extra = 1
         else:
@@ -435,7 +435,7 @@ def choices(self):
                 'display': val,
             }
         if (is_related_field(self.field)
-                and self.field.field.null or hasattr(self.field, 'rel')
+                and self.field.field.null or hasattr(self.field, 'remote_field')
                 and self.field.null):
             yield {
                 'selected': bool(self.lookup_isnull_val),
@@ -445,81 +445,83 @@ def choices(self):
                 'display': EMPTY_CHANGELIST_VALUE,
             }
 
+
 @manager.register
 class MultiSelectFieldListFilter(ListFieldFilter):
     """ Delegates the filter to the default filter and ors the results of each
-     
+
     Lists the distinct values of each field as a checkbox
     Uses the default spec for each 
-     
+
     """
     template = 'xadmin/filters/checklist.html'
     lookup_formats = {'in': '%s__in'}
-    cache_config = {'enabled':False,'key':'quickfilter_%s','timeout':3600,'cache':'default'}
- 
+    cache_config = {'enabled': False, 'key': 'quickfilter_%s', 'timeout': 3600, 'cache': 'default'}
+
     @classmethod
     def test(cls, field, request, params, model, admin_view, field_path):
         return True
- 
+
     def get_cached_choices(self):
         if not self.cache_config['enabled']:
             return None
         c = caches(self.cache_config['cache'])
-        return c.get(self.cache_config['key']%self.field_path)
-    
-    def set_cached_choices(self,choices):
+        return c.get(self.cache_config['key'] % self.field_path)
+
+    def set_cached_choices(self, choices):
         if not self.cache_config['enabled']:
             return
         c = caches(self.cache_config['cache'])
-        return c.set(self.cache_config['key']%self.field_path,choices)
-    
-    def __init__(self, field, request, params, model, model_admin, field_path,field_order_by=None,field_limit=None,sort_key=None,cache_config=None):
-        super(MultiSelectFieldListFilter,self).__init__(field, request, params, model, model_admin, field_path)
-        
+        return c.set(self.cache_config['key'] % self.field_path, choices)
+
+    def __init__(self, field, request, params, model, model_admin, field_path, field_order_by=None, field_limit=None, sort_key=None, cache_config=None):
+        super(MultiSelectFieldListFilter, self).__init__(field, request, params, model, model_admin, field_path)
+
         # Check for it in the cachce
-        if cache_config is not None and type(cache_config)==dict:
+        if cache_config is not None and type(cache_config) == dict:
             self.cache_config.update(cache_config)
-        
+
         if self.cache_config['enabled']:
             self.field_path = field_path
             choices = self.get_cached_choices()
             if choices:
                 self.lookup_choices = choices
                 return
-            
+
         # Else rebuild it
-        queryset = self.admin_view.queryset().exclude(**{"%s__isnull"%field_path:True}).values_list(field_path, flat=True).distinct() 
+        queryset = self.admin_view.queryset().exclude(**{"%s__isnull" % field_path: True}).values_list(field_path, flat=True).distinct()
         #queryset = self.admin_view.queryset().distinct(field_path).exclude(**{"%s__isnull"%field_path:True})
-        
+
         if field_order_by is not None:
             # Do a subquery to order the distinct set
             queryset = self.admin_view.queryset().filter(id__in=queryset).order_by(field_order_by)
-            
-        if field_limit is not None and type(field_limit)==int and queryset.count()>field_limit:
+
+        if field_limit is not None and type(field_limit) == int and queryset.count() > field_limit:
             queryset = queryset[:field_limit]
-        
-        self.lookup_choices = [str(it) for it in queryset.values_list(field_path,flat=True) if str(it).strip()!=""]
+
+        self.lookup_choices = [str(it) for it in queryset.values_list(field_path, flat=True) if str(it).strip() != ""]
         if sort_key is not None:
-            self.lookup_choices = sorted(self.lookup_choices,key=sort_key)
-        
+            self.lookup_choices = sorted(self.lookup_choices, key=sort_key)
+
         if self.cache_config['enabled']:
-            self.set_cached_choices(self.lookup_choices) 
+            self.set_cached_choices(self.lookup_choices)
 
     def choices(self):
-        self.lookup_in_val = (type(self.lookup_in_val) in (tuple,list)) and self.lookup_in_val or list(self.lookup_in_val)
+        self.lookup_in_val = (type(self.lookup_in_val) in (tuple, list)) and self.lookup_in_val or list(self.lookup_in_val)
         yield {
             'selected': len(self.lookup_in_val) == 0,
-            'query_string': self.query_string({},[self.lookup_in_name]),
+            'query_string': self.query_string({}, [self.lookup_in_name]),
             'display': _('All'),
         }
         for val in self.lookup_choices:
             yield {
                 'selected': smart_text(val) in self.lookup_in_val,
-                'query_string': self.query_string({self.lookup_in_name: ",".join([val]+self.lookup_in_val),}),
-                'remove_query_string': self.query_string({self.lookup_in_name: ",".join([v for v in self.lookup_in_val if v != val]),}),
+                'query_string': self.query_string({self.lookup_in_name: ",".join([val] + self.lookup_in_val), }),
+                'remove_query_string': self.query_string({self.lookup_in_name: ",".join([v for v in self.lookup_in_val if v != val]), }),
                 'display': val,
             }
 
+
 @manager.register
 class AllValuesFieldListFilter(ListFieldFilter):
     lookup_formats = {'exact': '%s__exact', 'isnull': '%s__isnull'}
@@ -546,7 +548,7 @@ def __init__(self, field, request, params, model, admin_view, field_path):
 
     def choices(self):
         yield {
-            'selected': (self.lookup_exact_val is '' and self.lookup_isnull_val is ''),
+            'selected': (self.lookup_exact_val == '' and self.lookup_isnull_val == ''),
             'query_string': self.query_string({}, [self.lookup_exact_name, self.lookup_isnull_name]),
             'display': _('All'),
         }