Skip to content
Snippets Groups Projects
Commit ac00a087 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '199-room-timetable-permission-still-references-chronos' into 'master'

Adjust permission names to Room migration

Closes #199

See merge request !295
parents e33be4ea b642870e
No related branches found
No related tags found
No related merge requests found
...@@ -152,7 +152,7 @@ def get_rooms(user: "User"): ...@@ -152,7 +152,7 @@ def get_rooms(user: "User"):
wanted_rooms = set() wanted_rooms = set()
for room in rooms: for room in rooms:
if checker.has_perm("chronos.view_room_timetable", room): if checker.has_perm("core.view_room_timetable", room):
wanted_rooms.add(room.pk) wanted_rooms.add(room.pk)
rooms = rooms.filter(Q(pk__in=wanted_rooms)) rooms = rooms.filter(Q(pk__in=wanted_rooms))
......
...@@ -68,7 +68,7 @@ def has_room_timetable_perm(user: User, obj: Room) -> bool: ...@@ -68,7 +68,7 @@ def has_room_timetable_perm(user: User, obj: Room) -> bool:
to access the requested room timetable. to access the requested room timetable.
""" """
return has_global_perm("chronos.view_all_room_timetables")(user) or has_object_perm( return has_global_perm("chronos.view_all_room_timetables")(user) or has_object_perm(
"chronos.view_room_timetable" "core.view_room_timetable"
)(user, obj) )(user, obj)
......
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