ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

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
parent c60af4acc2 b5118f6c1e
commit cc68e299f6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/graphql/gql/meQuery.gql
View File

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

2
server/users/schema.py
View File

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