diff --git a/.gitignore b/.gitignore index d0596e1..4f54c99 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,6 @@ *.egg-info *.sql docs/build/* -.DS_Store \ No newline at end of file +.DS_Store +.tox/ +dist/ diff --git a/README.rst b/README.rst index d856690..f3175b2 100644 --- a/README.rst +++ b/README.rst @@ -52,6 +52,11 @@ html version using the setup.py:: Changelog: ========== +0.10 (2015-12-14): +----------------- + +* Fixed a bug with BasePermissionForm and django 1.8 + 0.9 (2015-11-11): ----------------- diff --git a/authority/forms.py b/authority/forms.py index 2b99dfb..e4f669b 100644 --- a/authority/forms.py +++ b/authority/forms.py @@ -17,6 +17,7 @@ class BasePermissionForm(forms.ModelForm): class Meta: model = Permission + exclude = [] def __init__(self, perm=None, obj=None, approved=False, *args, **kwargs): self.perm = perm diff --git a/authority/tests.py b/authority/tests.py index 1c2965d..c7faec1 100644 --- a/authority/tests.py +++ b/authority/tests.py @@ -12,6 +12,9 @@ from authority.models import Permission from authority.exceptions import NotAModel, UnsavedModelInstance from authority.compat import get_user_model +# Load the form +from authority.forms import UserPermissionForm # noqa + User = get_user_model() if VERSION >= (1, 5): diff --git a/setup.py b/setup.py index 45ca363..0f930c9 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def read(fname): setup( name='django-authority', - version='0.9', + version='0.10', description=( "A Django app that provides generic per-object-permissions " "for Django's auth app."