pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/492'

Browse Source
This commit is contained in:
Ross Lawley
2013-11-29 11:45:06 +00:00
parent 499e11f730 fc4b247f4f
commit d902a74ab0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mongoengine/django/auth.py
View File

@@ -117,7 +117,7 @@ class Permission(Document):
class Meta: class Meta:
verbose_name = _('permission') verbose_name = _('permission')
verbose_name_plural = _('permissions') verbose_name_plural = _('permissions')U
# unique_together = (('content_type', 'codename'),) # unique_together = (('content_type', 'codename'),)
# ordering = ('content_type__app_label', 'content_type__model', 'codename') # ordering = ('content_type__app_label', 'content_type__model', 'codename')
@@ -230,6 +230,9 @@ class User(Document):
date_joined = DateTimeField(default=datetime_now, date_joined = DateTimeField(default=datetime_now,
verbose_name=_('date joined')) verbose_name=_('date joined'))
user_permissions = ListField(ReferenceField(Permission), verbose_name=_('user permissions'),
help_text=_('Permissions for the user.'))
USERNAME_FIELD = 'username' USERNAME_FIELD = 'username'
REQUIRED_FIELDS = ['email'] REQUIRED_FIELDS = ['email']