Resolve merge conflict in CustomUserAdmin

rog/admin.py

@@ -29,6 +29,24 @@ from django.core.exceptions import ValidationError
 from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from django.utils.translation import gettext_lazy as _
 
+from .services.csv_processor import EntryCSVProcessor
+
+@admin.register(Entry)
+class EntryAdmin(admin.ModelAdmin):
+    list_display = ['team', 'event', 'category', 'date', 'is_active']
+    
+    def get_urls(self):
+        from django.urls import path
+        urls = super().get_urls()
+        custom_urls = [
+            path('upload-csv/', self.upload_csv_view, name='entry_upload_csv'),
+        ]
+        return custom_urls + urls
+
+    def upload_csv_view(self, request):
+        processor = EntryCSVProcessor()
+        return processor.process_upload(request)
+
 @admin.register(GifurogeRegister)
 class GifurogeRegisterAdmin(admin.ModelAdmin):
     list_display = ('event_code', 'time', 'owner_name', 'email', 'team_name', 'department')
@@ -905,7 +923,6 @@ class CustomUserCreationForm(UserCreationForm):
         model = CustomUser
         fields = ('email', 'lastname', 'firstname', 'date_of_birth', 'female')
 
-'''
 @admin.register(CustomUser)
 class CustomUserAdmin(UserAdmin):
     form = CustomUserChangeForm
@@ -913,8 +930,9 @@ class CustomUserAdmin(UserAdmin):
     #model = CustomUser
 
     list_display = ('email', 'is_staff', 'is_active', 'is_rogaining', 'zekken_number', 'event_code', 'team_name', 'group', 'firstname', 'lastname')
-    add_form = CustomUserCreationForm
+    search_fields = ('egit mail', 'firstname', 'lastname', 'zekken_number')
     list_filter = ('is_staff', 'is_active', 'is_rogaining', 'group')
+    ordering = ('email',)
 
     # readonly_fieldsを明示的に設定
     readonly_fields = ('date_joined',)  # 変更不可のフィールドのみを指定=>Personal Infoも編集可能にする。
@@ -956,34 +974,3 @@ class CustomUserAdmin(UserAdmin):
         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)
-admin.site.register(Location, LocationAdmin) 
-admin.site.register(SystemSettings, admin.ModelAdmin) 
-admin.site.register(JoinedEvent, admin.ModelAdmin) 
-admin.site.register(Favorite, admin.ModelAdmin) 
-admin.site.register(TravelList, admin.ModelAdmin) 
-admin.site.register(TravelPoint, admin.ModelAdmin)
-admin.site.register(Event, admin.ModelAdmin)
-admin.site.register(Location_line,  LeafletGeoAdmin)
-admin.site.register(Location_polygon, LeafletGeoAdmin)
-admin.site.register(JpnAdminMainPerf, LeafletGeoAdmin)
-admin.site.register(UserTracks, LeafletGeoAdmin);
-#admin.site.register(JpnAdminPerf, LeafletGeoAdmin)
-admin.site.register(GifuAreas, LeafletGeoAdmin)
-admin.site.register(ShapeLayers, admin.ModelAdmin)
-admin.site.register(UserUpload, admin.ModelAdmin)
-admin.site.register(EventUser, admin.ModelAdmin)
-#admin.site.register(UserUploadUser, admin.ModelAdmin)
-#admin.site.register(ShapeFileLocations, admin.ModelAdmin)
-
-admin.site.register(CustomUser, UserAdminConfig)
-admin.site.register(templocation, TempLocationAdmin)
-admin.site.register(GoalImages, admin.ModelAdmin)
-admin.site.register(CheckinImages, admin.ModelAdmin)
-
-
-
-