Commit cfb53a35 by bmedx

Ensure User model is unregistered before registering with Django admin

- PLAT-1631
parent 48767b31
""" Django admin pages for student app """ """ Django admin pages for student app """
from config_models.admin import ConfigurationModelAdmin from config_models.admin import ConfigurationModelAdmin
from django import forms from django import forms
from django.contrib.admin.sites import NotRegistered
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
...@@ -207,4 +208,9 @@ admin.site.register(RegistrationCookieConfiguration, ConfigurationModelAdmin) ...@@ -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. # 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) admin.site.register(User, UserAdmin)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment