From acf6e36e71816fce3713a5597d334ac70eb85444 Mon Sep 17 00:00:00 2001 From: Akira Date: Thu, 19 Dec 2024 12:57:57 +0900 Subject: [PATCH] Fix admin issue --- rog/admin.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rog/admin.py b/rog/admin.py index c23ba9a..42e0952 100644 --- a/rog/admin.py +++ b/rog/admin.py @@ -905,13 +905,16 @@ class CustomUserCreationForm(UserCreationForm): model = CustomUser fields = ('email', 'lastname', 'firstname', 'date_of_birth', 'female') +@admin.register(CustomUser) class CustomUserAdmin(UserAdmin): form = CustomUserChangeForm add_form = CustomUserCreationForm - model = CustomUser + #model = CustomUser list_display = ('email', 'is_staff', 'is_active', 'is_rogaining', 'zekken_number', 'event_code', 'team_name', 'group', 'firstname', 'lastname') + search_fields = ('email', 'firstname', 'lastname', 'zekken_number') list_filter = ('is_staff', 'is_active', 'is_rogaining', 'group') + ordering = ('email',) # readonly_fieldsを明示的に設定 readonly_fields = ('date_joined',) # 変更不可のフィールドのみを指定=>Personal Infoも編集可能にする。 @@ -942,13 +945,17 @@ class CustomUserAdmin(UserAdmin): search_fields = ('email', 'firstname', 'lastname', 'zekken_number', 'team_name') ordering = ('email',) - def get_readonly_fields(self, request, obj=None): + def get_readonly_fields_old(self, request, obj=None): # スーパーユーザーの場合は読み取り専用フィールドを最小限に if request.user.is_superuser: return self.readonly_fields # 通常のスタッフユーザーの場合は追加の制限を設定可能 return self.readonly_fields + ('is_staff', 'is_superuser') + def get_readonly_fields(self, request, obj=None): + if request.user.is_superuser: + return ('date_joined', 'last_login') + return ('date_joined', 'last_login', 'is_staff', 'is_superuser') admin.site.register(Useractions) admin.site.register(RogUser, admin.ModelAdmin)