Skip to content

Commit

Permalink
Update class definitions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Etienne committed Nov 28, 2014
1 parent 0e8eabe commit f9d1749
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 19 deletions.
9 changes: 2 additions & 7 deletions user_management/models/mixins.py
Expand Up @@ -93,13 +93,8 @@ class Meta:
ordering = ['name']


class BasicUserFieldsMixin(
DateJoinedUserMixin,
EmailUserMixin,
IsStaffUserMixin,
NameUserMixin,
):

class BasicUserFieldsMixin(DateJoinedUserMixin, EmailUserMixin, IsStaffUserMixin,
NameUserMixin):
class Meta:
abstract = True

Expand Down
16 changes: 4 additions & 12 deletions user_management/models/tests/models.py
Expand Up @@ -26,12 +26,8 @@ class VerifyEmailUser(VerifyEmailMixin):
pass


class CustomBasicUserFieldsMixin(
NameUserMethodsMixin,
EmailUserMixin,
DateJoinedUserMixin,
IsStaffUserMixin,
):
class CustomBasicUserFieldsMixin(NameUserMethodsMixin, EmailUserMixin,
DateJoinedUserMixin, IsStaffUserMixin):
name = models.TextField()

USERNAME_FIELD = 'email'
Expand All @@ -40,10 +36,6 @@ class Meta:
abstract = True


class CustomNameUser(
AvatarMixin,
EmailVerifyUserMixin,
CustomBasicUserFieldsMixin,
AbstractBaseUser,
):
class CustomNameUser(AvatarMixin, EmailVerifyUserMixin, CustomBasicUserFieldsMixin,
AbstractBaseUser):
pass

0 comments on commit f9d1749

Please sign in to comment.