适配Django2.1

Author: flyskyer

xadmin/plugins/filters.py

@@ -8,7 +8,7 @@
 from django.db import models
 from django.db.models.fields import FieldDoesNotExist
 from django.db.models.constants import LOOKUP_SEP
-from django.db.models.sql.constants import QUERY_TERMS
+# from django.db.models.sql.constants import QUERY_TERMS
 from django.template import loader
 from django.utils import six
 from django.utils.encoding import smart_str
@@ -45,8 +45,8 @@ def lookup_allowed(self, lookup, value):
 
         # Last term in lookup is a query term (__exact, __startswith etc)
         # This term can be ignored.
-        if len(parts) > 1 and parts[-1] in QUERY_TERMS:
-            parts.pop()
+        # if len(parts) > 1 and parts[-1] in QUERY_TERMS:
+        #     parts.pop()
 
         # Special case -- foo__id__exact and foo__id queries are implied
         # if foo has been specificially included in the lookup list; so

xadmin/plugins/images.py

@@ -42,7 +42,7 @@ class AdminImageWidget(forms.FileInput):
     def __init__(self, attrs={}):
         super(AdminImageWidget, self).__init__(attrs)
 
-    def render(self, name, value, attrs=None):
+    def render(self, name, value, attrs=None, renderer=None):
         output = []
         if value and hasattr(value, "url"):
             label = self.attrs.get('label', name)

xadmin/plugins/inline.py

@@ -227,10 +227,11 @@ def instance_form(self, **kwargs):
                 form.readonly_fields = []
                 inst = form.save(commit=False)
                 if inst:
+                    meta_field_names = [field.name for field in inst._meta.get_fields()]
                     for readonly_field in readonly_fields:
                         value = None
                         label = None
-                        if readonly_field in inst._meta.get_all_field_names():
+                        if readonly_field in meta_field_names:
                             label = inst._meta.get_field(readonly_field).verbose_name
                             value = smart_text(getattr(inst, readonly_field))
                         elif inspect.ismethod(getattr(inst, readonly_field, None)):

xadmin/plugins/passwords.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
 from django.contrib.auth.tokens import default_token_generator
-from django.contrib.auth.views import password_reset_confirm
+from django.contrib.auth.views import PasswordResetConfirmView as password_reset_confirm
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext as _
 
@@ -53,14 +53,17 @@ def post(self, request, *args, **kwargs):
         else:
             return self.get(request, form=form)
 
+
 site.register_view(r'^xadmin/password_reset/$', ResetPasswordSendView, name='xadmin_password_reset')
 
+
 class ResetLinkPlugin(BaseAdminPlugin):
 
     def block_form_bottom(self, context, nodes):
         reset_link = self.get_admin_url('xadmin_password_reset')
         return '<div class="text-info" style="margin-top:15px;"><a href="%s"><i class="fa fa-question-sign"></i> %s</a></div>' % (reset_link, _('Forgotten your password or username?'))
 
+
 site.register_plugin(ResetLinkPlugin, LoginView)
 
 
@@ -75,11 +78,11 @@ class ResetPasswordComfirmView(BaseAdminView):
     def do_view(self, request, uidb36, token, *args, **kwargs):
         context = super(ResetPasswordComfirmView, self).get_context()
         return password_reset_confirm(request, uidb36, token,
-                   template_name=self.password_reset_confirm_template,
-                   token_generator=self.password_reset_token_generator,
-                   set_password_form=self.password_reset_set_form,
-                   post_reset_redirect=self.get_admin_url('xadmin_password_reset_complete'),
-                   current_app=self.admin_site.name, extra_context=context)
+                                      template_name=self.password_reset_confirm_template,
+                                      token_generator=self.password_reset_token_generator,
+                                      set_password_form=self.password_reset_set_form,
+                                      post_reset_redirect=self.get_admin_url('xadmin_password_reset_complete'),
+                                      current_app=self.admin_site.name, extra_context=context)
 
     def get(self, request, uidb36, token, *args, **kwargs):
         return self.do_view(request, uidb36, token)
@@ -91,8 +94,9 @@ def get_media(self):
         return super(ResetPasswordComfirmView, self).get_media() + \
             self.vendor('xadmin.page.form.js', 'xadmin.form.css')
 
+
 site.register_view(r'^xadmin/password_reset/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
-    ResetPasswordComfirmView, name='xadmin_password_reset_confirm')
+                   ResetPasswordComfirmView, name='xadmin_password_reset_confirm')
 
 
 class ResetPasswordCompleteView(BaseAdminView):
@@ -107,5 +111,5 @@ def get(self, request, *args, **kwargs):
 
         return TemplateResponse(request, self.password_reset_complete_template, context)
 
-site.register_view(r'^xadmin/password_reset/complete/$', ResetPasswordCompleteView, name='xadmin_password_reset_complete')
 
+site.register_view(r'^xadmin/password_reset/complete/$', ResetPasswordCompleteView, name='xadmin_password_reset_complete')

xadmin/views/edit.py

@@ -224,7 +224,6 @@ def get_form_layout(self):
 
         return layout
 
-    @filter_hook
     def get_form_helper(self):
         helper = FormHelper()
         helper.form_tag = False

xadmin/views/list.py

@@ -169,7 +169,6 @@ def get_list_display_links(self):
 
     def make_result_list(self):
         # Get search parameters from the query string.
-        self.base_queryset = self.queryset()
         self.list_queryset = self.get_list_queryset()
         self.ordering_field_columns = self.get_ordering_field_columns()
         self.paginator = self.get_paginator()

xadmin/views/website.py

@@ -2,8 +2,8 @@
 from django.utils.translation import ugettext as _
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.views.decorators.cache import never_cache
-from django.contrib.auth.views import login
-from django.contrib.auth.views import logout
+from django.contrib.auth.views import LoginView as login
+from django.contrib.auth.views import LogoutView as logout
 from django.http import HttpResponse
 
 from .base import BaseAdminView, filter_hook
@@ -63,7 +63,8 @@ def get(self, request, *args, **kwargs):
             'template_name': self.login_template or 'xadmin/views/login.html',
         }
         self.update_params(defaults)
-        return login(request, **defaults)
+        # return login(request, **defaults)
+        return login.as_view(**defaults)(request)
 
     @never_cache
     def post(self, request, *args, **kwargs):
@@ -91,7 +92,8 @@ def get(self, request, *args, **kwargs):
             defaults['template_name'] = self.logout_template
 
         self.update_params(defaults)
-        return logout(request, **defaults)
+        # return logout(request, **defaults)
+        return logout.as_view(**defaults)(request)
 
     @never_cache
     def post(self, request, *args, **kwargs):

xadmin/widgets.py

@@ -31,8 +31,8 @@ def __init__(self, attrs=None, format=None):
             final_attrs.update(attrs)
         super(AdminDateWidget, self).__init__(attrs=final_attrs, format=format)
 
-    def render(self, name, value, attrs=None):
-        input_html = super(AdminDateWidget, self).render(name, value, attrs)
+    def render(self, name, value, attrs=None, renderer=None):
+        input_html = super(AdminDateWidget, self).render(name, value, attrs, renderer)
         return mark_safe('<div class="input-group date bootstrap-datepicker"><span class="input-group-addon"><i class="fa fa-calendar"></i></span>%s'
                          '<span class="input-group-btn"><button class="btn btn-default" type="button">%s</button></span></div>' % (input_html, _(u'Today')))
 
@@ -49,8 +49,8 @@ def __init__(self, attrs=None, format=None):
             final_attrs.update(attrs)
         super(AdminTimeWidget, self).__init__(attrs=final_attrs, format=format)
 
-    def render(self, name, value, attrs=None):
-        input_html = super(AdminTimeWidget, self).render(name, value, attrs)
+    def render(self, name, value, attrs=None, renderer=None):
+        input_html = super(AdminTimeWidget, self).render(name, value, attrs, renderer)
         return mark_safe('<div class="input-group time bootstrap-clockpicker"><span class="input-group-addon"><i class="fa fa-clock-o">'
                          '</i></span>%s<span class="input-group-btn"><button class="btn btn-default" type="button">%s</button></span></div>' % (input_html, _(u'Now')))
 
@@ -73,8 +73,8 @@ def __init__(self, attrs=None):
         # we want to define widgets.
         forms.MultiWidget.__init__(self, widgets, attrs)
 
-    def render(self, name, value, attrs=None):
-        input_html = [ht for ht in super(AdminSplitDateTime, self).render(name, value, attrs).replace('/><input', '/>\n<input').split('\n') if ht != '']
+    def render(self, name, value, attrs=None, renderer=None):
+        input_html = [ht for ht in super(AdminSplitDateTime, self).render(name, value, attrs, renderer).replace('><input', '>\n<input').split('\n') if ht != '']
         # return input_html
         return mark_safe('<div class="datetime clearfix"><div class="input-group date bootstrap-datepicker"><span class="input-group-addon"><i class="fa fa-calendar"></i></span>%s'
                          '<span class="input-group-btn"><button class="btn btn-default" type="button">%s</button></span></div>'