aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-09-17 09:06:24 -0700
committerMichał Górny <mgorny@gentoo.org>2013-09-17 09:06:24 -0700
commit2c5771e8d4b972aacf0595a9a6917feef4261563 (patch)
tree3a20b35b913faa264f948f13aa8f65b4ceb3073b /okupy/accounts/models.py
parentMerge pull request #94 from mgorny/tests-fix (diff)
parentSwitch travis to the clean branch. (diff)
downloadidentity.gentoo.org-2c5771e8d4b972aacf0595a9a6917feef4261563.tar.gz
identity.gentoo.org-2c5771e8d4b972aacf0595a9a6917feef4261563.tar.bz2
identity.gentoo.org-2c5771e8d4b972aacf0595a9a6917feef4261563.zip
Merge pull request #95 from mgorny/clean-ldapdb
Import ACLField from our forked django-ldapdb.
Diffstat (limited to 'okupy/accounts/models.py')
-rw-r--r--okupy/accounts/models.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/okupy/accounts/models.py b/okupy/accounts/models.py
index 277f470..4da7ee4 100644
--- a/okupy/accounts/models.py
+++ b/okupy/accounts/models.py
@@ -3,9 +3,10 @@
from django.conf import settings
from django.db import models
from ldapdb.models.fields import (CharField, IntegerField, ListField,
- FloatField, ACLField, DateField)
+ FloatField, DateField)
import ldapdb.models
+from okupy.common.fields import ACLField
from okupy.crypto.models import EncryptedPKModel