Merge pull request #45 from jlward/issue_45

BasePermissionForm needs a Meta.exclude for django 1.8
This commit is contained in:
Jason Ward 2015-12-14 11:29:37 -05:00
commit 1bcf8d5685
5 changed files with 13 additions and 2 deletions

4
.gitignore vendored
View file

@ -2,4 +2,6 @@
*.egg-info
*.sql
docs/build/*
.DS_Store
.DS_Store
.tox/
dist/

View file

@ -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):
-----------------

View file

@ -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

View file

@ -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):

View file

@ -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."