Merge branch 'hotfix/login-bug-as-new-student' into develop

This commit is contained in:
Ramon Wenger 2021-03-18 15:47:32 +01:00
commit cc68e299f6
2 changed files with 1 additions and 2 deletions

View File

@ -1,4 +1,3 @@
#import "./fragments/schoolClassParts.gql"
#import "./fragments/userParts.gql"
query MeQuery {
me {

View File

@ -89,7 +89,7 @@ class UserNode(DjangoObjectType):
def resolve_school_classes(self, info):
if self.selected_class() is None: # then we don't have any class to return
return []
return SchoolClass.objects.none()
return SchoolClass.objects.filter(
Q(schoolclassmember__active=True, schoolclassmember__user=self) | Q(pk=self.selected_class().pk)).distinct()