something updated

rog/admin.py

@@ -905,12 +905,15 @@ 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')
+    add_form = CustomUserCreationForm
     list_filter = ('is_staff', 'is_active', 'is_rogaining', 'group')
 
     # readonly_fieldsを明示的に設定
@@ -942,13 +945,18 @@ 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)