diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py index ae06c45f..bea43a11 100644 --- a/api/launchpad/launchpad_views.py +++ b/api/launchpad/launchpad_views.py @@ -93,9 +93,9 @@ def get(self, request): queryset=UserRoleLink.objects.filter(verified=True, role__title__in=allowed_levels).select_related('role') ) ).filter( - user_organization_link_user__id__in=UserOrganizationLink.objects.filter( + Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter( org__org_type__in=allowed_org_types - ).values("id") + ).values("id")) | Q(user_organization_link_user__id__isnull=True) ).annotate( org=F("user_organization_link_user__org__title"), district_name=F("user_organization_link_user__org__district__name"), diff --git a/api/launchpad/serializers.py b/api/launchpad/serializers.py index b387a487..92386593 100644 --- a/api/launchpad/serializers.py +++ b/api/launchpad/serializers.py @@ -69,9 +69,9 @@ def get_rank(self, obj): class LaunchpadParticipantsSerializer(serializers.ModelSerializer): - org = serializers.CharField() - district_name = serializers.CharField() - state = serializers.CharField() + org = serializers.CharField(allow_null=True, allow_blank=True) + district_name = serializers.CharField(allow_null=True, allow_blank=True) + state = serializers.CharField(allow_null=True, allow_blank=True) level = serializers.CharField() class Meta: