diff --git a/user_app/admin.py b/user_app/admin.py index 7fbb5c0..0a78a7e 100644 --- a/user_app/admin.py +++ b/user_app/admin.py @@ -1,26 +1,27 @@ from django.contrib import admin -from django import forms from .models import User +from django.contrib.auth.models import Group + class UserAdmin(admin.ModelAdmin): exclude = ('uId',) - list_display = ('first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'is_online', 'is_contact_only', 'last_login', 'is_active', 'is_staff') - list_filter = ('is_contact_only', 'is_online', 'is_active', 'is_staff') + list_display = ('first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'is_online', 'is_contact_only', 'last_login', 'is_active') + list_filter = ('is_contact_only', 'is_online', 'is_active') search_fields = ('email', 'first_name', 'last_name') fieldsets = ( (None, { - 'fields': ('first_name', 'last_name', 'email', 'phone', 'password') + 'fields': ['first_name', 'last_name', 'email', 'phone', 'password'] }), ('Additional Info', { - 'fields': ('initials', 'color', 'is_online', 'is_contact_only', 'last_login') + 'fields': ['initials', 'color', 'is_online', 'is_contact_only', 'last_login'] }), ('Permissions', { - 'fields': ('is_active', 'is_staff') + 'fields': ['is_active'] }), ) - list_editable = ('is_active', 'is_staff', 'is_online', 'is_contact_only') + list_editable = ('is_active', 'is_online', 'is_contact_only') ordering = ('last_name',) def save_model(self, request, obj, form, change): @@ -28,4 +29,5 @@ class UserAdmin(admin.ModelAdmin): obj.set_password(form.cleaned_data['password']) super().save_model(request, obj, form, change) -admin.site.register(User, UserAdmin) \ No newline at end of file +admin.site.register(User, UserAdmin) +admin.site.unregister(Group) \ No newline at end of file diff --git a/user_app/models.py b/user_app/models.py index 95c8d64..740f44b 100644 --- a/user_app/models.py +++ b/user_app/models.py @@ -42,7 +42,6 @@ class User(AbstractBaseUser, PermissionsMixin): is_active = models.BooleanField(default=True) is_staff = models.BooleanField(default=False) - groups = models.ManyToManyField(Group, related_name="user_app_users", blank=True) user_permissions = models.ManyToManyField(Permission, related_name="user_app_users_permissions", blank=True) objects = UserManager()