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

Merge branch 'hotfix/visible-student-submissions' into develop

This commit is contained in:
Ramon Wenger 2022-06-21 17:01:33 +02:00
parent 1ae8594b13 c0806d6b82
commit a2b62c4c25
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/assignments/schema/types.py
View File

@ -59,7 +59,7 @@ class AssignmentNode(DjangoObjectType):
def resolve_submissions(self, info, **kwargs): def resolve_submissions(self, info, **kwargs):
user = info.context.user user = info.context.user
if user.has_perm('users.can_manage_school_class_content'): if user.has_perm('users.can_manage_school_class_content'):
return self.submissions.filter(student__in=user.users_in_same_school_class()).filter(final=True) return self.submissions.filter(student__in=user.users_in_active_school_class()).filter(final=True)
return [] return []
def resolve_solution(self, info, **kwargs): def resolve_solution(self, info, **kwargs):

2
server/assignments/tests/test_feedback.py
View File

@ -38,6 +38,8 @@ class SubmissionFeedbackTestCase(SkillboxTestCase):
user=user, user=user,
school_class=school_class school_class=school_class
) )
user.set_selected_class(school_class)
def _create_submission_feedback(self, user, final, text, student_submission_id): def _create_submission_feedback(self, user, final, text, student_submission_id):
return self.get_client(user).execute(UPDATE_SUBMISSION_FEEDBACK_MUTATION, variables={ return self.get_client(user).execute(UPDATE_SUBMISSION_FEEDBACK_MUTATION, variables={

3
server/users/models.py
View File

@ -73,6 +73,9 @@ class User(AbstractUser):
def users_in_same_school_class(self): def users_in_same_school_class(self):
return User.objects.filter(school_classes__users=self.pk) return User.objects.filter(school_classes__users=self.pk)
def users_in_active_school_class(self):
return self.selected_class.users.all() if self.selected_class is not None else []
def get_teacher(self): def get_teacher(self):
if self.is_teacher(): if self.is_teacher():
return self return self