From ebdb52504c8c077d274c5be839467bb9e39ea5a5 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sat, 4 Jan 2025 19:35:45 +0100
Subject: [PATCH] Reformat
---
.../statistics/StatisticsForPersonPage.vue | 4 +++-
aleksis/apps/alsijil/rules.py | 11 ++++++++---
aleksis/apps/alsijil/schema/documentation.py | 14 ++++++--------
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue b/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
index 2118d3c25..d90e166d2 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/statistics/StatisticsForPersonPage.vue
@@ -86,7 +86,9 @@
<v-row class="mr-2">
<v-col cols="12" md="6" class="pa-0 d-flex">
<v-list-item-avatar
- v-if="mode === MODE.PARTICIPATIONS && showCheckbox(item)"
+ v-if="
+ mode === MODE.PARTICIPATIONS && showCheckbox(item)
+ "
>
<v-item v-slot="{ active, toggle }" :value="item.id">
<v-simple-checkbox
diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py
index a65c4ca9e..c0a697b1c 100644
--- a/aleksis/apps/alsijil/rules.py
+++ b/aleksis/apps/alsijil/rules.py
@@ -198,7 +198,8 @@ add_perm("alsijil.edit_documentation_rule", edit_documentation_predicate)
add_perm("alsijil.delete_documentation_rule", edit_documentation_predicate)
view_participation_status_for_documentation_predicate = has_person & (
- has_global_perm("alsijil.change_participationstatus") | can_view_participation_status_for_documentation
+ has_global_perm("alsijil.change_participationstatus")
+ | can_view_participation_status_for_documentation
)
add_perm(
"alsijil.view_participation_status_for_documentation_rule",
@@ -207,7 +208,10 @@ add_perm(
edit_participation_status_for_documentation_with_time_range_predicate = (
has_person
- & (has_global_perm("alsijil.change_participationstatus") | can_edit_participation_status_for_documentation)
+ & (
+ has_global_perm("alsijil.change_participationstatus")
+ | can_edit_participation_status_for_documentation
+ )
& is_in_allowed_time_range_for_participation_status
)
add_perm(
@@ -216,7 +220,8 @@ add_perm(
)
edit_participation_status_for_documentation_predicate = has_person & (
- has_global_perm("alsijil.change_participationstatus") | can_edit_participation_status_for_documentation
+ has_global_perm("alsijil.change_participationstatus")
+ | can_edit_participation_status_for_documentation
)
add_perm(
"alsijil.edit_participation_status_for_documentation_rule",
diff --git a/aleksis/apps/alsijil/schema/documentation.py b/aleksis/apps/alsijil/schema/documentation.py
index d3da77dbb..ad88b2de3 100644
--- a/aleksis/apps/alsijil/schema/documentation.py
+++ b/aleksis/apps/alsijil/schema/documentation.py
@@ -7,12 +7,10 @@ from reversion import create_revision, set_comment, set_user
from aleksis.apps.alsijil.util.predicates import (
can_edit_documentation,
+ can_edit_participation_status_for_documentation,
is_in_allowed_time_range,
is_in_allowed_time_range_for_participation_status,
)
-from aleksis.apps.alsijil.util.predicates import (
- can_edit_participation_status_for_documentation as can_edit_participation_status_for_documentation_predicate,
-)
from aleksis.apps.chronos.schema import LessonEventType
from aleksis.apps.cursus.models import Subject
from aleksis.apps.cursus.schema import CourseType, SubjectType
@@ -56,8 +54,8 @@ class DocumentationType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
future_notice = graphene.Boolean(required=False)
future_notice_participation_status = graphene.Boolean(required=False)
- can_edit_participation_status_for_documentation = graphene.Boolean(required=False)
- can_view_participation_status_for_documentation = graphene.Boolean(required=False)
+ can_edit_participation_status = graphene.Boolean(required=False)
+ can_view_participation_status = graphene.Boolean(required=False)
old_id = graphene.ID(required=False)
@@ -96,12 +94,12 @@ class DocumentationType(PermissionsTypeMixin, DjangoFilterMixin, DjangoObjectTyp
return not is_in_allowed_time_range_for_participation_status(info.context.user, root)
@staticmethod
- def resolve_can_edit_participation_status_for_documentation(root: Documentation, info, **kwargs):
+ def resolve_can_edit_participation_status(root: Documentation, info, **kwargs):
"""Shows whether the user can edit all participation statuses of the documentation"""
- return can_edit_participation_status_for_documentation_predicate(info.context.user, root)
+ return can_edit_participation_status_for_documentation(info.context.user, root)
@staticmethod
- def resolve_can_view_participation_status_for_documentation(root: Documentation, info, **kwargs):
+ def resolve_can_view_participation_status(root: Documentation, info, **kwargs):
"""Shows whether the user can view all participation statuses of the documentation"""
return info.context.user.has_perm(
"alsijil.view_participation_status_for_documentation_rule", root
--
GitLab