From 70acda81673602522a0b5bd80f32f288bc858fdf Mon Sep 17 00:00:00 2001 From: Akira Date: Tue, 2 Sep 2025 11:40:17 +0900 Subject: [PATCH] add is_staff for user login api --- rog/serializers.py | 9 +++++---- rog/urls.py | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rog/serializers.py b/rog/serializers.py index e5bf887..ef90f00 100755 --- a/rog/serializers.py +++ b/rog/serializers.py @@ -464,7 +464,7 @@ class TempUserRegistrationSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer): class Meta: model = CustomUser - fields = ('id','email', 'is_rogaining' ,'group', 'zekken_number', 'event_code', 'team_name') + fields = ('id','email', 'is_rogaining' ,'group', 'zekken_number', 'event_code', 'team_name', 'is_staff') class GolaImageSerializer(serializers.ModelSerializer): goalimage = Base64ImageField(max_length=None, use_url=True) @@ -876,7 +876,7 @@ class EntrySerializer(serializers.ModelSerializer): class CustomUserSerializer(serializers.ModelSerializer): class Meta: model = CustomUser - fields = ['id','email', 'firstname', 'lastname', 'date_of_birth', 'female'] + fields = ['id','email', 'firstname', 'lastname', 'date_of_birth', 'female', 'is_staff'] read_only_fields = ['id','email'] class TeamDetailSerializer(serializers.ModelSerializer): @@ -886,13 +886,13 @@ class TeamDetailSerializer(serializers.ModelSerializer): model = Team fields = ['id', 'zekken_number', 'team_name', 'category'] -class UserSerializer(serializers.ModelSerializer): +class UserDetailSerializer(serializers.ModelSerializer): event_date = serializers.SerializerMethodField() last_goal_time = serializers.SerializerMethodField() class Meta: model = CustomUser - fields = ['id','email', 'firstname', 'lastname', 'date_of_birth', 'female', 'is_rogaining', 'zekken_number', 'event_code', 'team_name', 'group', 'event_date', 'last_goal_time'] + fields = ['id','email', 'firstname', 'lastname', 'date_of_birth', 'female', 'is_rogaining', 'zekken_number', 'event_code', 'team_name', 'group', 'is_staff', 'event_date', 'last_goal_time'] read_only_fields = ('id', 'email') def get_event_date(self, obj): @@ -998,6 +998,7 @@ class MemberSerializer(serializers.ModelSerializer): representation['lastname'] = instance.user.lastname representation['date_of_birth'] = instance.user.date_of_birth representation['female'] = instance.user.female + representation['is_staff'] = instance.user.is_staff return representation diff --git a/rog/urls.py b/rog/urls.py index c114be8..7638fda 100755 --- a/rog/urls.py +++ b/rog/urls.py @@ -82,9 +82,9 @@ urlpatterns = router.urls urlpatterns += [ path('inperf/', LocationsInPerf, name="location_perf"), - path('insubperf', LocationsInSubPerf, name='location_subperf'), - path('inbound', LocationInBound, name='location_bound'), - path('inbound2', LocationInBound2, name='location_bound'), + path('insubperf/', LocationsInSubPerf, name='location_subperf'), + path('inbound/', LocationInBound, name='location_bound'), + path('inbound2/', LocationInBound2, name='location_bound2'), path('location-checkin/', views.LocationCheckinView.as_view(), name='location_checkin'), path('location-checkin-test/', views.location_checkin_test, name='location_checkin_test'), path('customarea/', CustomAreaLocations, name='custom_area_location'),