From cfb53a3526a03d0606f6ba189e0967dd6b892ea9 Mon Sep 17 00:00:00 2001 From: bmedx Date: Fri, 7 Jul 2017 11:02:53 -0400 Subject: [PATCH] Ensure User model is unregistered before registering with Django admin - PLAT-1631 --- common/djangoapps/student/admin.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py index 2c1a4dae7d..f30b9fd507 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 _ @@ -207,4 +208,9 @@ admin.site.register(RegistrationCookieConfiguration, ConfigurationModelAdmin) # We must first un-register the User model since it may also be registered by the auth app. +try: + admin.site.unregister(User) +except NotRegistered: + pass + admin.site.register(User, UserAdmin)