Merge pull request #5175 from onepercentclub/hotfix/team-filter

Hotfix/team filter
onepercentclub · Aug 9, 2022 · 7224e8a · 7224e8a
2 parents d72cc53 + 446c109
commit 7224e8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bluebottle/activities/tests/test_api.py b/bluebottle/activities/tests/test_api.py
@@ -1791,7 +1791,7 @@ def test_get_filtered_status(self):
                 resource['id'] in [str(team.pk) for team in new_teams]
             )
 
-    def test_get_filtered_has_slot(self):
+    def test_get_filtered_has_no_slot(self):
         self.perform_get(user=self.activity.owner, query={'filter[has_slot]': 'false'})
 
         self.assertStatus(status.HTTP_200_OK)

diff --git a/bluebottle/activities/views.py b/bluebottle/activities/views.py
@@ -180,7 +180,9 @@ def get_queryset(self, *args, **kwargs):
         if status:
             queryset = queryset.filter(status=status)
         elif has_slot == 'false':
-            queryset = queryset.filter(slot__start__isnull=True)
+            queryset = queryset.filter(slot__start__isnull=True).exclude(
+                status__in=['new', 'withdrawn', 'cancelled']
+            )
         elif start == 'future':
             queryset = queryset.filter(
                 slot__start__gt=timezone.now()