Skip to content

Fixed overwriting changes to UserAdmin #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed overwriting changes to UserAdmin #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions microsoft_auth/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.apps import apps
from django.contrib import admin
from django.contrib.auth import get_user_model
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin

from .conf import LOGIN_TYPE_MA, LOGIN_TYPE_XBL, config
from .models import MicrosoftAccount, XboxLiveAccount
Expand All @@ -27,11 +26,6 @@
extra_base = [DjangoQLSearchMixin]

base_admin = extra_base + [admin.ModelAdmin]
base_user_admin = extra_base + [BaseUserAdmin]

# unregister User mode if it is already registered
if admin.site.is_registered(User): # pragma: no branch
admin.site.unregister(User)


class MicrosoftAccountAdmin(*base_admin):
Expand Down Expand Up @@ -81,14 +75,11 @@ def _get_inlines():
return inlines


@admin.register(User)
class UserAdmin(*base_user_admin):
@property
def inlines(self):
"""Adds MicrosoftAccount and/or XboxLiveAccount foreign keys to
User model"""

return _get_inlines()
try:
UserAdmin = admin.site._registry[User]
except KeyError:
from django.contrib.auth.admin import UserAdmin

UserAdmin.inlines.extend(_get_inlines())

_register_admins()