Skip to content

Commit

Permalink
Merge pull request #269 from djangoindia/combined_migration
Browse files Browse the repository at this point in the history
Combined migrations to solve swappable deps problem
  • Loading branch information
DevilsAutumn authored Jan 9, 2025
2 parents 418e2b5 + bdc0ba4 commit 4c82fe0
Show file tree
Hide file tree
Showing 16 changed files with 1,238 additions and 1,462 deletions.
60 changes: 60 additions & 0 deletions backend/djangoindia/db/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
Sponsorship,
)
from djangoindia.db.models.update import Update
from djangoindia.db.models.user import User
from djangoindia.db.models.volunteer import Volunteer

from .forms import EmailForm, EventForm, UpdateForm
Expand Down Expand Up @@ -259,3 +260,62 @@ class EventVolunteerAdmin(ImportExportModelAdmin):
list_filter = ("events__name",)
resource_class = EventVolunteerResource
filter_horizontal = ("events",)


@admin.register(User)
class UserAdmin(admin.ModelAdmin):
list_display = (
"username",
"email",
"first_name",
"last_name",
"is_active",
"is_superuser",
"is_email_verified",
)
list_filter = (
"is_active",
"is_staff",
"is_superuser",
"is_email_verified",
"gender",
)
search_fields = ("username", "email", "first_name", "last_name")
readonly_fields = ("created_at", "updated_at")
filter_horizontal = (
"groups",
"user_permissions",
)
fieldsets = (
(None, {"fields": ("username", "email", "password")}),
(
"Personal info",
{
"fields": (
"first_name",
"last_name",
"avatar",
"gender",
"organization",
"mobile_number",
)
},
),
(
"Permissions",
{
"fields": (
"is_active",
"is_staff",
"is_superuser",
"groups",
"user_permissions",
"is_email_verified",
"is_password_expired",
"is_onboarded",
),
},
),
("Important dates", {"fields": ("created_at", "updated_at")}),
)
ordering = ("-created_at",)
Loading

0 comments on commit 4c82fe0

Please sign in to comment.