Provisional Django 1.7 support

Author: sshwsfc

xadmin/plugins/inline.py

@@ -2,10 +2,11 @@
 import inspect
 from django import forms
 from django.forms.formsets import all_valid, DELETION_FIELD_NAME
-from django.forms.models import inlineformset_factory, BaseInlineFormSet
+from django.forms.models import inlineformset_factory, BaseInlineFormSet, modelform_defines_fields
 from django.contrib.contenttypes.generic import BaseGenericInlineFormSet, generic_inlineformset_factory
 from django.template import loader
 from django.template.loader import render_to_string
+from django.contrib.auth import get_permission_codename
 from xadmin.layout import FormHelper, Layout, flatatt, Container, Column, Field, Fieldset
 from xadmin.sites import site
 from xadmin.views import BaseAdminPlugin, ModelFormAdminView, DetailAdminView, filter_hook
@@ -157,13 +158,15 @@ def get_formset(self, **kwargs):
             "form": self.form,
             "formset": self.formset,
             "fk_name": self.fk_name,
+            'fields': forms.ALL_FIELDS,
             "exclude": exclude,
             "formfield_callback": self.formfield_for_dbfield,
             "extra": self.extra,
             "max_num": self.max_num,
             "can_delete": can_delete,
         }
         defaults.update(kwargs)
+
         return inlineformset_factory(self.parent_model, self.model, **defaults)
 
     @filter_hook
@@ -250,8 +253,9 @@ def queryset(self):
     def has_add_permission(self):
         if self.opts.auto_created:
             return self.has_change_permission()
-        return self.user.has_perm(
-            self.opts.app_label + '.' + self.opts.get_add_permission())
+
+        codename = get_permission_codename('add', self.opts)
+        return self.user.has_perm("%s.%s" % (self.opts.app_label, codename))
 
     def has_change_permission(self):
         opts = self.opts
@@ -260,14 +264,16 @@ def has_change_permission(self):
                 if field.rel and field.rel.to != self.parent_model:
                     opts = field.rel.to._meta
                     break
-        return self.user.has_perm(
-            opts.app_label + '.' + opts.get_change_permission())
+
+        codename = get_permission_codename('change', opts)
+        return self.user.has_perm("%s.%s" % (opts.app_label, codename))
 
     def has_delete_permission(self):
         if self.opts.auto_created:
             return self.has_change_permission()
-        return self.user.has_perm(
-            self.opts.app_label + '.' + self.opts.get_delete_permission())
+
+        codename = get_permission_codename('delete', self.opts)
+        return self.user.has_perm("%s.%s" % (self.opts.app_label, codename))
 
 
 class GenericInlineModelAdmin(InlineModelAdmin):
@@ -298,9 +304,11 @@ def get_formset(self, **kwargs):
             "can_delete": can_delete,
             "can_order": False,
             "max_num": self.max_num,
-            "exclude": exclude
+            "exclude": exclude,
+            'fields': forms.ALL_FIELDS
         }
         defaults.update(kwargs)
+
         return generic_inlineformset_factory(self.model, **defaults)
 
 

xadmin/plugins/quickform.py

@@ -45,7 +45,6 @@ class RelatedFieldWidgetWrapper(forms.Widget):
     admin interface.
     """
     def __init__(self, widget, rel, add_url, rel_add_url):
-        self.is_hidden = widget.is_hidden
         self.needs_multipart_form = widget.needs_multipart_form
         self.attrs = widget.attrs
         self.choices = widget.choices
@@ -56,6 +55,9 @@ def __init__(self, widget, rel, add_url, rel_add_url):
         self.add_url = add_url
         self.rel_add_url = rel_add_url
 
+        if hasattr(self, 'input_type'):
+            self.input_type = widget.input_type
+
     def __deepcopy__(self, memo):
         obj = copy.copy(self)
         obj.widget = copy.deepcopy(self.widget, memo)

xadmin/templates/xadmin/base_site.html

@@ -1,6 +1,7 @@
 {% extends 'xadmin/base.html' %}
 {% load i18n xadmin_tags %}
 {% load url from future %}
+{% load firstof from future %}
 
 {% block title %}{{ title }} | {{ site_title }}{% endblock %}
 
@@ -16,7 +17,7 @@
         {% if user.is_active and user.is_staff %}
           <li class="dropdown">
             <a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
-            <strong>{% trans 'Welcome,' %} {% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong> <span class="caret"></span></a>
+            <strong>{% trans 'Welcome,' %} {% firstof user.first_name user.username %}</strong> <span class="caret"></span></a>
             <ul id="g-account-menu" class="dropdown-menu" role="menu">
               {% view_block 'top_account_menu' %}
             </ul>

xadmin/views/base.py

@@ -10,6 +10,7 @@
 from django.utils.encoding import force_unicode
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.auth import get_permission_codename
 from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.core.urlresolvers import reverse
@@ -561,17 +562,23 @@ def queryset(self):
         Returns a QuerySet of all model instances that can be edited by the
         admin site. This is used by changelist_view.
         """
-        return self.model._default_manager.get_query_set()
+        return self.model._default_manager.get_queryset()
 
     def has_view_permission(self, obj=None):
-        return ('view' not in self.remove_permissions) and (self.user.has_perm('%s.view_%s' % self.model_info) or \
-            self.user.has_perm('%s.change_%s' % self.model_info))
+        view_codename = get_permission_codename('view', self.opts)
+        change_codename = get_permission_codename('change', self.opts)
+
+        return ('view' not in self.remove_permissions) and (self.user.has_perm('%s.%s' % (self.app_label, view_codename)) or \
+            self.user.has_perm('%s.%s' % (self.app_label, change_codename)))
 
     def has_add_permission(self):
-        return ('add' not in self.remove_permissions) and self.user.has_perm('%s.add_%s' % self.model_info)
+        codename = get_permission_codename('add', self.opts)
+        return ('add' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename))
 
     def has_change_permission(self, obj=None):
-        return ('change' not in self.remove_permissions) and self.user.has_perm('%s.change_%s' % self.model_info)
+        codename = get_permission_codename('change', self.opts)
+        return ('change' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename))
 
     def has_delete_permission(self, obj=None):
-        return ('delete' not in self.remove_permissions) and self.user.has_perm('%s.delete_%s' % self.model_info)
+        codename = get_permission_codename('delete', self.opts)
+        return ('delete' not in self.remove_permissions) and self.user.has_perm('%s.%s' % (self.app_label, codename))

xadmin/views/edit.py

@@ -2,9 +2,9 @@
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import PermissionDenied, FieldError
 from django.db import models, transaction
-from django.forms.models import modelform_factory
+from django.forms.models import modelform_factory, modelform_defines_fields
 from django.http import Http404, HttpResponseRedirect
 from django.template.response import TemplateResponse
 from django.utils.encoding import force_unicode
@@ -93,7 +93,7 @@ def formfield_for_dbfield(self, db_field, **kwargs):
     def get_field_style(self, db_field, style, **kwargs):
         if style in ('radio', 'radio-inline') and (db_field.choices or isinstance(db_field, models.ForeignKey)):
             attrs = {'widget': widgets.AdminRadioSelect(
-                attrs={'inline': style == 'radio-inline'})}
+                attrs={'inline': 'inline' if style == 'radio-inline' else ''})}
             if db_field.choices:
                 attrs['choices'] = db_field.get_choices(
                     include_blank=db_field.blank,
@@ -173,8 +173,18 @@ def get_model_form(self, **kwargs):
             "formfield_callback": self.formfield_for_dbfield,
         }
         defaults.update(kwargs)
+
+        if defaults['fields'] is None and not modelform_defines_fields(defaults['form']):
+            defaults['fields'] = forms.ALL_FIELDS
+
         return modelform_factory(self.model, **defaults)
 
+        try:
+            return modelform_factory(self.model, **defaults)
+        except FieldError as e:
+            raise FieldError('%s. Check fields/fieldsets/exclude attributes of class %s.'
+                             % (e, self.__class__.__name__))
+
     @filter_hook
     def get_form_layout(self):
         layout = copy.deepcopy(self.form_layout)

xadmin/widgets.py

@@ -3,7 +3,7 @@
 """
 from itertools import chain
 from django import forms
-from django.forms.widgets import RadioFieldRenderer, RadioInput
+from django.forms.widgets import RadioFieldRenderer, RadioChoiceInput
 from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
 from django.utils.html import conditional_escape
@@ -70,7 +70,7 @@ def format_output(self, rendered_widgets):
                         (rendered_widgets[0], rendered_widgets[1]))
 
 
-class AdminRadioInput(RadioInput):
+class AdminRadioInput(RadioChoiceInput):
 
     def render(self, name=None, value=None, attrs=None, choices=()):
         name = name or self.name