diff --git a/aleksis/apps/alsijil/schema/__init__.py b/aleksis/apps/alsijil/schema/__init__.py index 4ecfef27ee460548e31b017fff80d262d1202410..5a99230c29b476f1f23c82395d7b6f497c455351 100644 --- a/aleksis/apps/alsijil/schema/__init__.py +++ b/aleksis/apps/alsijil/schema/__init__.py @@ -189,6 +189,6 @@ class Mutation(graphene.ObjectType): update_extra_marks = ExtraMarkBatchPatchMutation.Field() delete_extra_marks = ExtraMarkBatchDeleteMutation.Field() - create_personal_note = PersonalNoteBatchCreateMutation.Field() - update_personal_note = PersonalNoteBatchPatchMutation.Field() - delete_personal_note = PersonalNoteBatchDeleteMutation.Field() + create_personal_notes = PersonalNoteBatchCreateMutation.Field() + update_personal_notes = PersonalNoteBatchPatchMutation.Field() + delete_personal_notes = PersonalNoteBatchDeleteMutation.Field() diff --git a/aleksis/apps/alsijil/schema/extra_marks.py b/aleksis/apps/alsijil/schema/extra_marks.py index 9128210149e5aa49aaa1038c1b7713a107bb59c3..2ee2bdc09188df2713ea392882400286f6ca8bcd 100644 --- a/aleksis/apps/alsijil/schema/extra_marks.py +++ b/aleksis/apps/alsijil/schema/extra_marks.py @@ -33,7 +33,7 @@ class ExtraMarkBatchCreateMutation(BaseBatchCreateMutation): class ExtraMarkBatchDeleteMutation(BaseBatchDeleteMutation): class Meta: model = ExtraMark - permission_required = "alsijil.delete_extra_mark" # FIXME + permissions = ("alsijil.delete_extra_mark",) # FIXME class ExtraMarkBatchPatchMutation(BaseBatchPatchMutation): diff --git a/aleksis/apps/alsijil/schema/participation_status.py b/aleksis/apps/alsijil/schema/participation_status.py index 2e5a99faf3c60fca55b112d3b5ed2e1a96e1e57f..ac678e676fbec70f34b5d4928eedf8908070b1ec 100644 --- a/aleksis/apps/alsijil/schema/participation_status.py +++ b/aleksis/apps/alsijil/schema/participation_status.py @@ -42,7 +42,7 @@ class ParticipationStatusType( return NewPersonalNote.objects.filter( person=root.person, documentation=root.related_documentation, - note__isnull=False, + extra_mark__isnull=True, ) diff --git a/aleksis/apps/alsijil/schema/personal_note.py b/aleksis/apps/alsijil/schema/personal_note.py index 33f44b5effd24f37a70733994b2089b3bd785582..05ffd78258f5eb2cbe036b2531f7f701577a14a9 100644 --- a/aleksis/apps/alsijil/schema/personal_note.py +++ b/aleksis/apps/alsijil/schema/personal_note.py @@ -28,6 +28,8 @@ class PersonalNoteType( class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation): class Meta: model = NewPersonalNote + type_name = "BatchCreatePersonalNoteInput" + return_field_name = "personalNotes" fields = ("note", "extra_mark", "documentation", "person") permissions = ("alsijil.create_personal_note",) # FIXME @@ -35,10 +37,12 @@ class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation): class PersonalNoteBatchPatchMutation(BaseBatchPatchMutation): class Meta: model = NewPersonalNote + type_name = "BatchPatchPersonalNoteInput" + return_field_name = "personalNotes" fields = ("id", "note", "extra_mark", "documentation", "person") permissions = ("alsijil.change_personal_note",) # FIXME class PersonalNoteBatchDeleteMutation(BaseBatchDeleteMutation): class Meta: model = NewPersonalNote - permission_required = "alsijil.delete_personal_note" # FIXME + permissions = ("alsijil.delete_personal_note",) # FIXME