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

add is_staff for user login api

Browse Source
This commit is contained in:
Akira Miyata
2025-09-02 11:40:17 +09:00
parent 45a29c7b18
commit 70acda8167
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rog/serializers.py
View File

@ -464,7 +464,7 @@ class TempUserRegistrationSerializer(serializers.ModelSerializer):
class UserSerializer(serializers.ModelSerializer): class UserSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = CustomUser 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): class GolaImageSerializer(serializers.ModelSerializer):
goalimage = Base64ImageField(max_length=None, use_url=True) goalimage = Base64ImageField(max_length=None, use_url=True)
@ -876,7 +876,7 @@ class EntrySerializer(serializers.ModelSerializer):
class CustomUserSerializer(serializers.ModelSerializer): class CustomUserSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = CustomUser 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'] read_only_fields = ['id','email']
class TeamDetailSerializer(serializers.ModelSerializer): class TeamDetailSerializer(serializers.ModelSerializer):
@ -886,13 +886,13 @@ class TeamDetailSerializer(serializers.ModelSerializer):
model = Team model = Team
fields = ['id', 'zekken_number', 'team_name', 'category'] fields = ['id', 'zekken_number', 'team_name', 'category']
class UserSerializer(serializers.ModelSerializer): class UserDetailSerializer(serializers.ModelSerializer):
event_date = serializers.SerializerMethodField() event_date = serializers.SerializerMethodField()
last_goal_time = serializers.SerializerMethodField() last_goal_time = serializers.SerializerMethodField()
class Meta: class Meta:
model = CustomUser 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') read_only_fields = ('id', 'email')
def get_event_date(self, obj): def get_event_date(self, obj):
@ -998,6 +998,7 @@ class MemberSerializer(serializers.ModelSerializer):
representation['lastname'] = instance.user.lastname representation['lastname'] = instance.user.lastname
representation['date_of_birth'] = instance.user.date_of_birth representation['date_of_birth'] = instance.user.date_of_birth
representation['female'] = instance.user.female representation['female'] = instance.user.female
representation['is_staff'] = instance.user.is_staff
return representation return representation

6
rog/urls.py
View File

@ -82,9 +82,9 @@ urlpatterns = router.urls
urlpatterns += [ urlpatterns += [
path('inperf/', LocationsInPerf, name="location_perf"), path('inperf/', LocationsInPerf, name="location_perf"),
path('insubperf', LocationsInSubPerf, name='location_subperf'), path('insubperf/', LocationsInSubPerf, name='location_subperf'),
path('inbound', LocationInBound, name='location_bound'), path('inbound/', LocationInBound, name='location_bound'),
path('inbound2', LocationInBound2, name='location_bound'), path('inbound2/', LocationInBound2, name='location_bound2'),
path('location-checkin/', views.LocationCheckinView.as_view(), name='location_checkin'), path('location-checkin/', views.LocationCheckinView.as_view(), name='location_checkin'),
path('location-checkin-test/', views.location_checkin_test, name='location_checkin_test'), path('location-checkin-test/', views.location_checkin_test, name='location_checkin_test'),
path('customarea/', CustomAreaLocations, name='custom_area_location'), path('customarea/', CustomAreaLocations, name='custom_area_location'),