diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py index 836e0aaf7d633fe25647ce2a5282228bbfc47433..d10a5f48ace1c061f7ce10c93d83523a7da23bfc 100644 --- a/aleksis/apps/alsijil/rules.py +++ b/aleksis/apps/alsijil/rules.py @@ -258,13 +258,21 @@ add_perm("alsijil.delete_grouprole", delete_group_role_predicate) view_assigned_group_roles_predicate = ( is_group_owner - | is_lesson_teacher + | has_global_perm("alsjil.assign_grouprole") + | has_object_perm("core.assign_grouprole") +) +add_perm("alsijil.view_assigned_grouproles", view_assigned_group_roles_predicate) + +view_assigned_group_roles_register_object_predicate = ( + is_lesson_teacher | is_lesson_original_teacher | is_lesson_parent_group_owner | has_global_perm("alsjil.assign_grouprole") - | has_object_perm("alsijil.assign_grouprole") ) -add_perm("alsijil.view_assigned_grouproles", view_assigned_group_roles_predicate) +add_perm( + "alsijil.view_assigned_grouproles_for_register_object", + view_assigned_group_roles_register_object_predicate, +) assign_group_role_person_predicate = is_person_group_owner | has_global_perm( "alsjil.assign_grouprole" diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 75c07ebec88e168db018850283d8abf216553e62..f3990be4fc351f55607a83a014d7d0cfacf3504e 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -167,7 +167,9 @@ def register_object( # Group roles show_group_roles = request.user.person.preferences[ "alsijil__group_roles_in_lesson_view" - ] and request.user.has_perm("alsijil.view_assigned_grouproles", register_object) + ] and request.user.has_perm( + "alsijil.view_assigned_grouproles_for_register_object", register_object + ) if show_group_roles: groups = register_object.get_groups().all() group_roles = GroupRole.objects.with_assignments(date_of_lesson, groups)