From d6d7fcaf4f806956674ef0d4b471794dc23a84f4 Mon Sep 17 00:00:00 2001 From: bmedx Date: Wed, 5 Jul 2017 12:28:22 -0400 Subject: [PATCH] Fix NotRegistered error when running makemigrations --- common/djangoapps/student/admin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py index bf0f5b7dd5..1d43d5ed5e 100644 --- a/common/djangoapps/student/admin.py +++ b/common/djangoapps/student/admin.py @@ -1,6 +1,7 @@ """ Django admin pages for student app """ from config_models.admin import ConfigurationModelAdmin from django import forms +from django.contrib.admin.sites import NotRegistered from django.contrib.auth import get_user_model from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.utils.translation import ugettext_lazy as _ @@ -206,5 +207,9 @@ admin.site.register(RegistrationCookieConfiguration, ConfigurationModelAdmin) admin.site.register(UserAttribute, UserAttributeAdmin) # We must first un-register the User model since it may also be registered by the auth app. -admin.site.unregister(User) +try: + admin.site.unregister(User) +except NotRegistered: + pass + admin.site.register(User, UserAdmin)