mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 01:12:08 +01:00 
			
		
		
		
	More API filters for the activity app
This commit is contained in:
		@@ -18,7 +18,7 @@ class ActivityTypeViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    queryset = ActivityType.objects.all()
 | 
			
		||||
    serializer_class = ActivityTypeSerializer
 | 
			
		||||
    filter_backends = [DjangoFilterBackend]
 | 
			
		||||
    filterset_fields = ['name', 'can_invite', ]
 | 
			
		||||
    filterset_fields = ['name', 'manage_entries', 'can_invite', 'guest_entry_fee', ]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ActivityViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
@@ -29,8 +29,14 @@ class ActivityViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    """
 | 
			
		||||
    queryset = Activity.objects.all()
 | 
			
		||||
    serializer_class = ActivitySerializer
 | 
			
		||||
    filter_backends = [DjangoFilterBackend]
 | 
			
		||||
    filterset_fields = ['name', 'description', 'activity_type', ]
 | 
			
		||||
    filter_backends = [DjangoFilterBackend, SearchFilter]
 | 
			
		||||
    filterset_fields = ['name', 'description', 'activity_type', 'location', 'creater', 'organizer', 'attendees_club',
 | 
			
		||||
                        'date_start', 'date_end', 'valid', 'open', ]
 | 
			
		||||
    search_fields = ['$name', '$description', '$location', '$creater__last_name', '$creater__first_name',
 | 
			
		||||
                     '$creater__email', '$creater__note__alias__name', '$creater__note__alias__normalized_name',
 | 
			
		||||
                     '$organizer__name', '$organizer__email', '$organizer__note__alias__name',
 | 
			
		||||
                     '$organizer__note__alias__normalized_name', '$attendees_club__name', '$attendees_club__email',
 | 
			
		||||
                     '$attendees_club__note__alias__name', '$attendees_club__note__alias__normalized_name', ]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class GuestViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
@@ -41,8 +47,11 @@ class GuestViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    """
 | 
			
		||||
    queryset = Guest.objects.all()
 | 
			
		||||
    serializer_class = GuestSerializer
 | 
			
		||||
    filter_backends = [SearchFilter]
 | 
			
		||||
    search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ]
 | 
			
		||||
    filter_backends = [DjangoFilterBackend, SearchFilter]
 | 
			
		||||
    filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'inviter', 'inviter__alias__name',
 | 
			
		||||
                        'inviter__alias__normalized_name', ]
 | 
			
		||||
    search_fields = ['$activity__name', '$last_name', '$first_name', '$inviter__user__email', '$inviter__alias__name',
 | 
			
		||||
                     '$inviter__alias__normalized_name', ]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class EntryViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
@@ -53,5 +62,7 @@ class EntryViewSet(ReadProtectedModelViewSet):
 | 
			
		||||
    """
 | 
			
		||||
    queryset = Entry.objects.all()
 | 
			
		||||
    serializer_class = EntrySerializer
 | 
			
		||||
    filter_backends = [SearchFilter]
 | 
			
		||||
    search_fields = ['$last_name', '$first_name', '$inviter__alias__name', '$inviter__alias__normalized_name', ]
 | 
			
		||||
    filter_backends = [DjangoFilterBackend, SearchFilter]
 | 
			
		||||
    filterset_fields = ['activity', 'time', 'note', 'guest', ]
 | 
			
		||||
    search_fields = ['$activity__name', '$note__user__email', '$note__alias__name', '$note__alias__normalized_name',
 | 
			
		||||
                     '$guest__last_name', '$guest__first_name', ]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user