nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix admin issue

Browse Source
This commit is contained in:
Akira Miyata
2024-12-19 12:57:57 +09:00
parent a0f2b01f29
commit acf6e36e71
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rog/admin.py
View File

@ -905,13 +905,16 @@ class CustomUserCreationForm(UserCreationForm):
model = CustomUser model = CustomUser
fields = ('email', 'lastname', 'firstname', 'date_of_birth', 'female') fields = ('email', 'lastname', 'firstname', 'date_of_birth', 'female')
@admin.register(CustomUser)
class CustomUserAdmin(UserAdmin): class CustomUserAdmin(UserAdmin):
form = CustomUserChangeForm form = CustomUserChangeForm
add_form = CustomUserCreationForm 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') 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') list_filter = ('is_staff', 'is_active', 'is_rogaining', 'group')
ordering = ('email',)
# readonly_fieldsを明示的に設定 # readonly_fieldsを明示的に設定
readonly_fields = ('date_joined',) # 変更不可のフィールドのみを指定=>Personal Infoも編集可能にする。 readonly_fields = ('date_joined',) # 変更不可のフィールドのみを指定=>Personal Infoも編集可能にする。
@ -942,13 +945,17 @@ class CustomUserAdmin(UserAdmin):
search_fields = ('email', 'firstname', 'lastname', 'zekken_number', 'team_name') search_fields = ('email', 'firstname', 'lastname', 'zekken_number', 'team_name')
ordering = ('email',) ordering = ('email',)
def get_readonly_fields(self, request, obj=None): def get_readonly_fields_old(self, request, obj=None):
# スーパーユーザーの場合は読み取り専用フィールドを最小限に # スーパーユーザーの場合は読み取り専用フィールドを最小限に
if request.user.is_superuser: if request.user.is_superuser:
return self.readonly_fields return self.readonly_fields
# 通常のスタッフユーザーの場合は追加の制限を設定可能 # 通常のスタッフユーザーの場合は追加の制限を設定可能
return self.readonly_fields + ('is_staff', 'is_superuser') 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(Useractions)
admin.site.register(RogUser, admin.ModelAdmin) admin.site.register(RogUser, admin.ModelAdmin)