|
@@ -2,7 +2,7 @@ from django.contrib import admin
|
|
from django.contrib.contenttypes.admin import GenericStackedInline, GenericTabularInline
|
|
from django.contrib.contenttypes.admin import GenericStackedInline, GenericTabularInline
|
|
from django.db.models import Q
|
|
from django.db.models import Q
|
|
from django.contrib.contenttypes.models import ContentType
|
|
from django.contrib.contenttypes.models import ContentType
|
|
-from django.contrib.auth.models import User as AuthUser, Group
|
|
|
|
|
|
+from django.contrib.auth.models import User as AuthUser
|
|
from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
|
|
from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
|
|
from django.http import HttpResponseRedirect
|
|
from django.http import HttpResponseRedirect
|
|
from django.utils.html import format_html
|
|
from django.utils.html import format_html
|
|
@@ -130,7 +130,7 @@ class UserAdmin(AdtSearchMixin, AuthUserAdmin):
|
|
}),
|
|
}),
|
|
(AuthUserAdmin.fieldsets[2][0], {
|
|
(AuthUserAdmin.fieldsets[2][0], {
|
|
'classes': ('collapse',),
|
|
'classes': ('collapse',),
|
|
- 'fields': ('is_active', 'is_staff', 'is_superuser',), # removing groups and user_permissions
|
|
|
|
|
|
+ 'fields': ('is_active', 'is_staff', 'is_superuser', 'groups',), # removing user_permissions
|
|
}),
|
|
}),
|
|
(AuthUserAdmin.fieldsets[3][0], {
|
|
(AuthUserAdmin.fieldsets[3][0], {
|
|
'classes': ('collapse',),
|
|
'classes': ('collapse',),
|
|
@@ -236,7 +236,6 @@ class AdhesionAdmin(AdtSearchMixin, admin.ModelAdmin):
|
|
|
|
|
|
|
|
|
|
admin.site.unregister(AuthUser)
|
|
admin.site.unregister(AuthUser)
|
|
-admin.site.unregister(Group)
|
|
|
|
admin.site.register(User, UserAdmin)
|
|
admin.site.register(User, UserAdmin)
|
|
admin.site.register(Corporation, CorporationAdmin)
|
|
admin.site.register(Corporation, CorporationAdmin)
|
|
admin.site.register(Adhesion, AdhesionAdmin)
|
|
admin.site.register(Adhesion, AdhesionAdmin)
|