Skip to content

Commit

Permalink
Don't override UserAdmin for custom auth model
Browse files Browse the repository at this point in the history
  • Loading branch information
Aniruddha Maru committed Aug 13, 2014
1 parent f15d0a1 commit b2da26c
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions relationships/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import User as DefaultUserModel

from .compat import User
from .forms import RelationshipStatusAdminForm
Expand All @@ -13,13 +14,19 @@ class RelationshipInline(admin.TabularInline):
fk_name = 'from_user'


class UserRelationshipAdmin(UserAdmin):
class UserRelationshipAdminMixin(object):
inlines = (RelationshipInline,)


class RelationshipStatusAdmin(admin.ModelAdmin):
form = RelationshipStatusAdminForm

admin.site.unregister(User)
admin.site.register(User, UserRelationshipAdmin)

if User == DefaultUserModel:
class UserRelationshipAdmin(UserRelationshipAdminMixin, UserAdmin):
pass

admin.site.unregister(User)
admin.site.register(User, UserRelationshipAdmin)

admin.site.register(RelationshipStatus, RelationshipStatusAdmin)

0 comments on commit b2da26c

Please sign in to comment.