Merge pull request #836 from chaotic-kingdoms/oppia-1341-bugfix-cohor…

…t-criteria oppia-1341: Fix bug in cohort criteria filtering
DigitalCampus · Nov 24, 2022 · 929726f · 929726f
2 parents f0bc2a0 + 5085f8f
commit 929726f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/oppia/models/cohorts.py b/oppia/models/cohorts.py
@@ -86,14 +86,14 @@ def update_participants_by_role(self, role):
 
         role_criteria = CohortCritera.objects.filter(cohort=self, role=role)
 
-        participants = []
+        participants = User.objects
         # as Django's filter() function is accumulative, we can concatenate them as an AND expression
         for criteria in role_criteria:
             customfield = CustomField.objects.filter(id=criteria.user_profile_field).first()
             if not customfield:
                 continue
             value = criteria.user_profile_value
-            participants = (participants if participants else User.objects).filter(
+            participants = participants.filter(
                 get_customfields_filter(value, customfield))
 
         for participant in participants: