From 56c04ca5b8947b83c0aab8c094da3dd60b6ba9c3 Mon Sep 17 00:00:00 2001 From: Andrew Buss Date: Mon, 4 May 2015 11:58:57 -0700 Subject: [PATCH] Extended UserManager to fix createsuperuser --- flashcards/admin.py | 1 - flashcards/models.py | 10 ++++++++-- flashy/settings.py | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flashcards/admin.py b/flashcards/admin.py index 943a134..fca385b 100644 --- a/flashcards/admin.py +++ b/flashcards/admin.py @@ -1,7 +1,6 @@ from django.contrib import admin from flashcards.models import Flashcard, UserFlashcard, Section, FlashcardMask, \ UserFlashcardReview, LecturePeriod, User -from simple_email_confirmation import EmailAddress admin.site.register([ User, diff --git a/flashcards/models.py b/flashcards/models.py index b55804a..29386fa 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -1,4 +1,4 @@ -from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, AbstractUser +from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, AbstractUser, UserManager from django.db.models import * from simple_email_confirmation import SimpleEmailConfirmationUserMixin @@ -6,7 +6,13 @@ from simple_email_confirmation import SimpleEmailConfirmationUserMixin AbstractUser._meta.get_field('email')._unique = True -class User(AbstractUser, SimpleEmailConfirmationUserMixin, ): +class UserManager(UserManager): + def create_superuser(self, email, password, **extra_fields): + return self._create_user(email, email, password, True, True, **extra_fields) + + +class User(AbstractUser, SimpleEmailConfirmationUserMixin): + objects = UserManager() USERNAME_FIELD = 'email' REQUIRED_FIELDS = [] sections = ManyToManyField('Section') diff --git a/flashy/settings.py b/flashy/settings.py index d98e54c..4eb1402 100644 --- a/flashy/settings.py +++ b/flashy/settings.py @@ -22,8 +22,6 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django_ses', 'rest_framework', - - ) REST_FRAMEWORK = { -- 1.9.1