Skip to content
Snippets Groups Projects
Commit 08ab7c9d authored by Julian's avatar Julian
Browse files

Drop usage of check_global_permission

parent c27f97ba
No related branches found
No related tags found
1 merge request!379Resolve "Timetable menu permissions load all lessons"
Pipeline #193547 passed
...@@ -7,7 +7,6 @@ from guardian.shortcuts import get_objects_for_user ...@@ -7,7 +7,6 @@ from guardian.shortcuts import get_objects_for_user
from aleksis.core.models import Announcement, Group, Person, Room from aleksis.core.models import Announcement, Group, Person, Room
from aleksis.core.util.core_helpers import get_site_preferences from aleksis.core.util.core_helpers import get_site_preferences
from aleksis.core.util.predicates import check_global_permission
from .build import build_substitutions_list from .build import build_substitutions_list
...@@ -22,7 +21,7 @@ def get_teachers(user: "User"): ...@@ -22,7 +21,7 @@ def get_teachers(user: "User"):
teachers = Person.objects.all().order_by("short_name", "last_name") teachers = Person.objects.all().order_by("short_name", "last_name")
if not check_global_permission(user, "chronos.view_all_person_timetables"): if not user.has_perm("chronos.view_all_person_timetables"):
teachers.filter( teachers.filter(
Q(pk=user.person.pk) Q(pk=user.person.pk)
| Q(pk__in=get_objects_for_user(user, "core.view_person_timetable", teachers)) | Q(pk__in=get_objects_for_user(user, "core.view_person_timetable", teachers))
...@@ -45,7 +44,7 @@ def get_groups(user: "User"): ...@@ -45,7 +44,7 @@ def get_groups(user: "User"):
groups = groups.order_by("short_name", "name") groups = groups.order_by("short_name", "name")
if not check_global_permission(user, "chronos.view_all_group_timetables"): if not user.has_perm("chronos.view_all_group_timetables"):
wanted_groups = get_objects_for_user(user, "core.view_group_timetable", groups) wanted_groups = get_objects_for_user(user, "core.view_group_timetable", groups)
groups = groups.filter( groups = groups.filter(
...@@ -65,7 +64,7 @@ def get_rooms(user: "User"): ...@@ -65,7 +64,7 @@ def get_rooms(user: "User"):
rooms = Room.objects.all().order_by("short_name", "name") rooms = Room.objects.all().order_by("short_name", "name")
if not check_global_permission(user, "chronos.view_all_room_timetables"): if not user.has_perm("chronos.view_all_room_timetables"):
rooms = get_objects_for_user(user, "core.view_room_timetable", rooms) rooms = get_objects_for_user(user, "core.view_room_timetable", rooms)
rooms = rooms.distinct() rooms = rooms.distinct()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment